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

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

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: 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-2-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 cd8f61e2

drivers/mmc/host/sdhci.c

+3 −0
Original line number Diff line number Diff line
@@ -3549,6 +3549,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
Original line number Diff line number Diff line
@@ -391,6 +391,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 has to be forced to use block size of 2048 bytes */