MLK-21176 mmc: correct the HS400 initialization process

After the commit b9a2a0e2e9c0 ("mmc: Add support for downgrading
HS200/HS400 to HS mode"), it add a parameter in mmc_set_card_speed()
which indicates that the HS200/HS400 to HS downgrade is happening.

During the HS400 initialization, first select to HS200, and config
the related clock rate, then downgrade to HS mode. So here also need
to config the downgrade value to be true, make sure in the function
mmc_set_card_speed(), after switch to HS mode, first config the
clock rate, then read the EXT_CSD. Otherwise read EXT_CSD in HS mode
at wrong clock rate, e.g. 200MHz, may lead to uncertain result.

Test on i.MX8QM MEK board, some Micron eMMC will stuck in transfer
mode in this case, and USDHC will never get data transfer complete
status, cause the uboot hang.

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
(cherry picked from commit 0ba8e1c6efa2e9c34c9b54105d6c50ee293ec1d7)

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 4db80cb..3e88be9 100644 (file)
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -1948,14 +1948,10 @@ static int mmc_select_hs400es(struct mmc *mmc)
 {
        int err;
 
-       err = mmc_set_card_speed(mmc, MMC_HS);
+       err = mmc_set_card_speed(mmc, MMC_HS, true);
        if (err)
                return err;
 
-       /* configure the bus mode (host) */
-       mmc_select_mode(mmc, MMC_HS);
-       mmc_set_clock(mmc, mmc->tran_speed, false);
-
        err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL,
                EXT_CSD_BUS_WIDTH, EXT_CSD_BUS_WIDTH_8 |
                EXT_CSD_DDR_FLAG | EXT_CSD_BUS_WIDTH_STROBE);