[PATCH] mmc: sdhci: Workaround broken command queuing on Intel GLK based IRBIS models

[PATCH] mmc: sdhci: Workaround broken command queuing on Intel GLK based IRBIS models

[Hans de Goede]

Commit bedf9fc01ff1 ("mmc: sdhci: Workaround broken command queuing on
Intel GLK"), disabled command-queuing on Intel GLK based LENOVO models
because of it being broken due to what is believed to be a bug in
the BIOS.

It seems that the BIOS of some IRBIS models, including the IRBIS NB111
model has the same issue, so disable command queuing there too.

Fixes: bedf9fc01ff1 ("mmc: sdhci: Workaround broken command queuing on Intel GLK")
BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=209397
Reported-and-tested-by: RussianNeuroMancer <russianneuromancer@ya.ru>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/mmc/host/sdhci-pci-core.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
index af413805bbf1..914f5184295f 100644
--- a/drivers/mmc/host/sdhci-pci-core.c
+++ b/drivers/mmc/host/sdhci-pci-core.c
@@ -794,7 +794,8 @@ static int byt_emmc_probe_slot(struct sdhci_pci_slot *slot)
 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");
+	       (dmi_match(DMI_BIOS_VENDOR, "LENOVO") ||
+		dmi_match(DMI_SYS_VENDOR, "IRBIS"));
 }
 
 static int glk_emmc_probe_slot(struct sdhci_pci_slot *slot)
-- 
2.28.0

Re: [PATCH] mmc: sdhci: Workaround broken command queuing on Intel GLK based IRBIS models

[Adrian Hunter]

On 27/09/20 1:48 pm, Hans de Goede wrote:
> Commit bedf9fc01ff1 ("mmc: sdhci: Workaround broken command queuing on
> Intel GLK"), disabled command-queuing on Intel GLK based LENOVO models
> because of it being broken due to what is believed to be a bug in
> the BIOS.
> 
> It seems that the BIOS of some IRBIS models, including the IRBIS NB111
> model has the same issue, so disable command queuing there too.
> 
> Fixes: bedf9fc01ff1 ("mmc: sdhci: Workaround broken command queuing on Intel GLK")
> BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=209397
> Reported-and-tested-by: RussianNeuroMancer <russianneuromancer@ya.ru>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Thanks Hans!

Acked-by: Adrian Hunter <adrian.hunter@intel.com>

> ---
>  drivers/mmc/host/sdhci-pci-core.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
> index af413805bbf1..914f5184295f 100644
> --- a/drivers/mmc/host/sdhci-pci-core.c
> +++ b/drivers/mmc/host/sdhci-pci-core.c
> @@ -794,7 +794,8 @@ static int byt_emmc_probe_slot(struct sdhci_pci_slot *slot)
>  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");
> +	       (dmi_match(DMI_BIOS_VENDOR, "LENOVO") ||
> +		dmi_match(DMI_SYS_VENDOR, "IRBIS"));
>  }
>  
>  static int glk_emmc_probe_slot(struct sdhci_pci_slot *slot)
> 

Re: [PATCH] mmc: sdhci: Workaround broken command queuing on Intel GLK based IRBIS models

[Ulf Hansson]

On Sun, 27 Sep 2020 at 12:48, Hans de Goede <hdegoede@redhat.com> wrote:
>
> Commit bedf9fc01ff1 ("mmc: sdhci: Workaround broken command queuing on
> Intel GLK"), disabled command-queuing on Intel GLK based LENOVO models
> because of it being broken due to what is believed to be a bug in
> the BIOS.
>
> It seems that the BIOS of some IRBIS models, including the IRBIS NB111
> model has the same issue, so disable command queuing there too.
>
> Fixes: bedf9fc01ff1 ("mmc: sdhci: Workaround broken command queuing on Intel GLK")
> BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=209397
> Reported-and-tested-by: RussianNeuroMancer <russianneuromancer@ya.ru>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Applied for fixes and by adding a stable tag, thanks!

Kind regards
Uffe


> ---
>  drivers/mmc/host/sdhci-pci-core.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
> index af413805bbf1..914f5184295f 100644
> --- a/drivers/mmc/host/sdhci-pci-core.c
> +++ b/drivers/mmc/host/sdhci-pci-core.c
> @@ -794,7 +794,8 @@ static int byt_emmc_probe_slot(struct sdhci_pci_slot *slot)
>  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");
> +              (dmi_match(DMI_BIOS_VENDOR, "LENOVO") ||
> +               dmi_match(DMI_SYS_VENDOR, "IRBIS"));
>  }
>
>  static int glk_emmc_probe_slot(struct sdhci_pci_slot *slot)
> --
> 2.28.0
>