Commit 55fc05b7 authored Jul 03, 2012 by Daniel Drake Committed by Chris Ball Jul 22, 2012

mmc: sdhci-pci: CaFe has broken card detection

At http://dev.laptop.org/ticket/11980

 we have determined that the
Marvell CaFe SDHCI controller reports bad card presence during
resume. It reports that no card is present even when it is.
This is a regression -- resume worked back around 2.6.37.

Around 400ms after resuming, a "card inserted" interrupt is
generated, at which point it starts reporting presence.

Work around this hardware oddity by setting the
SDHCI_QUIRK_BROKEN_CARD_DETECTION flag.
Thanks to Chris Ball for helping with diagnosis.

Signed-off-by: Daniel Drake <dsd@laptop.org>
[stable@: please apply to 3.0+]
Cc: <stable@vger.kernel.org>
Signed-off-by: Chris Ball <cjb@laptop.org>

parent 0fc81ee3

drivers/mmc/host/sdhci-pci.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -157,6 +157,7 @@ static const struct sdhci_pci_fixes sdhci_ene_714 = {
		static const struct sdhci_pci_fixes sdhci_cafe = {
		.quirks = SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER \|
		SDHCI_QUIRK_NO_BUSY_IRQ \|
		SDHCI_QUIRK_BROKEN_CARD_DETECTION \|
		SDHCI_QUIRK_BROKEN_TIMEOUT_VAL,
		};