Commit 87b87a3f authored Apr 10, 2012 by Daniel Drake Committed by Chris Ball Apr 20, 2012

mmc: sdhci: refine non-removable card checking for card detection



Commit c79396c1 ("mmc: sdhci: prevent card detection activity
for non-removable cards") disables card detection where the cards
are marked as non-removable.

This makes sense, but the implementation detail of calling
mmc_card_is_removable() causes some problems, because
mmc_card_is_removable() is overloaded with CONFIG_MMC_UNSAFE_RESUME
semantics.

In the OLPC XO case, we need CONFIG_MMC_UNSAFE_RESUME because our root
filesystem is stored on SD, but we also have external SD card slots
where we want automatic card detection.

Refine the check to only apply to hosts marked as MMC_CAP_NONREMOVABLE,
which is defined to mean that the card is *really* nonremovable. This
could be revisited in future if we find a way to improve
CONFIG_MMC_UNSAFE_RESUME semantics.

Signed-off-by: Daniel Drake <dsd@laptop.org>
Acked-by: Chuanxiao Dong <chuanxiao.dong@intel.com>
[stable@: please apply to 3.3-stable]
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Chris Ball <cjb@laptop.org>

parent a99aa9b9

drivers/mmc/host/sdhci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -147,7 +147,7 @@ static void sdhci_set_card_detection(struct sdhci_host *host, bool enable)
		u32 present, irqs;

		if ((host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) \|\|
		!mmc_card_is_removable(host->mmc))
		(host->mmc->caps & MMC_CAP_NONREMOVABLE))
		return;

		present = sdhci_readl(host, SDHCI_PRESENT_STATE) &

Admin message