Commit 99ac6bae authored by Wenchao Chen's avatar Wenchao Chen Committed by sanglipeng
Browse files

mmc: sdhci-sprd: Fix vqmmc not shutting down after the card was pulled 

stable inclusion
from stable-v5.10.203
commit 8b76708eb9f1f2168c9d06bd9b921d0e1dbe2fae
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9GXII

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8b76708eb9f1f2168c9d06bd9b921d0e1dbe2fae



--------------------------------

[ Upstream commit 477865af60b2117ceaa1d558e03559108c15c78c ]

With cat regulator_summary, we found that vqmmc was not shutting
down after the card was pulled.

cat /sys/kernel/debug/regulator/regulator_summary
1.before fix
1)Insert SD card
 vddsdio		1    1  0 unknown  3500mV 0mA  1200mV  3750mV
    71100000.mmc-vqmmc  1                         0mA  3500mV  3600mV

2)Pull out the SD card
 vddsdio                1    1  0 unknown  3500mV 0mA  1200mV  3750mV
    71100000.mmc-vqmmc  1                         0mA  3500mV  3600mV

2.after fix
1)Insert SD cardt
 vddsdio                1    1  0 unknown  3500mV 0mA  1200mV  3750mV
    71100000.mmc-vqmmc  1                         0mA  3500mV  3600mV

2)Pull out the SD card
 vddsdio		0    1  0 unknown  3500mV 0mA  1200mV  3750mV
    71100000.mmc-vqmmc  0                         0mA  3500mV  3600mV

Fixes: fb8bd90f ("mmc: sdhci-sprd: Add Spreadtrum's initial host controller")
Signed-off-by: default avatarWenchao Chen <wenchao.chen@unisoc.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20231115083406.7368-1-wenchao.chen@unisoc.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 4d2b1b67

drivers/mmc/host/sdhci-sprd.c

+25 −0
Original line number Diff line number Diff line
@@ -392,12 +392,33 @@ static void sdhci_sprd_request_done(struct sdhci_host *host, 
	mmc_request_done(host->mmc, mrq);

}



static void sdhci_sprd_set_power(struct sdhci_host *host, unsigned char mode,

				 unsigned short vdd)

{

	struct mmc_host *mmc = host->mmc;



	switch (mode) {

	case MMC_POWER_OFF:

		mmc_regulator_set_ocr(host->mmc, mmc->supply.vmmc, 0);



		mmc_regulator_disable_vqmmc(mmc);

		break;

	case MMC_POWER_ON:

		mmc_regulator_enable_vqmmc(mmc);

		break;

	case MMC_POWER_UP:

		mmc_regulator_set_ocr(host->mmc, mmc->supply.vmmc, vdd);

		break;

	}

}



static struct sdhci_ops sdhci_sprd_ops = {

	.read_l = sdhci_sprd_readl,

	.write_l = sdhci_sprd_writel,

	.write_w = sdhci_sprd_writew,

	.write_b = sdhci_sprd_writeb,

	.set_clock = sdhci_sprd_set_clock,

	.set_power = sdhci_sprd_set_power,

	.get_max_clock = sdhci_sprd_get_max_clock,

	.get_min_clock = sdhci_sprd_get_min_clock,

	.set_bus_width = sdhci_set_bus_width,
@@ -663,6 +684,10 @@ static int sdhci_sprd_probe(struct platform_device *pdev) 
	host->caps1 &= ~(SDHCI_SUPPORT_SDR50 | SDHCI_SUPPORT_SDR104 |

			 SDHCI_SUPPORT_DDR50);



	ret = mmc_regulator_get_supply(host->mmc);

	if (ret)

		goto pm_runtime_disable;



	ret = sdhci_setup_host(host);

	if (ret)

		goto pm_runtime_disable;