mmc: sdhci: Fix to handle MMC_POWER_UNDEFINED (84ec048b) · Commits · 戴 / test

Since commit ("mmc: core: Don't power off the card when starting the host"), the power state can still be MMC_POWER_UNDEFINED after mmc_start_host() is called. That can trigger a warning in SDHCI during runtime resume as it tries to restore the I/O state. Handle MMC_POWER_UNDEFINED simply by not updating the I/O state in that case. Fixes: ("mmc: core: Don't power off the card when starting the host") Signed-off-by:

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

Ulf Hansson <ulf.hansson@linaro.org>

drivers/mmc/host/sdhci.c

+19 −14

Original line number	Diff line number	Diff line
		@@ -1576,6 +1576,9 @@ static void sdhci_set_ios(struct mmc_host mmc, struct mmc_ios ios)
		unsigned long flags;
		u8 ctrl;

		if (ios->power_mode == MMC_POWER_UNDEFINED)
		return;

		spin_lock_irqsave(&host->lock, flags);

		if (host->flags & SDHCI_DEVICE_DEAD) {
		@@ -2938,6 +2941,7 @@ int sdhci_runtime_resume_host(struct sdhci_host *host)

		sdhci_init(host, 0);

		if (mmc->ios.power_mode != MMC_POWER_UNDEFINED) {
		/* Force clock and power re-program */
		host->pwr = 0;
		host->clock = 0;
		@@ -2954,6 +2958,7 @@ int sdhci_runtime_resume_host(struct sdhci_host *host)
		if ((mmc->caps2 & MMC_CAP2_HS400_ES) &&
		mmc->ops->hs400_enhanced_strobe)
		mmc->ops->hs400_enhanced_strobe(mmc, &mmc->ios);
		}

		spin_lock_irqsave(&host->lock, flags);

Admin message