| From 548c9a833019db5a4098b3e4343f00fd544a26a7 Mon Sep 17 00:00:00 2001 |
| From: Adrian Hunter <adrian.hunter@intel.com> |
| Date: Tue, 17 Dec 2019 11:53:49 +0200 |
| Subject: [PATCH] mmc: sdhci: Add a quirk for broken command queuing |
| |
| commit 75d27ea1abf7af3cc2cdec3513e74f52191605c8 upstream. |
| |
| Command queuing has been reported broken on some systems based on Intel |
| GLK. A separate patch disables command queuing in some cases. |
| |
| This patch adds a quirk for broken command queuing, which enables users |
| with problems to disable command queuing using sdhci module parameters for |
| quirks. |
| |
| Fixes: 8ee82bda230f ("mmc: sdhci-pci: Add CQHCI support for Intel GLK") |
| Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> |
| Cc: stable@vger.kernel.org |
| Link: https://lore.kernel.org/r/20191217095349.14592-2-adrian.hunter@intel.com |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c |
| index c5a9f4e62440..ee7bbd475ccc 100644 |
| --- a/drivers/mmc/host/sdhci.c |
| +++ b/drivers/mmc/host/sdhci.c |
| @@ -3738,6 +3738,9 @@ int sdhci_setup_host(struct sdhci_host *host) |
| mmc_hostname(mmc), host->version); |
| } |
| |
| + if (host->quirks & SDHCI_QUIRK_BROKEN_CQE) |
| + mmc->caps2 &= ~MMC_CAP2_CQE; |
| + |
| if (host->quirks & SDHCI_QUIRK_FORCE_DMA) |
| host->flags |= SDHCI_USE_SDMA; |
| else if (!(host->caps & SDHCI_CAN_DO_SDMA)) |
| diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h |
| index b258748e97de..1a506672bea8 100644 |
| --- a/drivers/mmc/host/sdhci.h |
| +++ b/drivers/mmc/host/sdhci.h |
| @@ -408,6 +408,8 @@ struct sdhci_host { |
| #define SDHCI_QUIRK_BROKEN_CARD_DETECTION (1<<15) |
| /* Controller reports inverted write-protect state */ |
| #define SDHCI_QUIRK_INVERTED_WRITE_PROTECT (1<<16) |
| +/* Controller has unusable command queue engine */ |
| +#define SDHCI_QUIRK_BROKEN_CQE (1<<17) |
| /* Controller does not like fast PIO transfers */ |
| #define SDHCI_QUIRK_PIO_NEEDS_DELAY (1<<18) |
| /* Controller does not have a LED */ |
| -- |
| 2.7.4 |
| |
