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

Commit a08b17be authored by Adrian Hunter's avatar Adrian Hunter Committed by Chris Ball
Browse files

mmc: core: fix init controller performance regression, updated patch 



Add MMC_CAP2_NO_PRESCAN_POWERUP to sdhci-pci.c also, use mmc_power_off()
for MMC_CAP2_NO_PRESCAN_POWERUP.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
[cjb: previously applied v1 of this patch instead of v4]
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent e48fc15a

drivers/mmc/core/core.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -2416,7 +2416,9 @@ void mmc_start_host(struct mmc_host *host) 
{

{

	host->f_init = max(freqs[0], host->f_min);

	host->f_init = max(freqs[0], host->f_min);

	host->rescan_disable = 0;

	host->rescan_disable = 0;

	if (!(host->caps2 & MMC_CAP2_NO_PRESCAN_POWERUP))

	if (host->caps2 & MMC_CAP2_NO_PRESCAN_POWERUP)

		mmc_power_off(host);

	else

		mmc_power_up(host);

		mmc_power_up(host);

	mmc_detect_change(host, 0);

	mmc_detect_change(host, 0);

}

}

drivers/mmc/host/sdhci-pci.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1280,6 +1280,7 @@ static struct sdhci_pci_slot *sdhci_pci_probe_slot( 




	host->mmc->pm_caps = MMC_PM_KEEP_POWER | MMC_PM_WAKE_SDIO_IRQ;

	host->mmc->pm_caps = MMC_PM_KEEP_POWER | MMC_PM_WAKE_SDIO_IRQ;

	host->mmc->slotno = slotno;

	host->mmc->slotno = slotno;

	host->mmc->caps2 |= MMC_CAP2_NO_PRESCAN_POWERUP;





	ret = sdhci_add_host(host);

	ret = sdhci_add_host(host);

	if (ret)

	if (ret)