From patchwork Fri Oct 6 12:50:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Hunter X-Patchwork-Id: 822390 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y7qRy0m6Sz9sRq for ; Fri, 6 Oct 2017 23:57:49 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752094AbdJFM5r (ORCPT ); Fri, 6 Oct 2017 08:57:47 -0400 Received: from mga05.intel.com ([192.55.52.43]:37128 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751869AbdJFM5q (ORCPT ); Fri, 6 Oct 2017 08:57:46 -0400 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP; 06 Oct 2017 05:57:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,483,1500966000"; d="scan'208";a="320323488" Received: from ahunter-desktop.fi.intel.com ([10.237.72.168]) by fmsmga004.fm.intel.com with ESMTP; 06 Oct 2017 05:57:44 -0700 From: Adrian Hunter To: Ulf Hansson Cc: linux-mmc , linux-pci , Bjorn Helgaas , linux-acpi , "Rafael J. Wysocki" Subject: [PATCH] mmc: sdhci-pci: Remove D3 delays for Intel BYT-related host controllers Date: Fri, 6 Oct 2017 15:50:59 +0300 Message-Id: <1507294259-20438-1-git-send-email-adrian.hunter@intel.com> X-Mailer: git-send-email 1.9.1 Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The default D3 cold delay of 100 ms can cause pauses when streaming audio from eMMC. Intel BYT-related host controllers do not need PCI D3 delays. Although the delays can be set to zero via an ACPI _DSM, unfortunately that is not being used in all cases. So just set the delays to zero in the driver. Signed-off-by: Adrian Hunter --- drivers/mmc/host/sdhci-pci-core.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c index 5f3f7b51299f..14ef99b6e5b7 100644 --- a/drivers/mmc/host/sdhci-pci-core.c +++ b/drivers/mmc/host/sdhci-pci-core.c @@ -592,9 +592,18 @@ static void byt_read_dsm(struct sdhci_pci_slot *slot) slot->chip->rpm_retune = intel_host->d3_retune; } -static int byt_emmc_probe_slot(struct sdhci_pci_slot *slot) +static void byt_common_setup(struct sdhci_pci_slot *slot) { byt_read_dsm(slot); + + /* PCI D3 delays are not needed */ + slot->chip->pdev->d3_delay = 0; + slot->chip->pdev->d3cold_delay = 0; +} + +static int byt_emmc_probe_slot(struct sdhci_pci_slot *slot) +{ + byt_common_setup(slot); slot->host->mmc->caps |= MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE | MMC_CAP_HW_RESET | MMC_CAP_1_8V_DDR | MMC_CAP_CMD_DURING_TFR | @@ -649,7 +658,7 @@ static int ni_byt_sdio_probe_slot(struct sdhci_pci_slot *slot) { int err; - byt_read_dsm(slot); + byt_common_setup(slot); err = ni_set_max_freq(slot); if (err) @@ -662,7 +671,7 @@ static int ni_byt_sdio_probe_slot(struct sdhci_pci_slot *slot) static int byt_sdio_probe_slot(struct sdhci_pci_slot *slot) { - byt_read_dsm(slot); + byt_common_setup(slot); slot->host->mmc->caps |= MMC_CAP_POWER_OFF_CARD | MMC_CAP_NONREMOVABLE | MMC_CAP_WAIT_WHILE_BUSY; return 0; @@ -670,7 +679,7 @@ static int byt_sdio_probe_slot(struct sdhci_pci_slot *slot) static int byt_sd_probe_slot(struct sdhci_pci_slot *slot) { - byt_read_dsm(slot); + byt_common_setup(slot); slot->host->mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY | MMC_CAP_AGGRESSIVE_PM | MMC_CAP_CD_WAKE; slot->cd_idx = 0;