@@ -2468,8 +2468,9 @@ int mmc_hw_reset(struct mmc_host *host)
ret = host->bus_ops->reset(host);
mmc_bus_put(host);
- if (ret != -EOPNOTSUPP)
- pr_warn("%s: tried to reset card\n", mmc_hostname(host));
+ if (ret)
+ pr_warn("%s: tried to reset card, got error %d\n",
+ mmc_hostname(host), ret);
return ret;
}
@@ -1988,19 +1988,17 @@ static int mmc_reset(struct mmc_host *host)
{
struct mmc_card *card = host->card;
- if (!(host->caps & MMC_CAP_HW_RESET) || !host->ops->hw_reset)
- return -EOPNOTSUPP;
-
- if (!mmc_can_reset(card))
- return -EOPNOTSUPP;
-
mmc_set_clock(host, host->f_init);
-
- host->ops->hw_reset(host);
-
+ if ((host->caps & MMC_CAP_HW_RESET) && host->ops->hw_reset &&
+ mmc_can_reset(card)) {
+ /* If the card accept RST_n signal, send it. */
+ host->ops->hw_reset(host);
+ } else {
+ /* Do a brute force power cycle */
+ mmc_power_cycle(host, card->ocr);
+ }
/* Set initial state and call mmc_set_ios */
mmc_set_initial_state(host);
-
return mmc_init_card(host, card->ocr, card);
}
When the eMMC device does not support/allow sending RST_n signal, do a brute force power cycle instead of returning EOPNOTSUPP. Signed-off-by: Gwendal Grignou <gwendal@chromium.org> --- Changes in v2: - Fix indentation. - Use card instead of host->card when available. drivers/mmc/core/core.c | 5 +++-- drivers/mmc/core/mmc.c | 18 ++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-)