Merge tag '2019.01-next' of https://github.com/mbgg/u-boot

[platform/kernel/u-boot.git] / drivers / mmc / mmc.c

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index d6b9cdc..b04345a 100644 (file)
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -724,7 +724,8 @@ static int mmc_send_ext_csd(struct mmc *mmc, u8 *ext_csd)
        return err;
 }
 
-int mmc_switch(struct mmc *mmc, u8 set, u8 index, u8 value)
+static int __mmc_switch(struct mmc *mmc, u8 set, u8 index, u8 value,
+                       bool send_status)
 {
        struct mmc_cmd cmd;
        int timeout = 1000;
@@ -740,21 +741,32 @@ int mmc_switch(struct mmc *mmc, u8 set, u8 index, u8 value)
        while (retries > 0) {
                ret = mmc_send_cmd(mmc, &cmd, NULL);
 
-               /* Waiting for the ready status */
-               if (!ret) {
-                       ret = mmc_send_status(mmc, timeout);
-                       return ret;
+               if (ret) {
+                       retries--;
+                       continue;
+               }
+
+               if (!send_status) {
+                       mdelay(50);
+                       return 0;
                }
 
-               retries--;
+               /* Waiting for the ready status */
+               return mmc_send_status(mmc, timeout);
        }
 
        return ret;
 
 }
 
+int mmc_switch(struct mmc *mmc, u8 set, u8 index, u8 value)
+{
+       return __mmc_switch(mmc, set, index, value, true);
+}
+
 #if !CONFIG_IS_ENABLED(MMC_TINY)
-static int mmc_set_card_speed(struct mmc *mmc, enum bus_mode mode)
+static int mmc_set_card_speed(struct mmc *mmc, enum bus_mode mode,
+                             bool hsdowngrade)
 {
        int err;
        int speed_bits;
@@ -783,11 +795,26 @@ static int mmc_set_card_speed(struct mmc *mmc, enum bus_mode mode)
        default:
                return -EINVAL;
        }
-       err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_HS_TIMING,
-                        speed_bits);
+
+       err = __mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_HS_TIMING,
+                          speed_bits, !hsdowngrade);
        if (err)
                return err;
 
+#if CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) || \
+    CONFIG_IS_ENABLED(MMC_HS400_SUPPORT)
+       /*
+        * In case the eMMC is in HS200/HS400 mode and we are downgrading
+        * to HS mode, the card clock are still running much faster than
+        * the supported HS mode clock, so we can not reliably read out
+        * Extended CSD. Reconfigure the controller to run at HS mode.
+        */
+       if (hsdowngrade) {
+               mmc_select_mode(mmc, MMC_HS);
+               mmc_set_clock(mmc, mmc_mode2freq(mmc, MMC_HS), false);
+       }
+#endif
+
        if ((mode == MMC_HS) || (mode == MMC_HS_52)) {
                /* Now check to see that it worked */
                err = mmc_send_ext_csd(mmc, test_csd);
@@ -1289,6 +1316,10 @@ static int sd_set_card_speed(struct mmc *mmc, enum bus_mode mode)
        ALLOC_CACHE_ALIGN_BUFFER(uint, switch_status, 16);
        int speed;
 
+       /* SD version 1.00 and 1.01 does not support CMD 6 */
+       if (mmc->version == SD_VERSION_1_0)
+               return 0;
+
        switch (mode) {
        case SD_LEGACY:
                speed = UHS_SDR12_BUS_SPEED;
@@ -1845,7 +1876,7 @@ static int mmc_select_hs400(struct mmc *mmc)
        int err;
 
        /* Set timing to HS200 for tuning */
-       err = mmc_set_card_speed(mmc, MMC_HS_200);
+       err = mmc_set_card_speed(mmc, MMC_HS_200, false);
        if (err)
                return err;
 
@@ -1861,7 +1892,7 @@ static int mmc_select_hs400(struct mmc *mmc)
        }
 
        /* Set back to HS */
-       mmc_set_card_speed(mmc, MMC_HS);
+       mmc_set_card_speed(mmc, MMC_HS, false);
        mmc_set_clock(mmc, mmc_mode2freq(mmc, MMC_HS), false);
 
        err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_BUS_WIDTH,
@@ -1869,7 +1900,7 @@ static int mmc_select_hs400(struct mmc *mmc)
        if (err)
                return err;
 
-       err = mmc_set_card_speed(mmc, MMC_HS_400);
+       err = mmc_set_card_speed(mmc, MMC_HS_400, false);
        if (err)
                return err;
 
@@ -1916,7 +1947,19 @@ static int mmc_select_mode_and_width(struct mmc *mmc, uint card_caps)
                return -ENOTSUPP;
        }
 
-       mmc_set_clock(mmc, mmc->legacy_speed, MMC_CLK_ENABLE);
+#if CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) || \
+    CONFIG_IS_ENABLED(MMC_HS400_SUPPORT)
+       /*
+        * In case the eMMC is in HS200/HS400 mode, downgrade to HS mode
+        * before doing anything else, since a transition from either of
+        * the HS200/HS400 mode directly to legacy mode is not supported.
+        */
+       if (mmc->selected_mode == MMC_HS_200 ||
+           mmc->selected_mode == MMC_HS_400)
+               mmc_set_card_speed(mmc, MMC_HS, true);
+       else
+#endif
+               mmc_set_clock(mmc, mmc->legacy_speed, MMC_CLK_ENABLE);
 
        for_each_mmc_mode_by_pref(card_caps, mwt) {
                for_each_supported_width(card_caps & mwt->widths,
@@ -1948,7 +1991,7 @@ static int mmc_select_mode_and_width(struct mmc *mmc, uint card_caps)
                                }
                        } else {
                                /* configure the bus speed (card) */
-                               err = mmc_set_card_speed(mmc, mwt->mode);
+                               err = mmc_set_card_speed(mmc, mwt->mode, false);
                                if (err)
                                        goto error;
 
@@ -2445,6 +2488,10 @@ static int mmc_startup(struct mmc *mmc)
        bdesc->revision[0] = 0;
 #endif
 
+#if !defined(CONFIG_DM_MMC) && (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBDISK_SUPPORT))
+       part_init(bdesc);
+#endif
+
        return 0;
 }