From: Adrian Hunter <adrian.hunter@intel.com>
To: Ulf Hansson <ulf.hansson@linaro.org>
Cc: linux-mmc <linux-mmc@vger.kernel.org>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Len Brown <len.brown@intel.com>, Pavel Machek <pavel@ucw.cz>,
Kevin Hilman <khilman@linaro.org>,
Tomeu Vizoso <tomeu.vizoso@collabora.com>,
linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [RFC PATCH 3/4] mmc: sdhci-acpi: Fix device hang on Intel BayTrail
Date: Tue, 24 Mar 2015 15:40:39 +0200 [thread overview]
Message-ID: <1427204440-3533-4-git-send-email-adrian.hunter@intel.com> (raw)
In-Reply-To: <1427204440-3533-1-git-send-email-adrian.hunter@intel.com>
Intel Baytrail has been observed sometimes to hang
if host controllers are using DMA while deep C-states
are used. Workaround that by specifying a maximum
DMA latency that will prevent deep C-states.
Unfortunately, host controller ACPI HIDs are not unique
to Baytrail, so the CPU must be identified.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
drivers/mmc/host/sdhci-acpi.c | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
index 22d929f..eaff09f 100644
--- a/drivers/mmc/host/sdhci-acpi.c
+++ b/drivers/mmc/host/sdhci-acpi.c
@@ -43,6 +43,24 @@
#include "sdhci.h"
+#ifdef CONFIG_X86
+#include <asm/cpu_device_id.h>
+static bool sdhci_acpi_on_byt(void)
+{
+ static const struct x86_cpu_id byt[] = {
+ { X86_VENDOR_INTEL, 6, 0x37 },
+ {}
+ };
+
+ return x86_match_cpu(byt);
+}
+#else
+static bool sdhci_acpi_on_byt(void)
+{
+ return false;
+}
+#endif
+
enum {
SDHCI_ACPI_SD_CD = BIT(0),
SDHCI_ACPI_RUNTIME_PM = BIT(1),
@@ -146,6 +164,14 @@ static const struct sdhci_acpi_chip sdhci_acpi_chip_int = {
.ops = &sdhci_acpi_ops_int,
};
+static void sdhci_acpi_int_dma_latency(struct sdhci_host *host)
+{
+ if (sdhci_acpi_on_byt()) {
+ host->dma_latency = 20;
+ host->lat_cancel_delay = 275;
+ }
+}
+
static int sdhci_acpi_emmc_probe_slot(struct platform_device *pdev,
const char *hid, const char *uid)
{
@@ -164,6 +190,8 @@ static int sdhci_acpi_emmc_probe_slot(struct platform_device *pdev,
sdhci_readl(host, SDHCI_CAPABILITIES_1) == 0x00000807)
host->timeout_clk = 1000; /* 1000 kHz i.e. 1 MHz */
+ sdhci_acpi_int_dma_latency(host);
+
return 0;
}
@@ -178,6 +206,8 @@ static int sdhci_acpi_sdio_probe_slot(struct platform_device *pdev,
host = c->host;
+ sdhci_acpi_int_dma_latency(host);
+
/* Platform specific code during sdio probe slot goes here */
return 0;
@@ -194,6 +224,8 @@ static int sdhci_acpi_sd_probe_slot(struct platform_device *pdev,
host = c->host;
+ sdhci_acpi_int_dma_latency(host);
+
/* Platform specific code during sd probe slot goes here */
return 0;
--
1.9.1
next prev parent reply other threads:[~2015-03-24 13:40 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-24 13:40 [RFC PATCH 0/4] mmc: sdhci: Support maximum DMA latency request via PM QoS Adrian Hunter
2015-03-24 13:40 ` [RFC PATCH 1/4] PM / QoS: Add pm_qos_cancel_request_lazy() that doesn't sleep Adrian Hunter
2015-04-20 14:00 ` Dov Levenglick
2015-04-21 8:26 ` Adrian Hunter
2015-04-21 10:18 ` Dov Levenglick
2015-04-21 10:25 ` Adrian Hunter
2015-03-24 13:40 ` [RFC PATCH 2/4] mmc: sdhci: Support maximum DMA latency request via PM QOS Adrian Hunter
2015-03-24 13:40 ` Adrian Hunter [this message]
2015-03-24 13:40 ` [RFC PATCH 4/4] mmc: sdhci-pci: Fix device hang on Intel BayTrail Adrian Hunter
2015-03-24 20:13 ` [RFC PATCH 0/4] mmc: sdhci: Support maximum DMA latency request via PM QoS Rafael J. Wysocki
2015-03-25 12:37 ` Adrian Hunter
2015-03-25 19:43 ` Pavel Machek
2015-03-26 8:29 ` Adrian Hunter
2015-03-26 9:51 ` Pavel Machek
2015-04-01 19:59 ` Len Brown
2015-04-02 19:35 ` Adrian Hunter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1427204440-3533-4-git-send-email-adrian.hunter@intel.com \
--to=adrian.hunter@intel.com \
--cc=khilman@linaro.org \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=rafael.j.wysocki@intel.com \
--cc=tomeu.vizoso@collabora.com \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).