mmc: sdhci: Workaround broken command queuing on Intel GLK
Adrian Hunter
maintainerPATCH 1/2 mmc: sdhci: Workaround broken command queuing on Intel GLK
Command queuing has been reported broken on some Lenovo systems based on Intel GLK. This is likely a BIOS issue, so disable command queuing for Intel GLK if the BIOS vendor string is "LENOVO".
--- drivers/mmc/host/sdhci-pci-core.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-pci-core.c +9 -1
@@ -27,6 +27,7 @@#include <linux/mmc/slot-gpio.h> #include <linux/mmc/sdhci-pci-data.h> #include <linux/acpi.h> +#include <linux/dmi.h> #ifdef CONFIG_X86 #include <asm/iosf_mbi.h>
@@ -783,11 +784,18 @@ static int byt_emmc_probe_slot(struct sdhci_pci_slot *slot)return 0 ; } +static bool glk_broken_cqhci (struct sdhci_pci_slot *slot) +{ +return slot->chip->pdev->device ==PCI_DEVICE_ID_INTEL_GLK_EMMC && +dmi_match (DMI_BIOS_VENDOR ,"LENOVO" ); +} +static int glk_emmc_probe_slot (struct sdhci_pci_slot *slot) {int ret =byt_emmc_probe_slot (slot); - slot->host->mmc->caps2 |=MMC_CAP2_CQE ; +if (!glk_broken_cqhci (slot)) + slot->host->mmc->caps2 |=MMC_CAP2_CQE ;if (slot->chip->pdev->device !=PCI_DEVICE_ID_INTEL_GLK_EMMC ) { slot->host->mmc->caps2 |= MMC_CAP2_HS400_ES,
Signature · 1 line
2.17.1
Adrian Hunter
maintainerPATCH 2/2 mmc: sdhci: Add a quirk for broken command queuing
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.
--- drivers/mmc/host/sdhci.c | 3 +++ drivers/mmc/host/sdhci.h | 2 ++ 2 files changed, 5 insertions(+)
drivers/mmc/host/sdhci.c +3 -0
@@ -3769,6 +3769,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 ))
drivers/mmc/host/sdhci.h +2 -0
@@ -409,6 +409,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 */
Signature · 1 line
2.17.1
Re: [PATCH 2/2] mmc: sdhci: Add a quirk for broken command queuing
Quoted 11 lines · Adrian Hunter
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 <[email protected]>
Applied for fixes, thanks!
Kind regards
Uffe
Quoted 35 lines
--- drivers/mmc/host/sdhci.c | 3 +++ drivers/mmc/host/sdhci.h | 2 ++ 2 files changed, 5 insertions(+)drivers/mmc/host/sdhci.c +3
-0@@ -3769,6 +3769,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 ))drivers/mmc/host/sdhci.h +2
-1@@ -409,6 +409,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.17.1
Quoted 8 lines · Adrian Hunter
Command queuing has been reported broken on some Lenovo systems based on Intel GLK. This is likely a BIOS issue, so disable command queuing for Intel GLK if the BIOS vendor string is "LENOVO".
Fixes 8ee82bda230f ("mmc: sdhci-pci: Add CQHCI support for Intel GLK")Signed-off-by Adrian Hunter <[email protected]>
Applied for fixes, thanks!
Kind regards
Uffe
Quoted 39 lines
--- drivers/mmc/host/sdhci-pci-core.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)drivers/mmc/host/sdhci-pci-core.c +9
-2@@ -27,6 +27,7 @@#include <linux/mmc/slot-gpio.h> #include <linux/mmc/sdhci-pci-data.h> #include <linux/acpi.h> +#include <linux/dmi.h> #ifdef CONFIG_X86 #include <asm/iosf_mbi.h> @@ -783,11 +784,18 @@ static int byt_emmc_probe_slot(struct sdhci_pci_slot *slot)return 0 ; } +static bool glk_broken_cqhci (struct sdhci_pci_slot *slot) +{ +return slot->chip->pdev->device ==PCI_DEVICE_ID_INTEL_GLK_EMMC && +dmi_match (DMI_BIOS_VENDOR ,"LENOVO" ); +} +static int glk_emmc_probe_slot (struct sdhci_pci_slot *slot) {int ret =byt_emmc_probe_slot (slot); - slot->host->mmc->caps2 |=MMC_CAP2_CQE ; +if (!glk_broken_cqhci (slot)) + slot->host->mmc->caps2 |=MMC_CAP2_CQE ;if (slot->chip->pdev->device !=PCI_DEVICE_ID_INTEL_GLK_EMMC ) { slot->host->mmc->caps2 |= MMC_CAP2_HS400_ES, --2.17.1