lkml.org 
[lkml]   [2023]   [Jun]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    Date
    SubjectRe: [PATCH V7 11/23] mmc: sdhci-uhs2: add set_power() to support vdd2
    Hi, Adrian

    On Wed, Apr 12, 2023 at 9:10 PM Adrian Hunter <adrian.hunter@intel.com> wrote:
    >
    > On 31/03/23 13:55, Victor Shih wrote:
    > > This is a UHS-II version of sdhci's set_power operation.
    > > VDD2, as well as VDD, is handled here.
    > >
    > > Signed-off-by: Ben Chuang <ben.chuang@genesyslogic.com.tw>
    > > Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
    > > Signed-off-by: Victor Shih <victor.shih@genesyslogic.com.tw>
    > > ---
    > > drivers/mmc/host/sdhci-uhs2.c | 49 ++++++++++++++++++++++++++++
    > > drivers/mmc/host/sdhci.c | 61 +++++++++++++++++++----------------
    > > drivers/mmc/host/sdhci.h | 1 +
    > > 3 files changed, 83 insertions(+), 28 deletions(-)
    > >
    > > diff --git a/drivers/mmc/host/sdhci-uhs2.c b/drivers/mmc/host/sdhci-uhs2.c
    > > index 67621eaabafc..3f232f4e0820 100644
    > > --- a/drivers/mmc/host/sdhci-uhs2.c
    > > +++ b/drivers/mmc/host/sdhci-uhs2.c
    > > @@ -57,6 +57,13 @@ EXPORT_SYMBOL_GPL(sdhci_uhs2_dump_regs);
    > > * *
    > > \*****************************************************************************/
    > >
    > > +static inline int mmc_opt_regulator_set_ocr(struct mmc_host *mmc,
    > > + struct regulator *supply,
    > > + unsigned short vdd_bit)
    > > +{
    > > + return IS_ERR_OR_NULL(supply) ? 0 : mmc_regulator_set_ocr(mmc, supply, vdd_bit);
    > > +}
    > > +
    > > bool sdhci_uhs2_mode(struct sdhci_host *host)
    > > {
    > > return host->mmc->flags & MMC_UHS2_SUPPORT;
    > > @@ -95,6 +102,48 @@ void sdhci_uhs2_reset(struct sdhci_host *host, u16 mask)
    > > }
    > > EXPORT_SYMBOL_GPL(sdhci_uhs2_reset);
    > >
    > > +static void sdhci_uhs2_set_power(struct sdhci_host *host, unsigned char mode,
    > > + unsigned short vdd)
    >
    > CHECK: Alignment should match open parenthesis
    > #42: FILE: drivers/mmc/host/sdhci-uhs2.c:106:
    > +static void sdhci_uhs2_set_power(struct sdhci_host *host, unsigned char mode,
    > + unsigned short vdd)
    >
    >

    I will update it to the V8 version.

    > > +{
    > > + struct mmc_host *mmc = host->mmc;
    > > + u8 pwr;
    >
    > pwr needs initialize to 0 i.e.
    >
    > u8 pwr = 0;
    >

    I will update it to the V8 version.

    > > +
    > > + if (mode != MMC_POWER_OFF) {
    > > + pwr = sdhci_get_vdd_value(vdd);
    > > + if (!pwr)
    > > + WARN(1, "%s: Invalid vdd %#x\n",
    > > + mmc_hostname(host->mmc), vdd);
    > > + pwr |= SDHCI_VDD2_POWER_180;
    > > + }
    > > +
    > > + if (host->pwr == pwr)
    > > + return;
    > > + host->pwr = pwr;
    > > +
    > > + if (pwr == 0) {
    > > + sdhci_writeb(host, 0, SDHCI_POWER_CONTROL);
    > > +
    > > + mmc_opt_regulator_set_ocr(mmc, mmc->supply.vmmc, 0);
    > > + mmc_opt_regulator_set_ocr(mmc, mmc->supply.vmmc2, 0);
    > > + } else {
    > > + mmc_opt_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);
    > > + /* support 1.8v only for now */
    > > + mmc_opt_regulator_set_ocr(mmc, mmc->supply.vmmc2, fls(MMC_VDD_165_195) - 1);
    > > +
    > > + /* Clear the power reg before setting a new value */
    > > + sdhci_writeb(host, 0, SDHCI_POWER_CONTROL);
    > > +
    > > + /* vdd first */
    > > + pwr |= SDHCI_POWER_ON;
    > > + sdhci_writeb(host, pwr & 0xf, SDHCI_POWER_CONTROL);
    > > + mdelay(5);
    > > +
    > > + pwr |= SDHCI_VDD2_POWER_ON;
    > > + sdhci_writeb(host, pwr, SDHCI_POWER_CONTROL);
    > > + mdelay(5);
    > > + }
    > > +}
    > > +
    > > /*****************************************************************************\
    > > * *
    > > * Driver init/exit *
    > > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
    > > index e79e1b5d5cd4..a68a2dce0efe 100644
    > > --- a/drivers/mmc/host/sdhci.c
    > > +++ b/drivers/mmc/host/sdhci.c
    > > @@ -23,7 +23,7 @@
    > > #include <linux/regulator/consumer.h>
    > > #include <linux/pm_runtime.h>
    > > #include <linux/of.h>
    > > -
    > > +#include <linux/bug.h>
    > > #include <linux/leds.h>
    > >
    > > #include <linux/mmc/mmc.h>
    > > @@ -2061,41 +2061,46 @@ static void sdhci_set_power_reg(struct sdhci_host *host, unsigned char mode,
    > > sdhci_writeb(host, 0, SDHCI_POWER_CONTROL);
    > > }
    > >
    > > +unsigned short sdhci_get_vdd_value(unsigned short vdd)
    > > +{
    > > + switch (1 << vdd) {
    > > + case MMC_VDD_165_195:
    > > + /*
    > > + * Without a regulator, SDHCI does not support 2.0v
    > > + * so we only get here if the driver deliberately
    > > + * added the 2.0v range to ocr_avail. Map it to 1.8v
    > > + * for the purpose of turning on the power.
    > > + */
    > > + case MMC_VDD_20_21:
    > > + return SDHCI_POWER_180;
    > > + case MMC_VDD_29_30:
    > > + case MMC_VDD_30_31:
    > > + return SDHCI_POWER_300;
    > > + case MMC_VDD_32_33:
    > > + case MMC_VDD_33_34:
    > > + /*
    > > + * 3.4V ~ 3.6V are valid only for those platforms where it's
    > > + * known that the voltage reange is supported by hardware.
    > > + */
    > > + case MMC_VDD_34_35:
    > > + case MMC_VDD_35_36:
    > > + return SDHCI_POWER_330;
    > > + default:
    > > + return 0;
    > > + }
    > > +}
    > > +EXPORT_SYMBOL_GPL(sdhci_get_vdd_value);
    > > +
    > > void sdhci_set_power_noreg(struct sdhci_host *host, unsigned char mode,
    > > unsigned short vdd)
    > > {
    > > u8 pwr = 0;
    > >
    > > if (mode != MMC_POWER_OFF) {
    > > - switch (1 << vdd) {
    > > - case MMC_VDD_165_195:
    > > - /*
    > > - * Without a regulator, SDHCI does not support 2.0v
    > > - * so we only get here if the driver deliberately
    > > - * added the 2.0v range to ocr_avail. Map it to 1.8v
    > > - * for the purpose of turning on the power.
    > > - */
    > > - case MMC_VDD_20_21:
    > > - pwr = SDHCI_POWER_180;
    > > - break;
    > > - case MMC_VDD_29_30:
    > > - case MMC_VDD_30_31:
    > > - pwr = SDHCI_POWER_300;
    > > - break;
    > > - case MMC_VDD_32_33:
    > > - case MMC_VDD_33_34:
    > > - /*
    > > - * 3.4 ~ 3.6V are valid only for those platforms where it's
    > > - * known that the voltage range is supported by hardware.
    > > - */
    > > - case MMC_VDD_34_35:
    > > - case MMC_VDD_35_36:
    > > - pwr = SDHCI_POWER_330;
    > > - break;
    > > - default:
    > > + pwr = sdhci_get_vdd_value(vdd);
    > > + if (!pwr) {
    > > WARN(1, "%s: Invalid vdd %#x\n",
    > > mmc_hostname(host->mmc), vdd);
    > > - break;
    > > }
    > > }
    > >
    > > diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
    > > index 5dffa334d3fc..02ea4a00ad63 100644
    > > --- a/drivers/mmc/host/sdhci.h
    > > +++ b/drivers/mmc/host/sdhci.h
    > > @@ -838,6 +838,7 @@ void sdhci_set_power(struct sdhci_host *host, unsigned char mode,
    > > void sdhci_set_power_and_bus_voltage(struct sdhci_host *host,
    > > unsigned char mode,
    > > unsigned short vdd);
    > > +unsigned short sdhci_get_vdd_value(unsigned short vdd);
    > > void sdhci_set_power_noreg(struct sdhci_host *host, unsigned char mode,
    > > unsigned short vdd);
    > > int sdhci_get_cd_nogpio(struct mmc_host *mmc);
    >

    Thanks, Victor Shih

    \
     
     \ /
      Last update: 2023-06-21 12:31    [W:5.285 / U:0.656 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site