]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mmc: sdhci-msm: Correctly set the load for the regulator
authorYuanjie Yang <quic_yuanjiey@quicinc.com>
Tue, 14 Jan 2025 08:35:14 +0000 (16:35 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Mar 2025 11:47:02 +0000 (12:47 +0100)
[ Upstream commit 20a0c37e44063997391430c4ae09973e9cbc3911 ]

Qualcomm regulator supports two power supply modes: HPM and LPM.
Currently, the sdhci-msm.c driver does not set the load to adjust
the current for eMMC and SD. If the regulator dont't set correct
load in LPM state, it will lead to the inability to properly
initialize eMMC and SD.

Set the correct regulator current for eMMC and SD to ensure that the
device can work normally even when the regulator is in LPM.

Signed-off-by: Yuanjie Yang <quic_yuanjiey@quicinc.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20250114083514.258379-1-quic_yuanjiey@quicinc.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/mmc/host/sdhci-msm.c

index 3366956a4ff18df92f66afbf6004a95e72287c8b..c9298a986ef0a693283837f121948f7f4983f63d 100644 (file)
 /* Timeout value to avoid infinite waiting for pwr_irq */
 #define MSM_PWR_IRQ_TIMEOUT_MS 5000
 
+/* Max load for eMMC Vdd supply */
+#define MMC_VMMC_MAX_LOAD_UA   570000
+
 /* Max load for eMMC Vdd-io supply */
 #define MMC_VQMMC_MAX_LOAD_UA  325000
 
+/* Max load for SD Vdd supply */
+#define SD_VMMC_MAX_LOAD_UA    800000
+
+/* Max load for SD Vdd-io supply */
+#define SD_VQMMC_MAX_LOAD_UA   22000
+
 #define msm_host_readl(msm_host, host, offset) \
        msm_host->var_ops->msm_readl_relaxed(host, offset)
 
@@ -1383,11 +1392,48 @@ static int sdhci_msm_set_pincfg(struct sdhci_msm_host *msm_host, bool level)
        return ret;
 }
 
-static int sdhci_msm_set_vmmc(struct mmc_host *mmc)
+static void msm_config_vmmc_regulator(struct mmc_host *mmc, bool hpm)
+{
+       int load;
+
+       if (!hpm)
+               load = 0;
+       else if (!mmc->card)
+               load = max(MMC_VMMC_MAX_LOAD_UA, SD_VMMC_MAX_LOAD_UA);
+       else if (mmc_card_mmc(mmc->card))
+               load = MMC_VMMC_MAX_LOAD_UA;
+       else if (mmc_card_sd(mmc->card))
+               load = SD_VMMC_MAX_LOAD_UA;
+       else
+               return;
+
+       regulator_set_load(mmc->supply.vmmc, load);
+}
+
+static void msm_config_vqmmc_regulator(struct mmc_host *mmc, bool hpm)
+{
+       int load;
+
+       if (!hpm)
+               load = 0;
+       else if (!mmc->card)
+               load = max(MMC_VQMMC_MAX_LOAD_UA, SD_VQMMC_MAX_LOAD_UA);
+       else if (mmc_card_sd(mmc->card))
+               load = SD_VQMMC_MAX_LOAD_UA;
+       else
+               return;
+
+       regulator_set_load(mmc->supply.vqmmc, load);
+}
+
+static int sdhci_msm_set_vmmc(struct sdhci_msm_host *msm_host,
+                             struct mmc_host *mmc, bool hpm)
 {
        if (IS_ERR(mmc->supply.vmmc))
                return 0;
 
+       msm_config_vmmc_regulator(mmc, hpm);
+
        return mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, mmc->ios.vdd);
 }
 
@@ -1400,6 +1446,8 @@ static int msm_toggle_vqmmc(struct sdhci_msm_host *msm_host,
        if (msm_host->vqmmc_enabled == level)
                return 0;
 
+       msm_config_vqmmc_regulator(mmc, level);
+
        if (level) {
                /* Set the IO voltage regulator to default voltage level */
                if (msm_host->caps_0 & CORE_3_0V_SUPPORT)
@@ -1622,7 +1670,8 @@ static void sdhci_msm_handle_pwr_irq(struct sdhci_host *host, int irq)
        }
 
        if (pwr_state) {
-               ret = sdhci_msm_set_vmmc(mmc);
+               ret = sdhci_msm_set_vmmc(msm_host, mmc,
+                                        pwr_state & REQ_BUS_ON);
                if (!ret)
                        ret = sdhci_msm_set_vqmmc(msm_host, mmc,
                                        pwr_state & REQ_BUS_ON);