On Tue, 14 Jan 2025 at 09:35, Yuanjie Yang <quic_yuanjiey@xxxxxxxxxxx> wrote: > > 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@xxxxxxxxxxx> Applied for next, thanks! Kind regards Uffe > --- > Changes in v4: > - Optimize msm_config_vmmc_regulator and msm_config_vqmmc_regulator code logic > - Delete redundant return in msm_config_vmmc_regulator and msm_config_vqmmc_regulator > - Rebase on tag: next-20250114 > - Link to v3: https://lore.kernel.org/linux-arm-msm/20241226031845.2574669-1-quic_yuanjiey@xxxxxxxxxxx/ > > Changes in v3: > - Optimize the code logic and separate code for regulator vmmc and vqmmc > - Rebase on tag: next-20241217 > - Link to v2: https://lore.kernel.org/all/20241127095029.3918290-1-quic_yuanjiey@xxxxxxxxxxx/ > > Changes in v2: > - Add enum msm_reg_type to optimize the code > - Delete redundant emmc type judgment > - Link to v1: https://lore.kernel.org/linux-arm-msm/20241122075048.2006894-1-quic_yuanjiey@xxxxxxxxxxx/ > > --- > drivers/mmc/host/sdhci-msm.c | 53 ++++++++++++++++++++++++++++++++++-- > 1 file changed, 51 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c > index 4610f067faca..e3d39311fdc7 100644 > --- a/drivers/mmc/host/sdhci-msm.c > +++ b/drivers/mmc/host/sdhci-msm.c > @@ -134,9 +134,18 @@ > /* 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) > > @@ -1403,11 +1412,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); > } > > @@ -1420,6 +1466,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) > @@ -1642,7 +1690,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); > > base-commit: dab2734f8e9ecba609d66d1dd087a392a7774c04 > -- > 2.34.1 >
