| Message ID | 1528809280-31116-6-git-send-email-ludovic.Barre@st.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 12 June 2018 at 15:14, Ludovic Barre <ludovic.Barre@st.com> wrote: > From: Ludovic Barre <ludovic.barre@st.com> > > A specific variant could have different power or clock procedures. > This patch allows to overwrite the default mmci_set_clkreg and > mmci_set_pwrreg for a specific variant. > > Signed-off-by: Ludovic Barre <ludovic.barre@st.com> > --- > drivers/mmc/host/mmci.c | 96 +++++++++++++++++++++++++++++-------------------- > drivers/mmc/host/mmci.h | 7 ++++ > 2 files changed, 64 insertions(+), 39 deletions(-) > > diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c > index ede95b7..801c86b 100644 > --- a/drivers/mmc/host/mmci.c > +++ b/drivers/mmc/host/mmci.c > @@ -374,6 +374,52 @@ static void mmci_set_clkreg(struct mmci_host *host, unsigned int desired) > mmci_write_clkreg(host, clk); > } > > +static void mmci_set_pwrreg(struct mmci_host *host, unsigned char power_mode, > + unsigned int pwr) > +{ > + struct variant_data *variant = host->variant; > + struct mmc_host *mmc = host->mmc; > + > + switch (power_mode) { > + case MMC_POWER_OFF: > + if (!IS_ERR(mmc->supply.vmmc)) > + mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0); > + > + if (!IS_ERR(mmc->supply.vqmmc) && host->vqmmc_enabled) { > + regulator_disable(mmc->supply.vqmmc); > + host->vqmmc_enabled = false; > + } > + > + break; > + case MMC_POWER_UP: > + if (!IS_ERR(mmc->supply.vmmc)) > + mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, > + mmc->ios.vdd); > + > + /* > + * The ST Micro variant doesn't have the PL180s MCI_PWR_UP > + * and instead uses MCI_PWR_ON so apply whatever value is > + * configured in the variant data. > + */ > + pwr |= variant->pwrreg_powerup; > + > + break; > + case MMC_POWER_ON: > + if (!IS_ERR(mmc->supply.vqmmc) && !host->vqmmc_enabled) { > + if (regulator_enable(mmc->supply.vqmmc) < 0) > + dev_err(mmc_dev(mmc), > + "failed to enable vqmmc regulator\n"); > + else > + host->vqmmc_enabled = true; > + } > + > + pwr |= MCI_PWR_ON; > + break; > + } > + > + mmci_write_pwrreg(host, pwr); > +} > + > static void > mmci_request_end(struct mmci_host *host, struct mmc_request *mrq) > { > @@ -1031,7 +1077,7 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) > { > struct mmci_host *host = mmc_priv(mmc); > struct variant_data *variant = host->variant; > - u32 pwr = 0; > + unsigned int pwr = 0; ? > unsigned long flags; > int ret; > > @@ -1039,42 +1085,6 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) > host->plat->ios_handler(mmc_dev(mmc), ios)) > dev_err(mmc_dev(mmc), "platform ios_handler failed\n"); > > - switch (ios->power_mode) { > - case MMC_POWER_OFF: > - if (!IS_ERR(mmc->supply.vmmc)) > - mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0); > - > - if (!IS_ERR(mmc->supply.vqmmc) && host->vqmmc_enabled) { > - regulator_disable(mmc->supply.vqmmc); > - host->vqmmc_enabled = false; > - } > - > - break; > - case MMC_POWER_UP: > - if (!IS_ERR(mmc->supply.vmmc)) > - mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, ios->vdd); > - > - /* > - * The ST Micro variant doesn't have the PL180s MCI_PWR_UP > - * and instead uses MCI_PWR_ON so apply whatever value is > - * configured in the variant data. > - */ > - pwr |= variant->pwrreg_powerup; > - > - break; > - case MMC_POWER_ON: > - if (!IS_ERR(mmc->supply.vqmmc) && !host->vqmmc_enabled) { > - ret = regulator_enable(mmc->supply.vqmmc); > - if (ret < 0) > - dev_err(mmc_dev(mmc), > - "failed to enable vqmmc regulator\n"); > - else > - host->vqmmc_enabled = true; > - } > - > - pwr |= MCI_PWR_ON; > - break; > - } This above looks like pure re-factoring. Please make the above change a separate patch. > > if (variant->signal_direction && ios->power_mode != MMC_POWER_OFF) { > /* > @@ -1126,8 +1136,16 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) > > spin_lock_irqsave(&host->lock, flags); > > - mmci_set_clkreg(host, ios->clock); > - mmci_write_pwrreg(host, pwr); > + if (variant->set_clkreg) > + variant->set_clkreg(host, ios->clock); > + else > + mmci_set_clkreg(host, ios->clock); This means a change in behavior, which I don't think is what you want. 1) The spin lock will be held while doing the regulator operations. 2) The clock register will be written to before the regulator operations have been done. Not sure if that works fine!? An overall comment, I think we should create a mmci_host_ops structure and put the needed callbacks in there (kept to a minimum of course), rather than putting them as a part of the variant struct. More importantly, also the legacy mmci variants should get a mmci_host_ops structure assigned during probe. The point is, I think it makes the code above (and future wise) more flexible. It should also allow us to better share functions between the variants. In principle, I expect that we end up with a bunch of "library" mmci functions that can be invoked from variant's mmci_host_ops (if not assigned directly). > + > + if (variant->set_pwrreg) > + variant->set_pwrreg(host, ios->power_mode, pwr); > + else > + mmci_set_pwrreg(host, ios->power_mode, pwr); > + > mmci_reg_delay(host); > > spin_unlock_irqrestore(&host->lock, flags); > diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h > index 2ba9640..7265ca6 100644 > --- a/drivers/mmc/host/mmci.h > +++ b/drivers/mmc/host/mmci.h > @@ -231,6 +231,7 @@ > > struct clk; > struct dma_chan; > +struct mmci_host; > > /** > * struct variant_data - MMCI variant-specific quirks > @@ -273,6 +274,8 @@ struct dma_chan; > * register. > * @opendrain: bitmask identifying the OPENDRAIN bit inside MMCIPOWER register > * @mmci_dma: Pointer to platform-specific DMA callbacks. > + * @set_clk_ios: if clock procedure of variant is specific > + * @set_pwr_ios: if power procedure of variant is specific > */ > struct variant_data { > unsigned int clkreg; > @@ -307,6 +310,9 @@ struct variant_data { > u32 start_err; > u32 opendrain; > struct mmci_dma_ops *mmci_dma; > + void (*set_clkreg)(struct mmci_host *host, unsigned int desired); > + void (*set_pwrreg)(struct mmci_host *host, unsigned char power_mode, > + unsigned int pwr); > }; > > struct mmci_host { > @@ -328,6 +334,7 @@ struct mmci_host { > u32 pwr_reg; > u32 pwr_reg_add; > u32 clk_reg; > + u32 clk_reg_add; What's this? Some leftover I guess? > u32 datactrl_reg; > u32 busy_status; > u32 mask1_reg; > -- > 2.7.4 > Kind regards Uffe
On 07/05/2018 03:48 PM, Ulf Hansson wrote: > On 12 June 2018 at 15:14, Ludovic Barre <ludovic.Barre@st.com> wrote: >> From: Ludovic Barre <ludovic.barre@st.com> >> >> A specific variant could have different power or clock procedures. >> This patch allows to overwrite the default mmci_set_clkreg and >> mmci_set_pwrreg for a specific variant. >> >> Signed-off-by: Ludovic Barre <ludovic.barre@st.com> >> --- >> drivers/mmc/host/mmci.c | 96 +++++++++++++++++++++++++++++-------------------- >> drivers/mmc/host/mmci.h | 7 ++++ >> 2 files changed, 64 insertions(+), 39 deletions(-) >> >> diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c >> index ede95b7..801c86b 100644 >> --- a/drivers/mmc/host/mmci.c >> +++ b/drivers/mmc/host/mmci.c >> @@ -374,6 +374,52 @@ static void mmci_set_clkreg(struct mmci_host *host, unsigned int desired) >> mmci_write_clkreg(host, clk); >> } >> >> +static void mmci_set_pwrreg(struct mmci_host *host, unsigned char power_mode, >> + unsigned int pwr) >> +{ >> + struct variant_data *variant = host->variant; >> + struct mmc_host *mmc = host->mmc; >> + >> + switch (power_mode) { >> + case MMC_POWER_OFF: >> + if (!IS_ERR(mmc->supply.vmmc)) >> + mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0); >> + >> + if (!IS_ERR(mmc->supply.vqmmc) && host->vqmmc_enabled) { >> + regulator_disable(mmc->supply.vqmmc); >> + host->vqmmc_enabled = false; >> + } >> + >> + break; >> + case MMC_POWER_UP: >> + if (!IS_ERR(mmc->supply.vmmc)) >> + mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, >> + mmc->ios.vdd); >> + >> + /* >> + * The ST Micro variant doesn't have the PL180s MCI_PWR_UP >> + * and instead uses MCI_PWR_ON so apply whatever value is >> + * configured in the variant data. >> + */ >> + pwr |= variant->pwrreg_powerup; >> + >> + break; >> + case MMC_POWER_ON: >> + if (!IS_ERR(mmc->supply.vqmmc) && !host->vqmmc_enabled) { >> + if (regulator_enable(mmc->supply.vqmmc) < 0) >> + dev_err(mmc_dev(mmc), >> + "failed to enable vqmmc regulator\n"); >> + else >> + host->vqmmc_enabled = true; >> + } >> + >> + pwr |= MCI_PWR_ON; >> + break; >> + } >> + >> + mmci_write_pwrreg(host, pwr); >> +} >> + >> static void >> mmci_request_end(struct mmci_host *host, struct mmc_request *mrq) >> { >> @@ -1031,7 +1077,7 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) >> { >> struct mmci_host *host = mmc_priv(mmc); >> struct variant_data *variant = host->variant; >> - u32 pwr = 0; >> + unsigned int pwr = 0; > > ? yes not needed rewritten due to re-factoring > >> unsigned long flags; >> int ret; >> >> @@ -1039,42 +1085,6 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) >> host->plat->ios_handler(mmc_dev(mmc), ios)) >> dev_err(mmc_dev(mmc), "platform ios_handler failed\n"); >> >> - switch (ios->power_mode) { >> - case MMC_POWER_OFF: >> - if (!IS_ERR(mmc->supply.vmmc)) >> - mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0); >> - >> - if (!IS_ERR(mmc->supply.vqmmc) && host->vqmmc_enabled) { >> - regulator_disable(mmc->supply.vqmmc); >> - host->vqmmc_enabled = false; >> - } >> - >> - break; >> - case MMC_POWER_UP: >> - if (!IS_ERR(mmc->supply.vmmc)) >> - mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, ios->vdd); >> - >> - /* >> - * The ST Micro variant doesn't have the PL180s MCI_PWR_UP >> - * and instead uses MCI_PWR_ON so apply whatever value is >> - * configured in the variant data. >> - */ >> - pwr |= variant->pwrreg_powerup; >> - >> - break; >> - case MMC_POWER_ON: >> - if (!IS_ERR(mmc->supply.vqmmc) && !host->vqmmc_enabled) { >> - ret = regulator_enable(mmc->supply.vqmmc); >> - if (ret < 0) >> - dev_err(mmc_dev(mmc), >> - "failed to enable vqmmc regulator\n"); >> - else >> - host->vqmmc_enabled = true; >> - } >> - >> - pwr |= MCI_PWR_ON; >> - break; >> - } > > This above looks like pure re-factoring. Please make the above change > a separate patch. OK > >> >> if (variant->signal_direction && ios->power_mode != MMC_POWER_OFF) { >> /* >> @@ -1126,8 +1136,16 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) >> >> spin_lock_irqsave(&host->lock, flags); >> >> - mmci_set_clkreg(host, ios->clock); >> - mmci_write_pwrreg(host, pwr); >> + if (variant->set_clkreg) >> + variant->set_clkreg(host, ios->clock); >> + else >> + mmci_set_clkreg(host, ios->clock); > > This means a change in behavior, which I don't think is what you want. > > 1) The spin lock will be held while doing the regulator operations. Yes, you are right, the behavior around spin lock has been modified for legacy. I will try to find a solution to avoid behavior change for legacy. For power, sdmmc variant have specific need to reset the sdmmc variant and set power register before to disable the vqmmc regulator. that's why I move the regulator operation in mmci_set_pwrreg. > 2) The clock register will be written to before the regulator > operations have been done. Not sure if that works fine!? you are right, it's probably better if the clock is done after power. do you agree if I change the order? > > An overall comment, I think we should create a mmci_host_ops structure > and put the needed callbacks in there (kept to a minimum of course), > rather than putting them as a part of the variant struct. More > importantly, also the legacy mmci variants should get a mmci_host_ops > structure assigned during probe. > > The point is, I think it makes the code above (and future wise) more > flexible. It should also allow us to better share functions between > the variants. In principle, I expect that we end up with a bunch of > "library" mmci functions that can be invoked from variant's > mmci_host_ops (if not assigned directly). After "Linaro connect" we have exchanged some emails (subject: "STM32MP1 SDMMC driver review") and the start point was "Goal is not to redesign mmci.c like sdhci.c." This it's why I'm surprise by "library" and "mmci_host_ops" and comment of patch 01. So, it's not clear for me on where we wish to go. Could you clarify the way, if it's with a mmci_ops like sdhci_ops? > >> + >> + if (variant->set_pwrreg) >> + variant->set_pwrreg(host, ios->power_mode, pwr); >> + else >> + mmci_set_pwrreg(host, ios->power_mode, pwr); >> + >> mmci_reg_delay(host); >> >> spin_unlock_irqrestore(&host->lock, flags); >> diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h >> index 2ba9640..7265ca6 100644 >> --- a/drivers/mmc/host/mmci.h >> +++ b/drivers/mmc/host/mmci.h >> @@ -231,6 +231,7 @@ >> >> struct clk; >> struct dma_chan; >> +struct mmci_host; >> >> /** >> * struct variant_data - MMCI variant-specific quirks >> @@ -273,6 +274,8 @@ struct dma_chan; >> * register. >> * @opendrain: bitmask identifying the OPENDRAIN bit inside MMCIPOWER register >> * @mmci_dma: Pointer to platform-specific DMA callbacks. >> + * @set_clk_ios: if clock procedure of variant is specific >> + * @set_pwr_ios: if power procedure of variant is specific >> */ >> struct variant_data { >> unsigned int clkreg; >> @@ -307,6 +310,9 @@ struct variant_data { >> u32 start_err; >> u32 opendrain; >> struct mmci_dma_ops *mmci_dma; >> + void (*set_clkreg)(struct mmci_host *host, unsigned int desired); >> + void (*set_pwrreg)(struct mmci_host *host, unsigned char power_mode, >> + unsigned int pwr); >> }; >> >> struct mmci_host { >> @@ -328,6 +334,7 @@ struct mmci_host { >> u32 pwr_reg; >> u32 pwr_reg_add; >> u32 clk_reg; >> + u32 clk_reg_add; > > What's this? Some leftover I guess? > >> u32 datactrl_reg; >> u32 busy_status; >> u32 mask1_reg; >> -- >> 2.7.4 >> > > Kind regards > Uffe >
[...] >> 2) The clock register will be written to before the regulator >> operations have been done. Not sure if that works fine!? > > > you are right, it's probably better if the clock is done after power. > do you agree if I change the order? If the new ST variant can cope with the existing order in the current code, then let's stick to that to avoid breaking legacy variants. > >> >> An overall comment, I think we should create a mmci_host_ops structure >> and put the needed callbacks in there (kept to a minimum of course), >> rather than putting them as a part of the variant struct. More >> importantly, also the legacy mmci variants should get a mmci_host_ops >> structure assigned during probe. >> >> The point is, I think it makes the code above (and future wise) more >> flexible. It should also allow us to better share functions between >> the variants. In principle, I expect that we end up with a bunch of >> "library" mmci functions that can be invoked from variant's >> mmci_host_ops (if not assigned directly). > > > After "Linaro connect" we have exchanged some emails (subject: "STM32MP1 > SDMMC driver review") and the start point was > "Goal is not to redesign mmci.c like sdhci.c." > This it's why I'm surprise by "library" and "mmci_host_ops" > and comment of patch 01. Sometimes it's easier to look at patches/code, instead of giving qualified guesses what is the best solution. Try something, realize what is better, then try again... The point is, we need callbacks to cope with the variants as we can't have quirks for everything, and you are demonstrating that in $subject patch. Since this is the case, then I think it's better to make it more flexible, already from the beginning and thus put the callbacks in a new mmci host ops structure instead. > > So, it's not clear for me on where we wish to go. > Could you clarify the way, if it's with a mmci_ops like sdhci_ops? Yep, something along those lines. However, we don't want to introduce unnecessary callbacks and complexity. We should strive towards sharing common functionality through library functions in mmci.c, rather than having callbacks for every single difference. Does it makes sense? [...] Kind regards Uffe
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index ede95b7..801c86b 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -374,6 +374,52 @@ static void mmci_set_clkreg(struct mmci_host *host, unsigned int desired) mmci_write_clkreg(host, clk); } +static void mmci_set_pwrreg(struct mmci_host *host, unsigned char power_mode, + unsigned int pwr) +{ + struct variant_data *variant = host->variant; + struct mmc_host *mmc = host->mmc; + + switch (power_mode) { + case MMC_POWER_OFF: + if (!IS_ERR(mmc->supply.vmmc)) + mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0); + + if (!IS_ERR(mmc->supply.vqmmc) && host->vqmmc_enabled) { + regulator_disable(mmc->supply.vqmmc); + host->vqmmc_enabled = false; + } + + break; + case MMC_POWER_UP: + if (!IS_ERR(mmc->supply.vmmc)) + mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, + mmc->ios.vdd); + + /* + * The ST Micro variant doesn't have the PL180s MCI_PWR_UP + * and instead uses MCI_PWR_ON so apply whatever value is + * configured in the variant data. + */ + pwr |= variant->pwrreg_powerup; + + break; + case MMC_POWER_ON: + if (!IS_ERR(mmc->supply.vqmmc) && !host->vqmmc_enabled) { + if (regulator_enable(mmc->supply.vqmmc) < 0) + dev_err(mmc_dev(mmc), + "failed to enable vqmmc regulator\n"); + else + host->vqmmc_enabled = true; + } + + pwr |= MCI_PWR_ON; + break; + } + + mmci_write_pwrreg(host, pwr); +} + static void mmci_request_end(struct mmci_host *host, struct mmc_request *mrq) { @@ -1031,7 +1077,7 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) { struct mmci_host *host = mmc_priv(mmc); struct variant_data *variant = host->variant; - u32 pwr = 0; + unsigned int pwr = 0; unsigned long flags; int ret; @@ -1039,42 +1085,6 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) host->plat->ios_handler(mmc_dev(mmc), ios)) dev_err(mmc_dev(mmc), "platform ios_handler failed\n"); - switch (ios->power_mode) { - case MMC_POWER_OFF: - if (!IS_ERR(mmc->supply.vmmc)) - mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0); - - if (!IS_ERR(mmc->supply.vqmmc) && host->vqmmc_enabled) { - regulator_disable(mmc->supply.vqmmc); - host->vqmmc_enabled = false; - } - - break; - case MMC_POWER_UP: - if (!IS_ERR(mmc->supply.vmmc)) - mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, ios->vdd); - - /* - * The ST Micro variant doesn't have the PL180s MCI_PWR_UP - * and instead uses MCI_PWR_ON so apply whatever value is - * configured in the variant data. - */ - pwr |= variant->pwrreg_powerup; - - break; - case MMC_POWER_ON: - if (!IS_ERR(mmc->supply.vqmmc) && !host->vqmmc_enabled) { - ret = regulator_enable(mmc->supply.vqmmc); - if (ret < 0) - dev_err(mmc_dev(mmc), - "failed to enable vqmmc regulator\n"); - else - host->vqmmc_enabled = true; - } - - pwr |= MCI_PWR_ON; - break; - } if (variant->signal_direction && ios->power_mode != MMC_POWER_OFF) { /* @@ -1126,8 +1136,16 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) spin_lock_irqsave(&host->lock, flags); - mmci_set_clkreg(host, ios->clock); - mmci_write_pwrreg(host, pwr); + if (variant->set_clkreg) + variant->set_clkreg(host, ios->clock); + else + mmci_set_clkreg(host, ios->clock); + + if (variant->set_pwrreg) + variant->set_pwrreg(host, ios->power_mode, pwr); + else + mmci_set_pwrreg(host, ios->power_mode, pwr); + mmci_reg_delay(host); spin_unlock_irqrestore(&host->lock, flags); diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h index 2ba9640..7265ca6 100644 --- a/drivers/mmc/host/mmci.h +++ b/drivers/mmc/host/mmci.h @@ -231,6 +231,7 @@ struct clk; struct dma_chan; +struct mmci_host; /** * struct variant_data - MMCI variant-specific quirks @@ -273,6 +274,8 @@ struct dma_chan; * register. * @opendrain: bitmask identifying the OPENDRAIN bit inside MMCIPOWER register * @mmci_dma: Pointer to platform-specific DMA callbacks. + * @set_clk_ios: if clock procedure of variant is specific + * @set_pwr_ios: if power procedure of variant is specific */ struct variant_data { unsigned int clkreg; @@ -307,6 +310,9 @@ struct variant_data { u32 start_err; u32 opendrain; struct mmci_dma_ops *mmci_dma; + void (*set_clkreg)(struct mmci_host *host, unsigned int desired); + void (*set_pwrreg)(struct mmci_host *host, unsigned char power_mode, + unsigned int pwr); }; struct mmci_host { @@ -328,6 +334,7 @@ struct mmci_host { u32 pwr_reg; u32 pwr_reg_add; u32 clk_reg; + u32 clk_reg_add; u32 datactrl_reg; u32 busy_status; u32 mask1_reg;