| Message ID | 1475216340-15344-1-git-send-email-shawn.lin@rock-chips.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 30 September 2016 at 08:18, Shawn Lin <shawn.lin@rock-chips.com> wrote: > When introducing hs400es, I didn't notice that we haven't > switched voltage to 1V2 or 1V8 for it. That happens to work > as the first controller claiming to support hs400es, arasan(5.1), > which is designed to only support 1V8. So the voltage is fixed to 1V8. > But it actually is wrong, and will not fit for other host controllers. > Let's fix it. > > Fixes: commit 81ac2af65793ecf ("mmc: core: implement enhanced strobe support") > Cc: <stable@vger.kernel.org> > Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com> > > Reviewed-by: Douglas Anderson <dianders@chromium.org> Thanks, applied for fixes! Kind regards Uffe > --- > > Changes in v3: > - add Doug's tag > > Changes in v2: > - fix copy-paste error, mea culpa > > drivers/mmc/core/mmc.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c > index 3486bc7..f4ed5ac 100644 > --- a/drivers/mmc/core/mmc.c > +++ b/drivers/mmc/core/mmc.c > @@ -1263,6 +1263,16 @@ static int mmc_select_hs400es(struct mmc_card *card) > goto out_err; > } > > + if (card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS400_1_2V) > + err = __mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_120); > + > + if (err && card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS400_1_8V) > + err = __mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180); > + > + /* If fails try again during next card power cycle */ > + if (err) > + goto out_err; > + > err = mmc_select_bus_width(card); > if (err < 0) > goto out_err; > -- > 2.3.7 > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-mmc" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 3486bc7..f4ed5ac 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1263,6 +1263,16 @@ static int mmc_select_hs400es(struct mmc_card *card) goto out_err; } + if (card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS400_1_2V) + err = __mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_120); + + if (err && card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS400_1_8V) + err = __mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180); + + /* If fails try again during next card power cycle */ + if (err) + goto out_err; + err = mmc_select_bus_width(card); if (err < 0) goto out_err;
When introducing hs400es, I didn't notice that we haven't switched voltage to 1V2 or 1V8 for it. That happens to work as the first controller claiming to support hs400es, arasan(5.1), which is designed to only support 1V8. So the voltage is fixed to 1V8. But it actually is wrong, and will not fit for other host controllers. Let's fix it. Fixes: commit 81ac2af65793ecf ("mmc: core: implement enhanced strobe support") Cc: <stable@vger.kernel.org> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com> Reviewed-by: Douglas Anderson <dianders@chromium.org> --- Changes in v3: - add Doug's tag Changes in v2: - fix copy-paste error, mea culpa drivers/mmc/core/mmc.c | 10 ++++++++++ 1 file changed, 10 insertions(+)