From: Maxime Ripard Date: Fri, 4 Nov 2016 15:18:08 +0000 (+0100) Subject: mmc: Retry the switch command X-Git-Tag: v2017.01-rc1~251^2~3 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a9003dc641cf881992897585392567811652de09;p=oweals%2Fu-boot.git mmc: Retry the switch command Some eMMC will fail at the first switch, but would succeed in a subsequent one. Make sure we try several times to cover those cases. The number of retries (and the behaviour) is currently what is being used in Linux. Signed-off-by: Maxime Ripard Reviewed-by: Hans de Goede Reviewed-by: Tom Rini --- diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 4380c7c195..d6b7e4f510 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -494,6 +494,7 @@ int mmc_switch(struct mmc *mmc, u8 set, u8 index, u8 value) { struct mmc_cmd cmd; int timeout = 1000; + int retries = 3; int ret; cmd.cmdidx = MMC_CMD_SWITCH; @@ -502,11 +503,17 @@ int mmc_switch(struct mmc *mmc, u8 set, u8 index, u8 value) (index << 16) | (value << 8); - ret = mmc_send_cmd(mmc, &cmd, NULL); + while (retries > 0) { + ret = mmc_send_cmd(mmc, &cmd, NULL); - /* Waiting for the ready status */ - if (!ret) - ret = mmc_send_status(mmc, timeout); + /* Waiting for the ready status */ + if (!ret) { + ret = mmc_send_status(mmc, timeout); + return ret; + } + + retries--; + } return ret;