Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd8f61e2 authored by Adrian Hunter's avatar Adrian Hunter Committed by Greg Kroah-Hartman
Browse files

mmc: sdhci: Workaround broken command queuing on Intel GLK 



commit bedf9fc01ff1f40cfd1a79ccacedd9f3cd8e652a upstream.

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: 8ee82bda ("mmc: sdhci-pci: Add CQHCI support for Intel GLK")
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20191217095349.14592-1-adrian.hunter@intel.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eb790652

drivers/mmc/host/sdhci-pci-core.c

+9 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/mmc/slot-gpio.h>

#include <linux/mmc/sdhci-pci-data.h>

#include <linux/acpi.h>

#include <linux/dmi.h>



#include "cqhci.h"
@@ -732,10 +733,17 @@ 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);



	if (!glk_broken_cqhci(slot))

		slot->host->mmc->caps2 |= MMC_CAP2_CQE;



	if (slot->chip->pdev->device != PCI_DEVICE_ID_INTEL_GLK_EMMC) {