common: Drop linux/delay.h from common header
[oweals/u-boot.git] / drivers / mmc / mmc.c
index 588cfb2b2e3147cc16ce877ec8db20f6eedf9096..02494db75a7d796a7779769b3a1ed14998f8c044 100644 (file)
@@ -1,20 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2008, Freescale Semiconductor, Inc
  * Andy Fleming
  *
  * Based vaguely on the Linux code
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <config.h>
 #include <common.h>
+#include <blk.h>
 #include <command.h>
 #include <dm.h>
+#include <log.h>
 #include <dm/device-internal.h>
 #include <errno.h>
 #include <mmc.h>
 #include <part.h>
+#include <linux/delay.h>
 #include <power/regulator.h>
 #include <malloc.h>
 #include <memalign.h>
 #include <div64.h>
 #include "mmc_private.h"
 
-static const unsigned int sd_au_size[] = {
-       0,              SZ_16K / 512,           SZ_32K / 512,
-       SZ_64K / 512,   SZ_128K / 512,          SZ_256K / 512,
-       SZ_512K / 512,  SZ_1M / 512,            SZ_2M / 512,
-       SZ_4M / 512,    SZ_8M / 512,            (SZ_8M + SZ_4M) / 512,
-       SZ_16M / 512,   (SZ_16M + SZ_8M) / 512, SZ_32M / 512,   SZ_64M / 512,
-};
+#define DEFAULT_CMD6_TIMEOUT_MS  500
 
-#if CONFIG_IS_ENABLED(MMC_TINY)
-static struct mmc mmc_static;
-struct mmc *find_mmc_device(int dev_num)
-{
-       return &mmc_static;
-}
+static int mmc_set_signal_voltage(struct mmc *mmc, uint signal_voltage);
 
-void mmc_do_preinit(void)
-{
-       struct mmc *m = &mmc_static;
-#ifdef CONFIG_FSL_ESDHC_ADAPTER_IDENT
-       mmc_set_preinit(m, 1);
-#endif
-       if (m->preinit)
-               mmc_start_init(m);
-}
+#if !CONFIG_IS_ENABLED(DM_MMC)
 
-struct blk_desc *mmc_get_blk_desc(struct mmc *mmc)
+static int mmc_wait_dat0(struct mmc *mmc, int state, int timeout_us)
 {
-       return &mmc->block_dev;
+       return -ENOSYS;
 }
-#endif
 
-#if !CONFIG_IS_ENABLED(DM_MMC)
 __weak int board_mmc_getwp(struct mmc *mmc)
 {
        return -1;
@@ -85,7 +66,7 @@ __weak int board_mmc_getcd(struct mmc *mmc)
 void mmmc_trace_before_send(struct mmc *mmc, struct mmc_cmd *cmd)
 {
        printf("CMD_SEND:%d\n", cmd->cmdidx);
-       printf("\t\tARG\t\t\t 0x%08X\n", cmd->cmdarg);
+       printf("\t\tARG\t\t\t 0x%08x\n", cmd->cmdarg);
 }
 
 void mmmc_trace_after_send(struct mmc *mmc, struct mmc_cmd *cmd, int ret)
@@ -101,21 +82,21 @@ void mmmc_trace_after_send(struct mmc *mmc, struct mmc_cmd *cmd, int ret)
                        printf("\t\tMMC_RSP_NONE\n");
                        break;
                case MMC_RSP_R1:
-                       printf("\t\tMMC_RSP_R1,5,6,7 \t 0x%08X \n",
+                       printf("\t\tMMC_RSP_R1,5,6,7 \t 0x%08x \n",
                                cmd->response[0]);
                        break;
                case MMC_RSP_R1b:
-                       printf("\t\tMMC_RSP_R1b\t\t 0x%08X \n",
+                       printf("\t\tMMC_RSP_R1b\t\t 0x%08x \n",
                                cmd->response[0]);
                        break;
                case MMC_RSP_R2:
-                       printf("\t\tMMC_RSP_R2\t\t 0x%08X \n",
+                       printf("\t\tMMC_RSP_R2\t\t 0x%08x \n",
                                cmd->response[0]);
-                       printf("\t\t          \t\t 0x%08X \n",
+                       printf("\t\t          \t\t 0x%08x \n",
                                cmd->response[1]);
-                       printf("\t\t          \t\t 0x%08X \n",
+                       printf("\t\t          \t\t 0x%08x \n",
                                cmd->response[2]);
-                       printf("\t\t          \t\t 0x%08X \n",
+                       printf("\t\t          \t\t 0x%08x \n",
                                cmd->response[3]);
                        printf("\n");
                        printf("\t\t\t\t\tDUMPING DATA\n");
@@ -125,12 +106,12 @@ void mmmc_trace_after_send(struct mmc *mmc, struct mmc_cmd *cmd, int ret)
                                ptr = (u8 *)&cmd->response[i];
                                ptr += 3;
                                for (j = 0; j < 4; j++)
-                                       printf("%02X ", *ptr--);
+                                       printf("%02x ", *ptr--);
                                printf("\n");
                        }
                        break;
                case MMC_RSP_R3:
-                       printf("\t\tMMC_RSP_R3,4\t\t 0x%08X \n",
+                       printf("\t\tMMC_RSP_R3,4\t\t 0x%08x \n",
                                cmd->response[0]);
                        break;
                default:
@@ -154,7 +135,6 @@ const char *mmc_mode_name(enum bus_mode mode)
 {
        static const char *const names[] = {
              [MMC_LEGACY]      = "MMC legacy",
-             [SD_LEGACY]       = "SD Legacy",
              [MMC_HS]          = "MMC High Speed (26MHz)",
              [SD_HS]           = "SD High Speed (50MHz)",
              [UHS_SDR12]       = "UHS SDR12 (25MHz)",
@@ -165,6 +145,8 @@ const char *mmc_mode_name(enum bus_mode mode)
              [MMC_HS_52]       = "MMC High Speed (52MHz)",
              [MMC_DDR_52]      = "MMC DDR52 (52MHz)",
              [MMC_HS_200]      = "HS200 (200MHz)",
+             [MMC_HS_400]      = "HS400 (200MHz)",
+             [MMC_HS_400_ES]   = "HS400ES (200MHz)",
        };
 
        if (mode >= MMC_MODES_END)
@@ -177,17 +159,19 @@ const char *mmc_mode_name(enum bus_mode mode)
 static uint mmc_mode2freq(struct mmc *mmc, enum bus_mode mode)
 {
        static const int freqs[] = {
-             [SD_LEGACY]       = 25000000,
+             [MMC_LEGACY]      = 25000000,
              [MMC_HS]          = 26000000,
              [SD_HS]           = 50000000,
+             [MMC_HS_52]       = 52000000,
+             [MMC_DDR_52]      = 52000000,
              [UHS_SDR12]       = 25000000,
              [UHS_SDR25]       = 50000000,
              [UHS_SDR50]       = 100000000,
-             [UHS_SDR104]      = 208000000,
              [UHS_DDR50]       = 50000000,
-             [MMC_HS_52]       = 52000000,
-             [MMC_DDR_52]      = 52000000,
+             [UHS_SDR104]      = 208000000,
              [MMC_HS_200]      = 200000000,
+             [MMC_HS_400]      = 200000000,
+             [MMC_HS_400_ES]   = 200000000,
        };
 
        if (mode == MMC_LEGACY)
@@ -203,8 +187,8 @@ static int mmc_select_mode(struct mmc *mmc, enum bus_mode mode)
        mmc->selected_mode = mode;
        mmc->tran_speed = mmc_mode2freq(mmc, mode);
        mmc->ddr_mode = mmc_is_mode_ddr(mode);
-       debug("selecting mode %s (freq : %d MHz)\n", mmc_mode_name(mode),
-             mmc->tran_speed / 1000000);
+       pr_debug("selecting mode %s (freq : %d MHz)\n", mmc_mode_name(mode),
+                mmc->tran_speed / 1000000);
        return 0;
 }
 
@@ -221,7 +205,7 @@ int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data)
 }
 #endif
 
-int mmc_send_status(struct mmc *mmc, int timeout)
+int mmc_send_status(struct mmc *mmc, unsigned int *status)
 {
        struct mmc_cmd cmd;
        int err, retries = 5;
@@ -231,34 +215,53 @@ int mmc_send_status(struct mmc *mmc, int timeout)
        if (!mmc_host_is_spi(mmc))
                cmd.cmdarg = mmc->rca << 16;
 
-       while (1) {
+       while (retries--) {
                err = mmc_send_cmd(mmc, &cmd, NULL);
                if (!err) {
-                       if ((cmd.response[0] & MMC_STATUS_RDY_FOR_DATA) &&
-                           (cmd.response[0] & MMC_STATUS_CURR_STATE) !=
-                            MMC_STATE_PRG)
-                               break;
+                       mmc_trace_state(mmc, &cmd);
+                       *status = cmd.response[0];
+                       return 0;
+               }
+       }
+       mmc_trace_state(mmc, &cmd);
+       return -ECOMM;
+}
+
+int mmc_poll_for_busy(struct mmc *mmc, int timeout_ms)
+{
+       unsigned int status;
+       int err;
+
+       err = mmc_wait_dat0(mmc, 1, timeout_ms * 1000);
+       if (err != -ENOSYS)
+               return err;
+
+       while (1) {
+               err = mmc_send_status(mmc, &status);
+               if (err)
+                       return err;
+
+               if ((status & MMC_STATUS_RDY_FOR_DATA) &&
+                   (status & MMC_STATUS_CURR_STATE) !=
+                    MMC_STATE_PRG)
+                       break;
 
-                       if (cmd.response[0] & MMC_STATUS_MASK) {
+               if (status & MMC_STATUS_MASK) {
 #if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
-                               printf("Status Error: 0x%08X\n",
-                                       cmd.response[0]);
+                       pr_err("Status Error: 0x%08x\n", status);
 #endif
-                               return -ECOMM;
-                       }
-               } else if (--retries < 0)
-                       return err;
+                       return -ECOMM;
+               }
 
-               if (timeout-- <= 0)
+               if (timeout_ms-- <= 0)
                        break;
 
                udelay(1000);
        }
 
-       mmc_trace_state(mmc, &cmd);
-       if (timeout <= 0) {
+       if (timeout_ms <= 0) {
 #if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
-               printf("Timeout waiting card ready\n");
+               pr_err("Timeout waiting card ready\n");
 #endif
                return -ETIMEDOUT;
        }
@@ -269,6 +272,7 @@ int mmc_send_status(struct mmc *mmc, int timeout)
 int mmc_set_blocklen(struct mmc *mmc, int len)
 {
        struct mmc_cmd cmd;
+       int err;
 
        if (mmc->ddr_mode)
                return 0;
@@ -277,8 +281,95 @@ int mmc_set_blocklen(struct mmc *mmc, int len)
        cmd.resp_type = MMC_RSP_R1;
        cmd.cmdarg = len;
 
-       return mmc_send_cmd(mmc, &cmd, NULL);
+       err = mmc_send_cmd(mmc, &cmd, NULL);
+
+#ifdef CONFIG_MMC_QUIRKS
+       if (err && (mmc->quirks & MMC_QUIRK_RETRY_SET_BLOCKLEN)) {
+               int retries = 4;
+               /*
+                * It has been seen that SET_BLOCKLEN may fail on the first
+                * attempt, let's try a few more time
+                */
+               do {
+                       err = mmc_send_cmd(mmc, &cmd, NULL);
+                       if (!err)
+                               break;
+               } while (retries--);
+       }
+#endif
+
+       return err;
+}
+
+#ifdef MMC_SUPPORTS_TUNING
+static const u8 tuning_blk_pattern_4bit[] = {
+       0xff, 0x0f, 0xff, 0x00, 0xff, 0xcc, 0xc3, 0xcc,
+       0xc3, 0x3c, 0xcc, 0xff, 0xfe, 0xff, 0xfe, 0xef,
+       0xff, 0xdf, 0xff, 0xdd, 0xff, 0xfb, 0xff, 0xfb,
+       0xbf, 0xff, 0x7f, 0xff, 0x77, 0xf7, 0xbd, 0xef,
+       0xff, 0xf0, 0xff, 0xf0, 0x0f, 0xfc, 0xcc, 0x3c,
+       0xcc, 0x33, 0xcc, 0xcf, 0xff, 0xef, 0xff, 0xee,
+       0xff, 0xfd, 0xff, 0xfd, 0xdf, 0xff, 0xbf, 0xff,
+       0xbb, 0xff, 0xf7, 0xff, 0xf7, 0x7f, 0x7b, 0xde,
+};
+
+static const u8 tuning_blk_pattern_8bit[] = {
+       0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0xff, 0xff, 0xcc, 0xcc, 0xcc, 0x33, 0xcc, 0xcc,
+       0xcc, 0x33, 0x33, 0xcc, 0xcc, 0xcc, 0xff, 0xff,
+       0xff, 0xee, 0xff, 0xff, 0xff, 0xee, 0xee, 0xff,
+       0xff, 0xff, 0xdd, 0xff, 0xff, 0xff, 0xdd, 0xdd,
+       0xff, 0xff, 0xff, 0xbb, 0xff, 0xff, 0xff, 0xbb,
+       0xbb, 0xff, 0xff, 0xff, 0x77, 0xff, 0xff, 0xff,
+       0x77, 0x77, 0xff, 0x77, 0xbb, 0xdd, 0xee, 0xff,
+       0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x00,
+       0x00, 0xff, 0xff, 0xcc, 0xcc, 0xcc, 0x33, 0xcc,
+       0xcc, 0xcc, 0x33, 0x33, 0xcc, 0xcc, 0xcc, 0xff,
+       0xff, 0xff, 0xee, 0xff, 0xff, 0xff, 0xee, 0xee,
+       0xff, 0xff, 0xff, 0xdd, 0xff, 0xff, 0xff, 0xdd,
+       0xdd, 0xff, 0xff, 0xff, 0xbb, 0xff, 0xff, 0xff,
+       0xbb, 0xbb, 0xff, 0xff, 0xff, 0x77, 0xff, 0xff,
+       0xff, 0x77, 0x77, 0xff, 0x77, 0xbb, 0xdd, 0xee,
+};
+
+int mmc_send_tuning(struct mmc *mmc, u32 opcode, int *cmd_error)
+{
+       struct mmc_cmd cmd;
+       struct mmc_data data;
+       const u8 *tuning_block_pattern;
+       int size, err;
+
+       if (mmc->bus_width == 8) {
+               tuning_block_pattern = tuning_blk_pattern_8bit;
+               size = sizeof(tuning_blk_pattern_8bit);
+       } else if (mmc->bus_width == 4) {
+               tuning_block_pattern = tuning_blk_pattern_4bit;
+               size = sizeof(tuning_blk_pattern_4bit);
+       } else {
+               return -EINVAL;
+       }
+
+       ALLOC_CACHE_ALIGN_BUFFER(u8, data_buf, size);
+
+       cmd.cmdidx = opcode;
+       cmd.cmdarg = 0;
+       cmd.resp_type = MMC_RSP_R1;
+
+       data.dest = (void *)data_buf;
+       data.blocks = 1;
+       data.blocksize = size;
+       data.flags = MMC_DATA_READ;
+
+       err = mmc_send_cmd(mmc, &cmd, &data);
+       if (err)
+               return err;
+
+       if (memcmp(data_buf, tuning_block_pattern, size))
+               return -EIO;
+
+       return 0;
 }
+#endif
 
 static int mmc_read_blocks(struct mmc *mmc, void *dst, lbaint_t start,
                           lbaint_t blkcnt)
@@ -312,7 +403,7 @@ static int mmc_read_blocks(struct mmc *mmc, void *dst, lbaint_t start,
                cmd.resp_type = MMC_RSP_R1b;
                if (mmc_send_cmd(mmc, &cmd, NULL)) {
 #if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
-                       printf("mmc fail to send stop cmd\n");
+                       pr_err("mmc fail to send stop cmd\n");
 #endif
                        return 0;
                }
@@ -321,6 +412,16 @@ static int mmc_read_blocks(struct mmc *mmc, void *dst, lbaint_t start,
        return blkcnt;
 }
 
+#if !CONFIG_IS_ENABLED(DM_MMC)
+static int mmc_get_b_max(struct mmc *mmc, void *dst, lbaint_t blkcnt)
+{
+       if (mmc->cfg->ops->get_b_max)
+               return mmc->cfg->ops->get_b_max(mmc, dst, blkcnt);
+       else
+               return mmc->cfg->b_max;
+}
+#endif
+
 #if CONFIG_IS_ENABLED(BLK)
 ulong mmc_bread(struct udevice *dev, lbaint_t start, lbaint_t blkcnt, void *dst)
 #else
@@ -334,6 +435,7 @@ ulong mmc_bread(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt,
        int dev_num = block_dev->devnum;
        int err;
        lbaint_t cur, blocks_todo = blkcnt;
+       uint b_max;
 
        if (blkcnt == 0)
                return 0;
@@ -352,22 +454,23 @@ ulong mmc_bread(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt,
 
        if ((start + blkcnt) > block_dev->lba) {
 #if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
-               printf("MMC: block number 0x" LBAF " exceeds max(0x" LBAF ")\n",
-                       start + blkcnt, block_dev->lba);
+               pr_err("MMC: block number 0x" LBAF " exceeds max(0x" LBAF ")\n",
+                      start + blkcnt, block_dev->lba);
 #endif
                return 0;
        }
 
        if (mmc_set_blocklen(mmc, mmc->read_bl_len)) {
-               debug("%s: Failed to set blocklen\n", __func__);
+               pr_debug("%s: Failed to set blocklen\n", __func__);
                return 0;
        }
 
+       b_max = mmc_get_b_max(mmc, dst, blkcnt);
+
        do {
-               cur = (blocks_todo > mmc->cfg->b_max) ?
-                       mmc->cfg->b_max : blocks_todo;
+               cur = (blocks_todo > b_max) ? b_max : blocks_todo;
                if (mmc_read_blocks(mmc, dst, start, cur) != cur) {
-                       debug("%s: Failed to read blocks\n", __func__);
+                       pr_debug("%s: Failed to read blocks\n", __func__);
                        return 0;
                }
                blocks_todo -= cur;
@@ -399,7 +502,69 @@ static int mmc_go_idle(struct mmc *mmc)
        return 0;
 }
 
-static int sd_send_op_cond(struct mmc *mmc)
+#if CONFIG_IS_ENABLED(MMC_UHS_SUPPORT)
+static int mmc_switch_voltage(struct mmc *mmc, int signal_voltage)
+{
+       struct mmc_cmd cmd;
+       int err = 0;
+
+       /*
+        * Send CMD11 only if the request is to switch the card to
+        * 1.8V signalling.
+        */
+       if (signal_voltage == MMC_SIGNAL_VOLTAGE_330)
+               return mmc_set_signal_voltage(mmc, signal_voltage);
+
+       cmd.cmdidx = SD_CMD_SWITCH_UHS18V;
+       cmd.cmdarg = 0;
+       cmd.resp_type = MMC_RSP_R1;
+
+       err = mmc_send_cmd(mmc, &cmd, NULL);
+       if (err)
+               return err;
+
+       if (!mmc_host_is_spi(mmc) && (cmd.response[0] & MMC_STATUS_ERROR))
+               return -EIO;
+
+       /*
+        * The card should drive cmd and dat[0:3] low immediately
+        * after the response of cmd11, but wait 100 us to be sure
+        */
+       err = mmc_wait_dat0(mmc, 0, 100);
+       if (err == -ENOSYS)
+               udelay(100);
+       else if (err)
+               return -ETIMEDOUT;
+
+       /*
+        * During a signal voltage level switch, the clock must be gated
+        * for 5 ms according to the SD spec
+        */
+       mmc_set_clock(mmc, mmc->clock, MMC_CLK_DISABLE);
+
+       err = mmc_set_signal_voltage(mmc, signal_voltage);
+       if (err)
+               return err;
+
+       /* Keep clock gated for at least 10 ms, though spec only says 5 ms */
+       mdelay(10);
+       mmc_set_clock(mmc, mmc->clock, MMC_CLK_ENABLE);
+
+       /*
+        * Failure to switch is indicated by the card holding
+        * dat[0:3] low. Wait for at least 1 ms according to spec
+        */
+       err = mmc_wait_dat0(mmc, 1, 1000);
+       if (err == -ENOSYS)
+               udelay(1000);
+       else if (err)
+               return -ETIMEDOUT;
+
+       return 0;
+}
+#endif
+
+static int sd_send_op_cond(struct mmc *mmc, bool uhs_en)
 {
        int timeout = 1000;
        int err;
@@ -431,6 +596,9 @@ static int sd_send_op_cond(struct mmc *mmc)
                if (mmc->version == SD_VERSION_2)
                        cmd.cmdarg |= OCR_HCS;
 
+               if (uhs_en)
+                       cmd.cmdarg |= OCR_S18R;
+
                err = mmc_send_cmd(mmc, &cmd, NULL);
 
                if (err)
@@ -461,6 +629,15 @@ static int sd_send_op_cond(struct mmc *mmc)
 
        mmc->ocr = cmd.response[0];
 
+#if CONFIG_IS_ENABLED(MMC_UHS_SUPPORT)
+       if (uhs_en && !(mmc_host_is_spi(mmc)) && (cmd.response[0] & 0x41000000)
+           == 0x41000000) {
+               err = mmc_switch_voltage(mmc, MMC_SIGNAL_VOLTAGE_180);
+               if (err)
+                       return err;
+       }
+#endif
+
        mmc->high_capacity = ((mmc->ocr & OCR_HCS) == OCR_HCS);
        mmc->rca = 0;
 
@@ -513,7 +690,7 @@ static int mmc_complete_op_cond(struct mmc *mmc)
 {
        struct mmc_cmd cmd;
        int timeout = 1000;
-       uint start;
+       ulong start;
        int err;
 
        mmc->op_cond_pending = 0;
@@ -556,7 +733,7 @@ static int mmc_complete_op_cond(struct mmc *mmc)
 }
 
 
-static int mmc_send_ext_csd(struct mmc *mmc, u8 *ext_csd)
+int mmc_send_ext_csd(struct mmc *mmc, u8 *ext_csd)
 {
        struct mmc_cmd cmd;
        struct mmc_data data;
@@ -577,36 +754,85 @@ 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)
 {
+       unsigned int status, start;
        struct mmc_cmd cmd;
-       int timeout = 1000;
+       int timeout_ms = DEFAULT_CMD6_TIMEOUT_MS;
+       bool is_part_switch = (set == EXT_CSD_CMD_SET_NORMAL) &&
+                             (index == EXT_CSD_PART_CONF);
        int retries = 3;
        int ret;
 
+       if (mmc->gen_cmd6_time)
+               timeout_ms = mmc->gen_cmd6_time * 10;
+
+       if (is_part_switch  && mmc->part_switch_time)
+               timeout_ms = mmc->part_switch_time * 10;
+
        cmd.cmdidx = MMC_CMD_SWITCH;
        cmd.resp_type = MMC_RSP_R1b;
        cmd.cmdarg = (MMC_SWITCH_MODE_WRITE_BYTE << 24) |
                                 (index << 16) |
                                 (value << 8);
 
-       while (retries > 0) {
+       do {
                ret = mmc_send_cmd(mmc, &cmd, NULL);
+       } while (ret && retries-- > 0);
 
-               /* Waiting for the ready status */
-               if (!ret) {
-                       ret = mmc_send_status(mmc, timeout);
-                       return ret;
+       if (ret)
+               return ret;
+
+       start = get_timer(0);
+
+       /* poll dat0 for rdy/buys status */
+       ret = mmc_wait_dat0(mmc, 1, timeout_ms * 1000);
+       if (ret && ret != -ENOSYS)
+               return ret;
+
+       /*
+        * In cases when not allowed to poll by using CMD13 or because we aren't
+        * capable of polling by using mmc_wait_dat0, then rely on waiting the
+        * stated timeout to be sufficient.
+        */
+       if (ret == -ENOSYS && !send_status)
+               mdelay(timeout_ms);
+
+       /* Finally wait until the card is ready or indicates a failure
+        * to switch. It doesn't hurt to use CMD13 here even if send_status
+        * is false, because by now (after 'timeout_ms' ms) the bus should be
+        * reliable.
+        */
+       do {
+               ret = mmc_send_status(mmc, &status);
+
+               if (!ret && (status & MMC_STATUS_SWITCH_ERROR)) {
+                       pr_debug("switch failed %d/%d/0x%x !\n", set, index,
+                                value);
+                       return -EIO;
                }
+               if (!ret && (status & MMC_STATUS_RDY_FOR_DATA))
+                       return 0;
+               udelay(100);
+       } while (get_timer(start) < timeout_ms);
 
-               retries--;
-       }
+       return -ETIMEDOUT;
+}
 
-       return ret;
+int mmc_switch(struct mmc *mmc, u8 set, u8 index, u8 value)
+{
+       return __mmc_switch(mmc, set, index, value, true);
+}
 
+int mmc_boot_wp(struct mmc *mmc)
+{
+       return mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_BOOT_WP, 1);
 }
 
-static int mmc_set_card_speed(struct mmc *mmc, enum bus_mode mode)
+#if !CONFIG_IS_ENABLED(MMC_TINY)
+static int mmc_set_card_speed(struct mmc *mmc, enum bus_mode mode,
+                             bool hsdowngrade)
 {
        int err;
        int speed_bits;
@@ -618,17 +844,48 @@ static int mmc_set_card_speed(struct mmc *mmc, enum bus_mode mode)
        case MMC_HS_52:
        case MMC_DDR_52:
                speed_bits = EXT_CSD_TIMING_HS;
+               break;
+#if CONFIG_IS_ENABLED(MMC_HS200_SUPPORT)
+       case MMC_HS_200:
+               speed_bits = EXT_CSD_TIMING_HS200;
+               break;
+#endif
+#if CONFIG_IS_ENABLED(MMC_HS400_SUPPORT)
+       case MMC_HS_400:
+               speed_bits = EXT_CSD_TIMING_HS400;
+               break;
+#endif
+#if CONFIG_IS_ENABLED(MMC_HS400_ES_SUPPORT)
+       case MMC_HS_400_ES:
+               speed_bits = EXT_CSD_TIMING_HS400;
+               break;
+#endif
        case MMC_LEGACY:
                speed_bits = EXT_CSD_TIMING_LEGACY;
                break;
        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);
@@ -648,7 +905,7 @@ static int mmc_get_capabilities(struct mmc *mmc)
        u8 *ext_csd = mmc->ext_csd;
        char cardtype;
 
-       mmc->card_caps = MMC_MODE_1BIT;
+       mmc->card_caps = MMC_MODE_1BIT | MMC_CAP(MMC_LEGACY);
 
        if (mmc_host_is_spi(mmc))
                return 0;
@@ -658,15 +915,28 @@ static int mmc_get_capabilities(struct mmc *mmc)
                return 0;
 
        if (!ext_csd) {
-               printf("No ext_csd found!\n"); /* this should enver happen */
+               pr_err("No ext_csd found!\n"); /* this should enver happen */
                return -ENOTSUPP;
        }
 
        mmc->card_caps |= MMC_MODE_4BIT | MMC_MODE_8BIT;
 
-       cardtype = ext_csd[EXT_CSD_CARD_TYPE] & 0xf;
+       cardtype = ext_csd[EXT_CSD_CARD_TYPE];
+       mmc->cardtype = cardtype;
 
-       /* High Speed is set, there are two types: 52MHz and 26MHz */
+#if CONFIG_IS_ENABLED(MMC_HS200_SUPPORT)
+       if (cardtype & (EXT_CSD_CARD_TYPE_HS200_1_2V |
+                       EXT_CSD_CARD_TYPE_HS200_1_8V)) {
+               mmc->card_caps |= MMC_MODE_HS200;
+       }
+#endif
+#if CONFIG_IS_ENABLED(MMC_HS400_SUPPORT) || \
+       CONFIG_IS_ENABLED(MMC_HS400_ES_SUPPORT)
+       if (cardtype & (EXT_CSD_CARD_TYPE_HS400_1_2V |
+                       EXT_CSD_CARD_TYPE_HS400_1_8V)) {
+               mmc->card_caps |= MMC_MODE_HS400;
+       }
+#endif
        if (cardtype & EXT_CSD_CARD_TYPE_52) {
                if (cardtype & EXT_CSD_CARD_TYPE_DDR_52)
                        mmc->card_caps |= MMC_MODE_DDR_52MHz;
@@ -675,8 +945,16 @@ static int mmc_get_capabilities(struct mmc *mmc)
        if (cardtype & EXT_CSD_CARD_TYPE_26)
                mmc->card_caps |= MMC_MODE_HS;
 
+#if CONFIG_IS_ENABLED(MMC_HS400_ES_SUPPORT)
+       if (ext_csd[EXT_CSD_STROBE_SUPPORT] &&
+           (mmc->card_caps & MMC_MODE_HS400)) {
+               mmc->card_caps |= MMC_MODE_HS400_ES;
+       }
+#endif
+
        return 0;
 }
+#endif
 
 static int mmc_set_capacity(struct mmc *mmc, int part_num)
 {
@@ -709,10 +987,14 @@ static int mmc_set_capacity(struct mmc *mmc, int part_num)
 int mmc_switch_part(struct mmc *mmc, unsigned int part_num)
 {
        int ret;
+       int retry = 3;
 
-       ret = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_PART_CONF,
-                        (mmc->part_config & ~PART_ACCESS_MASK)
-                        | (part_num & PART_ACCESS_MASK));
+       do {
+               ret = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL,
+                                EXT_CSD_PART_CONF,
+                                (mmc->part_config & ~PART_ACCESS_MASK)
+                                | (part_num & PART_ACCESS_MASK));
+       } while (ret && retry--);
 
        /*
         * Set the capacity if the switch succeeded or was intended
@@ -726,6 +1008,7 @@ int mmc_switch_part(struct mmc *mmc, unsigned int part_num)
        return ret;
 }
 
+#if CONFIG_IS_ENABLED(MMC_HW_PARTITIONING)
 int mmc_hwpart_config(struct mmc *mmc,
                      const struct mmc_hwpart_conf *conf,
                      enum mmc_hwpart_conf_mode mode)
@@ -744,17 +1027,17 @@ int mmc_hwpart_config(struct mmc *mmc,
                return -EINVAL;
 
        if (IS_SD(mmc) || (mmc->version < MMC_VERSION_4_41)) {
-               printf("eMMC >= 4.4 required for enhanced user data area\n");
+               pr_err("eMMC >= 4.4 required for enhanced user data area\n");
                return -EMEDIUMTYPE;
        }
 
        if (!(mmc->part_support & PART_SUPPORT)) {
-               printf("Card does not support partitioning\n");
+               pr_err("Card does not support partitioning\n");
                return -EMEDIUMTYPE;
        }
 
        if (!mmc->hc_wp_grp_size) {
-               printf("Card does not define HC WP group size\n");
+               pr_err("Card does not define HC WP group size\n");
                return -EMEDIUMTYPE;
        }
 
@@ -762,7 +1045,7 @@ int mmc_hwpart_config(struct mmc *mmc,
        if (conf->user.enh_size) {
                if (conf->user.enh_size % mmc->hc_wp_grp_size ||
                    conf->user.enh_start % mmc->hc_wp_grp_size) {
-                       printf("User data enhanced area not HC WP group "
+                       pr_err("User data enhanced area not HC WP group "
                               "size aligned\n");
                        return -EINVAL;
                }
@@ -781,7 +1064,7 @@ int mmc_hwpart_config(struct mmc *mmc,
 
        for (pidx = 0; pidx < 4; pidx++) {
                if (conf->gp_part[pidx].size % mmc->hc_wp_grp_size) {
-                       printf("GP%i partition not HC WP group size "
+                       pr_err("GP%i partition not HC WP group size "
                               "aligned\n", pidx+1);
                        return -EINVAL;
                }
@@ -793,7 +1076,7 @@ int mmc_hwpart_config(struct mmc *mmc,
        }
 
        if (part_attrs && ! (mmc->part_support & ENHNCD_SUPPORT)) {
-               printf("Card does not support enhanced attribute\n");
+               pr_err("Card does not support enhanced attribute\n");
                return -EMEDIUMTYPE;
        }
 
@@ -806,7 +1089,7 @@ int mmc_hwpart_config(struct mmc *mmc,
                (ext_csd[EXT_CSD_MAX_ENH_SIZE_MULT+1] << 8) +
                ext_csd[EXT_CSD_MAX_ENH_SIZE_MULT];
        if (tot_enh_size_mult > max_enh_size_mult) {
-               printf("Total enhanced size exceeds maximum (%u > %u)\n",
+               pr_err("Total enhanced size exceeds maximum (%u > %u)\n",
                       tot_enh_size_mult, max_enh_size_mult);
                return -EMEDIUMTYPE;
        }
@@ -840,7 +1123,7 @@ int mmc_hwpart_config(struct mmc *mmc,
 
        if (ext_csd[EXT_CSD_PARTITION_SETTING] &
            EXT_CSD_PARTITION_SETTING_COMPLETED) {
-               printf("Card already partitioned\n");
+               pr_err("Card already partitioned\n");
                return -EPERM;
        }
 
@@ -857,9 +1140,11 @@ int mmc_hwpart_config(struct mmc *mmc,
 
                ext_csd[EXT_CSD_ERASE_GROUP_DEF] = 1;
 
+#if CONFIG_IS_ENABLED(MMC_WRITE)
                /* update erase group size to be high-capacity */
                mmc->erase_grp_size =
                        ext_csd[EXT_CSD_HC_ERASE_GRP_SIZE] * 1024;
+#endif
 
        }
 
@@ -919,6 +1204,7 @@ int mmc_hwpart_config(struct mmc *mmc,
 
        return 0;
 }
+#endif
 
 #if !CONFIG_IS_ENABLED(DM_MMC)
 int mmc_getcd(struct mmc *mmc)
@@ -938,6 +1224,7 @@ int mmc_getcd(struct mmc *mmc)
 }
 #endif
 
+#if !CONFIG_IS_ENABLED(MMC_TINY)
 static int sd_switch(struct mmc *mmc, int mode, int group, u8 value, u8 *resp)
 {
        struct mmc_cmd cmd;
@@ -958,7 +1245,6 @@ static int sd_switch(struct mmc *mmc, int mode, int group, u8 value, u8 *resp)
        return mmc_send_cmd(mmc, &cmd, &data);
 }
 
-
 static int sd_get_capabilities(struct mmc *mmc)
 {
        int err;
@@ -967,8 +1253,11 @@ static int sd_get_capabilities(struct mmc *mmc)
        ALLOC_CACHE_ALIGN_BUFFER(__be32, switch_status, 16);
        struct mmc_data data;
        int timeout;
+#if CONFIG_IS_ENABLED(MMC_UHS_SUPPORT)
+       u32 sd3_bus_mode;
+#endif
 
-       mmc->card_caps = MMC_MODE_1BIT;
+       mmc->card_caps = MMC_MODE_1BIT | MMC_CAP(MMC_LEGACY);
 
        if (mmc_host_is_spi(mmc))
                return 0;
@@ -1048,6 +1337,24 @@ retry_scr:
        if (__be32_to_cpu(switch_status[3]) & SD_HIGHSPEED_SUPPORTED)
                mmc->card_caps |= MMC_CAP(SD_HS);
 
+#if CONFIG_IS_ENABLED(MMC_UHS_SUPPORT)
+       /* Version before 3.0 don't support UHS modes */
+       if (mmc->version < SD_VERSION_3)
+               return 0;
+
+       sd3_bus_mode = __be32_to_cpu(switch_status[3]) >> 16 & 0x1f;
+       if (sd3_bus_mode & SD_MODE_UHS_SDR104)
+               mmc->card_caps |= MMC_CAP(UHS_SDR104);
+       if (sd3_bus_mode & SD_MODE_UHS_SDR50)
+               mmc->card_caps |= MMC_CAP(UHS_SDR50);
+       if (sd3_bus_mode & SD_MODE_UHS_SDR25)
+               mmc->card_caps |= MMC_CAP(UHS_SDR25);
+       if (sd3_bus_mode & SD_MODE_UHS_SDR12)
+               mmc->card_caps |= MMC_CAP(UHS_SDR12);
+       if (sd3_bus_mode & SD_MODE_UHS_DDR50)
+               mmc->card_caps |= MMC_CAP(UHS_DDR50);
+#endif
+
        return 0;
 }
 
@@ -1056,18 +1363,51 @@ static int sd_set_card_speed(struct mmc *mmc, enum bus_mode mode)
        int err;
 
        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;
 
-       err = sd_switch(mmc, SD_SWITCH_SWITCH, 0, 1, (u8 *)switch_status);
+       switch (mode) {
+       case MMC_LEGACY:
+               speed = UHS_SDR12_BUS_SPEED;
+               break;
+       case SD_HS:
+               speed = HIGH_SPEED_BUS_SPEED;
+               break;
+#if CONFIG_IS_ENABLED(MMC_UHS_SUPPORT)
+       case UHS_SDR12:
+               speed = UHS_SDR12_BUS_SPEED;
+               break;
+       case UHS_SDR25:
+               speed = UHS_SDR25_BUS_SPEED;
+               break;
+       case UHS_SDR50:
+               speed = UHS_SDR50_BUS_SPEED;
+               break;
+       case UHS_DDR50:
+               speed = UHS_DDR50_BUS_SPEED;
+               break;
+       case UHS_SDR104:
+               speed = UHS_SDR104_BUS_SPEED;
+               break;
+#endif
+       default:
+               return -EINVAL;
+       }
+
+       err = sd_switch(mmc, SD_SWITCH_SWITCH, 0, speed, (u8 *)switch_status);
        if (err)
                return err;
 
-       if ((__be32_to_cpu(switch_status[4]) & 0x0f000000) != 0x01000000)
+       if (((__be32_to_cpu(switch_status[4]) >> 24) & 0xF) != speed)
                return -ENOTSUPP;
 
        return 0;
 }
 
-int sd_select_bus_width(struct mmc *mmc, int w)
+static int sd_select_bus_width(struct mmc *mmc, int w)
 {
        int err;
        struct mmc_cmd cmd;
@@ -1095,9 +1435,19 @@ int sd_select_bus_width(struct mmc *mmc, int w)
 
        return 0;
 }
+#endif
 
+#if CONFIG_IS_ENABLED(MMC_WRITE)
 static int sd_read_ssr(struct mmc *mmc)
 {
+       static const unsigned int sd_au_size[] = {
+               0,              SZ_16K / 512,           SZ_32K / 512,
+               SZ_64K / 512,   SZ_128K / 512,          SZ_256K / 512,
+               SZ_512K / 512,  SZ_1M / 512,            SZ_2M / 512,
+               SZ_4M / 512,    SZ_8M / 512,            (SZ_8M + SZ_4M) / 512,
+               SZ_16M / 512,   (SZ_16M + SZ_8M) / 512, SZ_32M / 512,
+               SZ_64M / 512,
+       };
        int err, i;
        struct mmc_cmd cmd;
        ALLOC_CACHE_ALIGN_BUFFER(uint, ssr, 16);
@@ -1110,6 +1460,20 @@ static int sd_read_ssr(struct mmc *mmc)
        cmd.cmdarg = mmc->rca << 16;
 
        err = mmc_send_cmd(mmc, &cmd, NULL);
+#ifdef CONFIG_MMC_QUIRKS
+       if (err && (mmc->quirks & MMC_QUIRK_RETRY_APP_CMD)) {
+               int retries = 4;
+               /*
+                * It has been seen that APP_CMD may fail on the first
+                * attempt, let's try a few more times
+                */
+               do {
+                       err = mmc_send_cmd(mmc, &cmd, NULL);
+                       if (!err)
+                               break;
+               } while (retries--);
+       }
+#endif
        if (err)
                return err;
 
@@ -1146,12 +1510,12 @@ retry_ssr:
                        mmc->ssr.erase_offset = eo * 1000;
                }
        } else {
-               debug("Invalid Allocation Unit Size.\n");
+               pr_debug("Invalid Allocation Unit Size.\n");
        }
 
        return 0;
 }
-
+#endif
 /* frequency bases */
 /* divided by 10 to be nice to platforms without floating point */
 static const int fbase[] = {
@@ -1191,11 +1555,18 @@ static inline int bus_width(uint cap)
                return 4;
        if (cap == MMC_MODE_1BIT)
                return 1;
-       printf("invalid bus witdh capability 0x%x\n", cap);
+       pr_warn("invalid bus witdh capability 0x%x\n", cap);
        return 0;
 }
 
 #if !CONFIG_IS_ENABLED(DM_MMC)
+#ifdef MMC_SUPPORTS_TUNING
+static int mmc_execute_tuning(struct mmc *mmc, uint opcode)
+{
+       return -ENOTSUPP;
+}
+#endif
+
 static int mmc_set_ios(struct mmc *mmc)
 {
        int ret = 0;
@@ -1205,17 +1576,32 @@ static int mmc_set_ios(struct mmc *mmc)
 
        return ret;
 }
+
+static int mmc_host_power_cycle(struct mmc *mmc)
+{
+       int ret = 0;
+
+       if (mmc->cfg->ops->host_power_cycle)
+               ret = mmc->cfg->ops->host_power_cycle(mmc);
+
+       return ret;
+}
 #endif
 
-int mmc_set_clock(struct mmc *mmc, uint clock)
+int mmc_set_clock(struct mmc *mmc, uint clock, bool disable)
 {
-       if (clock > mmc->cfg->f_max)
-               clock = mmc->cfg->f_max;
+       if (!disable) {
+               if (clock > mmc->cfg->f_max)
+                       clock = mmc->cfg->f_max;
 
-       if (clock < mmc->cfg->f_min)
-               clock = mmc->cfg->f_min;
+               if (clock < mmc->cfg->f_min)
+                       clock = mmc->cfg->f_min;
+       }
 
        mmc->clock = clock;
+       mmc->clk_disable = disable;
+
+       debug("clock is %s (%dHz)\n", disable ? "disabled" : "enabled", clock);
 
        return mmc_set_ios(mmc);
 }
@@ -1237,64 +1623,146 @@ void mmc_dump_capabilities(const char *text, uint caps)
 {
        enum bus_mode mode;
 
-       printf("%s: widths [", text);
+       pr_debug("%s: widths [", text);
        if (caps & MMC_MODE_8BIT)
-               printf("8, ");
+               pr_debug("8, ");
        if (caps & MMC_MODE_4BIT)
-               printf("4, ");
+               pr_debug("4, ");
        if (caps & MMC_MODE_1BIT)
-               printf("1, ");
-       printf("\b\b] modes [");
+               pr_debug("1, ");
+       pr_debug("\b\b] modes [");
        for (mode = MMC_LEGACY; mode < MMC_MODES_END; mode++)
                if (MMC_CAP(mode) & caps)
-                       printf("%s, ", mmc_mode_name(mode));
-       printf("\b\b]\n");
+                       pr_debug("%s, ", mmc_mode_name(mode));
+       pr_debug("\b\b]\n");
 }
 #endif
 
 struct mode_width_tuning {
        enum bus_mode mode;
        uint widths;
+#ifdef MMC_SUPPORTS_TUNING
+       uint tuning;
+#endif
 };
 
-static const struct mode_width_tuning sd_modes_by_pref[] = {
-       {
-               .mode = SD_HS,
-               .widths = MMC_MODE_4BIT | MMC_MODE_1BIT,
-       },
-       {
-               .mode = SD_LEGACY,
-               .widths = MMC_MODE_4BIT | MMC_MODE_1BIT,
+#if CONFIG_IS_ENABLED(MMC_IO_VOLTAGE)
+int mmc_voltage_to_mv(enum mmc_voltage voltage)
+{
+       switch (voltage) {
+       case MMC_SIGNAL_VOLTAGE_000: return 0;
+       case MMC_SIGNAL_VOLTAGE_330: return 3300;
+       case MMC_SIGNAL_VOLTAGE_180: return 1800;
+       case MMC_SIGNAL_VOLTAGE_120: return 1200;
        }
-};
-
-#define for_each_sd_mode_by_pref(caps, mwt) \
-       for (mwt = sd_modes_by_pref;\
-            mwt < sd_modes_by_pref + ARRAY_SIZE(sd_modes_by_pref);\
-            mwt++) \
-               if (caps & MMC_CAP(mwt->mode))
+       return -EINVAL;
+}
 
-static int sd_select_mode_and_width(struct mmc *mmc)
+static int mmc_set_signal_voltage(struct mmc *mmc, uint signal_voltage)
 {
        int err;
-       uint widths[] = {MMC_MODE_4BIT, MMC_MODE_1BIT};
-       const struct mode_width_tuning *mwt;
 
-       err = sd_get_capabilities(mmc);
-       if (err)
-               return err;
-       /* Restrict card's capabilities by what the host can do */
-       mmc->card_caps &= (mmc->cfg->host_caps | MMC_MODE_1BIT);
+       if (mmc->signal_voltage == signal_voltage)
+               return 0;
 
-       for_each_sd_mode_by_pref(mmc->card_caps, mwt) {
-               uint *w;
+       mmc->signal_voltage = signal_voltage;
+       err = mmc_set_ios(mmc);
+       if (err)
+               pr_debug("unable to set voltage (err %d)\n", err);
 
-               for (w = widths; w < widths + ARRAY_SIZE(widths); w++) {
-                       if (*w & mmc->card_caps & mwt->widths) {
-                               debug("trying mode %s width %d (at %d MHz)\n",
-                                     mmc_mode_name(mwt->mode),
-                                     bus_width(*w),
-                                     mmc_mode2freq(mmc, mwt->mode) / 1000000);
+       return err;
+}
+#else
+static inline int mmc_set_signal_voltage(struct mmc *mmc, uint signal_voltage)
+{
+       return 0;
+}
+#endif
+
+#if !CONFIG_IS_ENABLED(MMC_TINY)
+static const struct mode_width_tuning sd_modes_by_pref[] = {
+#if CONFIG_IS_ENABLED(MMC_UHS_SUPPORT)
+#ifdef MMC_SUPPORTS_TUNING
+       {
+               .mode = UHS_SDR104,
+               .widths = MMC_MODE_4BIT | MMC_MODE_1BIT,
+               .tuning = MMC_CMD_SEND_TUNING_BLOCK
+       },
+#endif
+       {
+               .mode = UHS_SDR50,
+               .widths = MMC_MODE_4BIT | MMC_MODE_1BIT,
+       },
+       {
+               .mode = UHS_DDR50,
+               .widths = MMC_MODE_4BIT | MMC_MODE_1BIT,
+       },
+       {
+               .mode = UHS_SDR25,
+               .widths = MMC_MODE_4BIT | MMC_MODE_1BIT,
+       },
+#endif
+       {
+               .mode = SD_HS,
+               .widths = MMC_MODE_4BIT | MMC_MODE_1BIT,
+       },
+#if CONFIG_IS_ENABLED(MMC_UHS_SUPPORT)
+       {
+               .mode = UHS_SDR12,
+               .widths = MMC_MODE_4BIT | MMC_MODE_1BIT,
+       },
+#endif
+       {
+               .mode = MMC_LEGACY,
+               .widths = MMC_MODE_4BIT | MMC_MODE_1BIT,
+       }
+};
+
+#define for_each_sd_mode_by_pref(caps, mwt) \
+       for (mwt = sd_modes_by_pref;\
+            mwt < sd_modes_by_pref + ARRAY_SIZE(sd_modes_by_pref);\
+            mwt++) \
+               if (caps & MMC_CAP(mwt->mode))
+
+static int sd_select_mode_and_width(struct mmc *mmc, uint card_caps)
+{
+       int err;
+       uint widths[] = {MMC_MODE_4BIT, MMC_MODE_1BIT};
+       const struct mode_width_tuning *mwt;
+#if CONFIG_IS_ENABLED(MMC_UHS_SUPPORT)
+       bool uhs_en = (mmc->ocr & OCR_S18R) ? true : false;
+#else
+       bool uhs_en = false;
+#endif
+       uint caps;
+
+#ifdef DEBUG
+       mmc_dump_capabilities("sd card", card_caps);
+       mmc_dump_capabilities("host", mmc->host_caps);
+#endif
+
+       if (mmc_host_is_spi(mmc)) {
+               mmc_set_bus_width(mmc, 1);
+               mmc_select_mode(mmc, MMC_LEGACY);
+               mmc_set_clock(mmc, mmc->tran_speed, MMC_CLK_ENABLE);
+               return 0;
+       }
+
+       /* Restrict card's capabilities by what the host can do */
+       caps = card_caps & mmc->host_caps;
+
+       if (!uhs_en)
+               caps &= ~UHS_CAPS;
+
+       for_each_sd_mode_by_pref(caps, mwt) {
+               uint *w;
+
+               for (w = widths; w < widths + ARRAY_SIZE(widths); w++) {
+                       if (*w & caps & mwt->widths) {
+                               pr_debug("trying mode %s width %d (at %d MHz)\n",
+                                        mmc_mode_name(mwt->mode),
+                                        bus_width(*w),
+                                        mmc_mode2freq(mmc, mwt->mode) / 1000000);
 
                                /* configure the bus width (card + host) */
                                err = sd_select_bus_width(mmc, bus_width(*w));
@@ -1309,23 +1777,39 @@ static int sd_select_mode_and_width(struct mmc *mmc)
 
                                /* configure the bus mode (host) */
                                mmc_select_mode(mmc, mwt->mode);
-                               mmc_set_clock(mmc, mmc->tran_speed);
+                               mmc_set_clock(mmc, mmc->tran_speed,
+                                               MMC_CLK_ENABLE);
+
+#ifdef MMC_SUPPORTS_TUNING
+                               /* execute tuning if needed */
+                               if (mwt->tuning && !mmc_host_is_spi(mmc)) {
+                                       err = mmc_execute_tuning(mmc,
+                                                                mwt->tuning);
+                                       if (err) {
+                                               pr_debug("tuning failed\n");
+                                               goto error;
+                                       }
+                               }
+#endif
 
+#if CONFIG_IS_ENABLED(MMC_WRITE)
                                err = sd_read_ssr(mmc);
+                               if (err)
+                                       pr_warn("unable to read ssr\n");
+#endif
                                if (!err)
                                        return 0;
 
-                               printf("bad ssr\n");
-
 error:
                                /* revert to a safer bus speed */
-                               mmc_select_mode(mmc, SD_LEGACY);
-                               mmc_set_clock(mmc, mmc->tran_speed);
+                               mmc_select_mode(mmc, MMC_LEGACY);
+                               mmc_set_clock(mmc, mmc->tran_speed,
+                                               MMC_CLK_ENABLE);
                        }
                }
        }
 
-       printf("unable to select a mode\n");
+       pr_err("unable to select a mode\n");
        return -ENOTSUPP;
 }
 
@@ -1340,6 +1824,9 @@ static int mmc_read_and_compare_ext_csd(struct mmc *mmc)
        const u8 *ext_csd = mmc->ext_csd;
        ALLOC_CACHE_ALIGN_BUFFER(u8, test_csd, MMC_MAX_BLOCK_LEN);
 
+       if (mmc->version < MMC_VERSION_4)
+               return 0;
+
        err = mmc_send_ext_csd(mmc, test_csd);
        if (err)
                return err;
@@ -1360,11 +1847,76 @@ static int mmc_read_and_compare_ext_csd(struct mmc *mmc)
        return -EBADMSG;
 }
 
+#if CONFIG_IS_ENABLED(MMC_IO_VOLTAGE)
+static int mmc_set_lowest_voltage(struct mmc *mmc, enum bus_mode mode,
+                                 uint32_t allowed_mask)
+{
+       u32 card_mask = 0;
+
+       switch (mode) {
+       case MMC_HS_400_ES:
+       case MMC_HS_400:
+       case MMC_HS_200:
+               if (mmc->cardtype & (EXT_CSD_CARD_TYPE_HS200_1_8V |
+                   EXT_CSD_CARD_TYPE_HS400_1_8V))
+                       card_mask |= MMC_SIGNAL_VOLTAGE_180;
+               if (mmc->cardtype & (EXT_CSD_CARD_TYPE_HS200_1_2V |
+                   EXT_CSD_CARD_TYPE_HS400_1_2V))
+                       card_mask |= MMC_SIGNAL_VOLTAGE_120;
+               break;
+       case MMC_DDR_52:
+               if (mmc->cardtype & EXT_CSD_CARD_TYPE_DDR_1_8V)
+                       card_mask |= MMC_SIGNAL_VOLTAGE_330 |
+                                    MMC_SIGNAL_VOLTAGE_180;
+               if (mmc->cardtype & EXT_CSD_CARD_TYPE_DDR_1_2V)
+                       card_mask |= MMC_SIGNAL_VOLTAGE_120;
+               break;
+       default:
+               card_mask |= MMC_SIGNAL_VOLTAGE_330;
+               break;
+       }
+
+       while (card_mask & allowed_mask) {
+               enum mmc_voltage best_match;
+
+               best_match = 1 << (ffs(card_mask & allowed_mask) - 1);
+               if (!mmc_set_signal_voltage(mmc,  best_match))
+                       return 0;
+
+               allowed_mask &= ~best_match;
+       }
+
+       return -ENOTSUPP;
+}
+#else
+static inline int mmc_set_lowest_voltage(struct mmc *mmc, enum bus_mode mode,
+                                        uint32_t allowed_mask)
+{
+       return 0;
+}
+#endif
+
 static const struct mode_width_tuning mmc_modes_by_pref[] = {
+#if CONFIG_IS_ENABLED(MMC_HS400_ES_SUPPORT)
+       {
+               .mode = MMC_HS_400_ES,
+               .widths = MMC_MODE_8BIT,
+       },
+#endif
+#if CONFIG_IS_ENABLED(MMC_HS400_SUPPORT)
+       {
+               .mode = MMC_HS_400,
+               .widths = MMC_MODE_8BIT,
+               .tuning = MMC_CMD_SEND_TUNING_BLOCK_HS200
+       },
+#endif
+#if CONFIG_IS_ENABLED(MMC_HS200_SUPPORT)
        {
                .mode = MMC_HS_200,
                .widths = MMC_MODE_8BIT | MMC_MODE_4BIT,
+               .tuning = MMC_CMD_SEND_TUNING_BLOCK_HS200
        },
+#endif
        {
                .mode = MMC_DDR_52,
                .widths = MMC_MODE_8BIT | MMC_MODE_4BIT,
@@ -1401,41 +1953,158 @@ static const struct ext_csd_bus_width {
        {MMC_MODE_1BIT, false, EXT_CSD_BUS_WIDTH_1},
 };
 
+#if CONFIG_IS_ENABLED(MMC_HS400_SUPPORT)
+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, false);
+       if (err)
+               return err;
+
+       /* configure the bus mode (host) */
+       mmc_select_mode(mmc, MMC_HS_200);
+       mmc_set_clock(mmc, mmc->tran_speed, false);
+
+       /* execute tuning if needed */
+       err = mmc_execute_tuning(mmc, MMC_CMD_SEND_TUNING_BLOCK_HS200);
+       if (err) {
+               debug("tuning failed\n");
+               return err;
+       }
+
+       /* Set back to HS */
+       mmc_set_card_speed(mmc, MMC_HS, true);
+
+       err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_BUS_WIDTH,
+                        EXT_CSD_BUS_WIDTH_8 | EXT_CSD_DDR_FLAG);
+       if (err)
+               return err;
+
+       err = mmc_set_card_speed(mmc, MMC_HS_400, false);
+       if (err)
+               return err;
+
+       mmc_select_mode(mmc, MMC_HS_400);
+       err = mmc_set_clock(mmc, mmc->tran_speed, false);
+       if (err)
+               return err;
+
+       return 0;
+}
+#else
+static int mmc_select_hs400(struct mmc *mmc)
+{
+       return -ENOTSUPP;
+}
+#endif
+
+#if CONFIG_IS_ENABLED(MMC_HS400_ES_SUPPORT)
+#if !CONFIG_IS_ENABLED(DM_MMC)
+static int mmc_set_enhanced_strobe(struct mmc *mmc)
+{
+       return -ENOTSUPP;
+}
+#endif
+static int mmc_select_hs400es(struct mmc *mmc)
+{
+       int err;
+
+       err = mmc_set_card_speed(mmc, MMC_HS, true);
+       if (err)
+               return err;
+
+       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);
+       if (err) {
+               printf("switch to bus width for hs400 failed\n");
+               return err;
+       }
+       /* TODO: driver strength */
+       err = mmc_set_card_speed(mmc, MMC_HS_400_ES, false);
+       if (err)
+               return err;
+
+       mmc_select_mode(mmc, MMC_HS_400_ES);
+       err = mmc_set_clock(mmc, mmc->tran_speed, false);
+       if (err)
+               return err;
+
+       return mmc_set_enhanced_strobe(mmc);
+}
+#else
+static int mmc_select_hs400es(struct mmc *mmc)
+{
+       return -ENOTSUPP;
+}
+#endif
+
 #define for_each_supported_width(caps, ddr, ecbv) \
        for (ecbv = ext_csd_bus_width;\
            ecbv < ext_csd_bus_width + ARRAY_SIZE(ext_csd_bus_width);\
            ecbv++) \
                if ((ddr == ecbv->is_ddr) && (caps & ecbv->cap))
 
-static int mmc_select_mode_and_width(struct mmc *mmc)
+static int mmc_select_mode_and_width(struct mmc *mmc, uint card_caps)
 {
        int err;
        const struct mode_width_tuning *mwt;
        const struct ext_csd_bus_width *ecbw;
 
-       err = mmc_get_capabilities(mmc);
-       if (err)
-               return err;
+#ifdef DEBUG
+       mmc_dump_capabilities("mmc", card_caps);
+       mmc_dump_capabilities("host", mmc->host_caps);
+#endif
+
+       if (mmc_host_is_spi(mmc)) {
+               mmc_set_bus_width(mmc, 1);
+               mmc_select_mode(mmc, MMC_LEGACY);
+               mmc_set_clock(mmc, mmc->tran_speed, MMC_CLK_ENABLE);
+               return 0;
+       }
 
        /* Restrict card's capabilities by what the host can do */
-       mmc->card_caps &= (mmc->cfg->host_caps | MMC_MODE_1BIT);
+       card_caps &= mmc->host_caps;
 
        /* Only version 4 of MMC supports wider bus widths */
        if (mmc->version < MMC_VERSION_4)
                return 0;
 
        if (!mmc->ext_csd) {
-               debug("No ext_csd found!\n"); /* this should enver happen */
+               pr_debug("No ext_csd found!\n"); /* this should enver happen */
                return -ENOTSUPP;
        }
 
-       for_each_mmc_mode_by_pref(mmc->card_caps, mwt) {
-               for_each_supported_width(mmc->card_caps & mwt->widths,
+#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,
                                         mmc_is_mode_ddr(mwt->mode), ecbw) {
-                       debug("trying mode %s width %d (at %d MHz)\n",
-                             mmc_mode_name(mwt->mode),
-                             bus_width(ecbw->cap),
-                             mmc_mode2freq(mmc, mwt->mode) / 1000000);
+                       enum mmc_voltage old_voltage;
+                       pr_debug("trying mode %s width %d (at %d MHz)\n",
+                                mmc_mode_name(mwt->mode),
+                                bus_width(ecbw->cap),
+                                mmc_mode2freq(mmc, mwt->mode) / 1000000);
+                       old_voltage = mmc->signal_voltage;
+                       err = mmc_set_lowest_voltage(mmc, mwt->mode,
+                                                    MMC_ALL_SIGNAL_VOLTAGE);
+                       if (err)
+                               continue;
+
                        /* configure the bus width (card + host) */
                        err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL,
                                    EXT_CSD_BUS_WIDTH,
@@ -1444,32 +2113,63 @@ static int mmc_select_mode_and_width(struct mmc *mmc)
                                goto error;
                        mmc_set_bus_width(mmc, bus_width(ecbw->cap));
 
-                       /* configure the bus speed (card) */
-                       err = mmc_set_card_speed(mmc, mwt->mode);
-                       if (err)
-                               goto error;
-
-                       /*
-                        * configure the bus width AND the ddr mode (card)
-                        * The host side will be taken care of in the next step
-                        */
-                       if (ecbw->ext_csd_bits & EXT_CSD_DDR_FLAG) {
-                               err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL,
-                                                EXT_CSD_BUS_WIDTH,
-                                                ecbw->ext_csd_bits);
+                       if (mwt->mode == MMC_HS_400) {
+                               err = mmc_select_hs400(mmc);
+                               if (err) {
+                                       printf("Select HS400 failed %d\n", err);
+                                       goto error;
+                               }
+                       } else if (mwt->mode == MMC_HS_400_ES) {
+                               err = mmc_select_hs400es(mmc);
+                               if (err) {
+                                       printf("Select HS400ES failed %d\n",
+                                              err);
+                                       goto error;
+                               }
+                       } else {
+                               /* configure the bus speed (card) */
+                               err = mmc_set_card_speed(mmc, mwt->mode, false);
                                if (err)
                                        goto error;
-                       }
 
-                       /* configure the bus mode (host) */
-                       mmc_select_mode(mmc, mwt->mode);
-                       mmc_set_clock(mmc, mmc->tran_speed);
+                               /*
+                                * configure the bus width AND the ddr mode
+                                * (card). The host side will be taken care
+                                * of in the next step
+                                */
+                               if (ecbw->ext_csd_bits & EXT_CSD_DDR_FLAG) {
+                                       err = mmc_switch(mmc,
+                                                        EXT_CSD_CMD_SET_NORMAL,
+                                                        EXT_CSD_BUS_WIDTH,
+                                                        ecbw->ext_csd_bits);
+                                       if (err)
+                                               goto error;
+                               }
+
+                               /* configure the bus mode (host) */
+                               mmc_select_mode(mmc, mwt->mode);
+                               mmc_set_clock(mmc, mmc->tran_speed,
+                                             MMC_CLK_ENABLE);
+#ifdef MMC_SUPPORTS_TUNING
+
+                               /* execute tuning if needed */
+                               if (mwt->tuning) {
+                                       err = mmc_execute_tuning(mmc,
+                                                                mwt->tuning);
+                                       if (err) {
+                                               pr_debug("tuning failed\n");
+                                               goto error;
+                                       }
+                               }
+#endif
+                       }
 
                        /* do a transfer to check the configuration */
                        err = mmc_read_and_compare_ext_csd(mmc);
                        if (!err)
                                return 0;
 error:
+                       mmc_set_signal_voltage(mmc, old_voltage);
                        /* if an error occured, revert to a safer bus mode */
                        mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL,
                                   EXT_CSD_BUS_WIDTH, EXT_CSD_BUS_WIDTH_1);
@@ -1478,10 +2178,15 @@ error:
                }
        }
 
-       printf("unable to select a mode\n");
+       pr_err("unable to select a mode\n");
 
        return -ENOTSUPP;
 }
+#endif
+
+#if CONFIG_IS_ENABLED(MMC_TINY)
+DEFINE_CACHE_ALIGN_BUFFER(u8, ext_csd_bkup, MMC_MAX_BLOCK_LEN);
+#endif
 
 static int mmc_startup_v4(struct mmc *mmc)
 {
@@ -1489,22 +2194,58 @@ static int mmc_startup_v4(struct mmc *mmc)
        u64 capacity;
        bool has_parts = false;
        bool part_completed;
-       u8 *ext_csd;
+       static const u32 mmc_versions[] = {
+               MMC_VERSION_4,
+               MMC_VERSION_4_1,
+               MMC_VERSION_4_2,
+               MMC_VERSION_4_3,
+               MMC_VERSION_4_4,
+               MMC_VERSION_4_41,
+               MMC_VERSION_4_5,
+               MMC_VERSION_5_0,
+               MMC_VERSION_5_1
+       };
 
-       if (IS_SD(mmc) || (mmc->version < MMC_VERSION_4))
+#if CONFIG_IS_ENABLED(MMC_TINY)
+       u8 *ext_csd = ext_csd_bkup;
+
+       if (IS_SD(mmc) || mmc->version < MMC_VERSION_4)
                return 0;
 
-       ext_csd = malloc_cache_aligned(MMC_MAX_BLOCK_LEN);
-       if (!ext_csd)
-               return -ENOMEM;
+       if (!mmc->ext_csd)
+               memset(ext_csd_bkup, 0, sizeof(ext_csd_bkup));
+
+       err = mmc_send_ext_csd(mmc, ext_csd);
+       if (err)
+               goto error;
+
+       /* store the ext csd for future reference */
+       if (!mmc->ext_csd)
+               mmc->ext_csd = ext_csd;
+#else
+       ALLOC_CACHE_ALIGN_BUFFER(u8, ext_csd, MMC_MAX_BLOCK_LEN);
 
-       mmc->ext_csd = ext_csd;
+       if (IS_SD(mmc) || (mmc->version < MMC_VERSION_4))
+               return 0;
 
        /* check  ext_csd version and capacity */
        err = mmc_send_ext_csd(mmc, ext_csd);
        if (err)
-               return err;
-       if (ext_csd[EXT_CSD_REV] >= 2) {
+               goto error;
+
+       /* store the ext csd for future reference */
+       if (!mmc->ext_csd)
+               mmc->ext_csd = malloc(MMC_MAX_BLOCK_LEN);
+       if (!mmc->ext_csd)
+               return -ENOMEM;
+       memcpy(mmc->ext_csd, ext_csd, MMC_MAX_BLOCK_LEN);
+#endif
+       if (ext_csd[EXT_CSD_REV] >= ARRAY_SIZE(mmc_versions))
+               return -EINVAL;
+
+       mmc->version = mmc_versions[ext_csd[EXT_CSD_REV]];
+
+       if (mmc->version >= MMC_VERSION_4_2) {
                /*
                 * According to the JEDEC Standard, the value of
                 * ext_csd's capacity is valid if the value is more
@@ -1519,29 +2260,8 @@ static int mmc_startup_v4(struct mmc *mmc)
                        mmc->capacity_user = capacity;
        }
 
-       switch (ext_csd[EXT_CSD_REV]) {
-       case 1:
-               mmc->version = MMC_VERSION_4_1;
-               break;
-       case 2:
-               mmc->version = MMC_VERSION_4_2;
-               break;
-       case 3:
-               mmc->version = MMC_VERSION_4_3;
-               break;
-       case 5:
-               mmc->version = MMC_VERSION_4_41;
-               break;
-       case 6:
-               mmc->version = MMC_VERSION_4_5;
-               break;
-       case 7:
-               mmc->version = MMC_VERSION_5_0;
-               break;
-       case 8:
-               mmc->version = MMC_VERSION_5_1;
-               break;
-       }
+       if (mmc->version >= MMC_VERSION_4_5)
+               mmc->gen_cmd6_time = ext_csd[EXT_CSD_GENERIC_CMD6_TIME];
 
        /* The partition data may be non-zero but it is only
         * effective if PARTITION_SETTING_COMPLETED is set in
@@ -1552,6 +2272,11 @@ static int mmc_startup_v4(struct mmc *mmc)
        part_completed = !!(ext_csd[EXT_CSD_PARTITION_SETTING] &
                            EXT_CSD_PARTITION_SETTING_COMPLETED);
 
+       mmc->part_switch_time = ext_csd[EXT_CSD_PART_SWITCH_TIME];
+       /* Some eMMC set the value too low so set a minimum */
+       if (mmc->part_switch_time < MMC_MIN_PART_SWITCH_TIME && mmc->part_switch_time)
+               mmc->part_switch_time = MMC_MIN_PART_SWITCH_TIME;
+
        /* store the partition info of emmc */
        mmc->part_support = ext_csd[EXT_CSD_PARTITIONING_SUPPORT];
        if ((ext_csd[EXT_CSD_PARTITIONING_SUPPORT] & PART_SUPPORT) ||
@@ -1580,6 +2305,7 @@ static int mmc_startup_v4(struct mmc *mmc)
                mmc->capacity_gp[i] <<= 19;
        }
 
+#ifndef CONFIG_SPL_BUILD
        if (part_completed) {
                mmc->enh_user_size =
                        (ext_csd[EXT_CSD_ENH_SIZE_MULT + 2] << 16) +
@@ -1596,6 +2322,7 @@ static int mmc_startup_v4(struct mmc *mmc)
                if (mmc->high_capacity)
                        mmc->enh_user_start <<= 9;
        }
+#endif
 
        /*
         * Host needs to enable ERASE_GRP_DEF bit if device is
@@ -1612,15 +2339,17 @@ static int mmc_startup_v4(struct mmc *mmc)
                                 EXT_CSD_ERASE_GROUP_DEF, 1);
 
                if (err)
-                       return err;
+                       goto error;
 
                ext_csd[EXT_CSD_ERASE_GROUP_DEF] = 1;
        }
 
        if (ext_csd[EXT_CSD_ERASE_GROUP_DEF] & 0x01) {
+#if CONFIG_IS_ENABLED(MMC_WRITE)
                /* Read out group size from ext_csd */
                mmc->erase_grp_size =
                        ext_csd[EXT_CSD_HC_ERASE_GRP_SIZE] * 1024;
+#endif
                /*
                 * if high capacity and partition setting completed
                 * SEC_COUNT is valid even if it is smaller than 2 GiB
@@ -1634,7 +2363,9 @@ static int mmc_startup_v4(struct mmc *mmc)
                        capacity *= MMC_MAX_BLOCK_LEN;
                        mmc->capacity_user = capacity;
                }
-       } else {
+       }
+#if CONFIG_IS_ENABLED(MMC_WRITE)
+       else {
                /* Calculate the group size from the csd value. */
                int erase_gsz, erase_gmul;
 
@@ -1643,14 +2374,24 @@ static int mmc_startup_v4(struct mmc *mmc)
                mmc->erase_grp_size = (erase_gsz + 1)
                        * (erase_gmul + 1);
        }
-
+#endif
+#if CONFIG_IS_ENABLED(MMC_HW_PARTITIONING)
        mmc->hc_wp_grp_size = 1024
                * ext_csd[EXT_CSD_HC_ERASE_GRP_SIZE]
                * ext_csd[EXT_CSD_HC_WP_GRP_SIZE];
+#endif
 
        mmc->wr_rel_set = ext_csd[EXT_CSD_WR_REL_SET];
 
        return 0;
+error:
+       if (mmc->ext_csd) {
+#if !CONFIG_IS_ENABLED(MMC_TINY)
+               free(mmc->ext_csd);
+#endif
+               mmc->ext_csd = NULL;
+       }
+       return err;
 }
 
 static int mmc_startup(struct mmc *mmc)
@@ -1667,7 +2408,6 @@ static int mmc_startup(struct mmc *mmc)
                cmd.resp_type = MMC_RSP_R1;
                cmd.cmdarg = 1;
                err = mmc_send_cmd(mmc, &cmd, NULL);
-
                if (err)
                        return err;
        }
@@ -1681,6 +2421,21 @@ static int mmc_startup(struct mmc *mmc)
 
        err = mmc_send_cmd(mmc, &cmd, NULL);
 
+#ifdef CONFIG_MMC_QUIRKS
+       if (err && (mmc->quirks & MMC_QUIRK_RETRY_SEND_CID)) {
+               int retries = 4;
+               /*
+                * It has been seen that SEND_CID may fail on the first
+                * attempt, let's try a few more time
+                */
+               do {
+                       err = mmc_send_cmd(mmc, &cmd, NULL);
+                       if (!err)
+                               break;
+               } while (retries--);
+       }
+#endif
+
        if (err)
                return err;
 
@@ -1754,11 +2509,13 @@ static int mmc_startup(struct mmc *mmc)
 
        mmc->dsr_imp = ((cmd.response[1] >> 12) & 0x1);
        mmc->read_bl_len = 1 << ((cmd.response[1] >> 16) & 0xf);
+#if CONFIG_IS_ENABLED(MMC_WRITE)
 
        if (IS_SD(mmc))
                mmc->write_bl_len = mmc->read_bl_len;
        else
                mmc->write_bl_len = 1 << ((cmd.response[3] >> 22) & 0xf);
+#endif
 
        if (mmc->high_capacity) {
                csize = (mmc->csd[1] & 0x3f) << 16
@@ -1780,15 +2537,17 @@ static int mmc_startup(struct mmc *mmc)
        if (mmc->read_bl_len > MMC_MAX_BLOCK_LEN)
                mmc->read_bl_len = MMC_MAX_BLOCK_LEN;
 
+#if CONFIG_IS_ENABLED(MMC_WRITE)
        if (mmc->write_bl_len > MMC_MAX_BLOCK_LEN)
                mmc->write_bl_len = MMC_MAX_BLOCK_LEN;
+#endif
 
        if ((mmc->dsr_imp) && (0xffffffff != mmc->dsr)) {
                cmd.cmdidx = MMC_CMD_SET_DSR;
                cmd.cmdarg = (mmc->dsr & 0xffff) << 16;
                cmd.resp_type = MMC_RSP_NONE;
                if (mmc_send_cmd(mmc, &cmd, NULL))
-                       printf("MMC: SET_DSR failed\n");
+                       pr_warn("MMC: SET_DSR failed\n");
        }
 
        /* Select the card, and put it into Transfer Mode */
@@ -1805,7 +2564,9 @@ static int mmc_startup(struct mmc *mmc)
        /*
         * For SD, its erase group is always one sector
         */
+#if CONFIG_IS_ENABLED(MMC_WRITE)
        mmc->erase_grp_size = 1;
+#endif
        mmc->part_config = MMCPART_NOAVAILABLE;
 
        err = mmc_startup_v4(mmc);
@@ -1816,19 +2577,34 @@ static int mmc_startup(struct mmc *mmc)
        if (err)
                return err;
 
-       if (IS_SD(mmc))
-               err = sd_select_mode_and_width(mmc);
-       else
-               err = mmc_select_mode_and_width(mmc);
-
+#if CONFIG_IS_ENABLED(MMC_TINY)
+       mmc_set_clock(mmc, mmc->legacy_speed, false);
+       mmc_select_mode(mmc, MMC_LEGACY);
+       mmc_set_bus_width(mmc, 1);
+#else
+       if (IS_SD(mmc)) {
+               err = sd_get_capabilities(mmc);
+               if (err)
+                       return err;
+               err = sd_select_mode_and_width(mmc, mmc->card_caps);
+       } else {
+               err = mmc_get_capabilities(mmc);
+               if (err)
+                       return err;
+               err = mmc_select_mode_and_width(mmc, mmc->card_caps);
+       }
+#endif
        if (err)
                return err;
 
+       mmc->best_mode = mmc->selected_mode;
 
        /* Fix the block length for DDR mode */
        if (mmc->ddr_mode) {
                mmc->read_bl_len = MMC_MAX_BLOCK_LEN;
+#if CONFIG_IS_ENABLED(MMC_WRITE)
                mmc->write_bl_len = MMC_MAX_BLOCK_LEN;
+#endif
        }
 
        /* fill in device description */
@@ -1841,7 +2617,7 @@ static int mmc_startup(struct mmc *mmc)
        bdesc->lba = lldiv(mmc->capacity, mmc->read_bl_len);
 #if !defined(CONFIG_SPL_BUILD) || \
                (defined(CONFIG_SPL_LIBCOMMON_SUPPORT) && \
-               !defined(CONFIG_USE_TINY_PRINTF))
+               !CONFIG_IS_ENABLED(USE_TINY_PRINTF))
        sprintf(bdesc->vendor, "Man %06x Snr %04x%04x",
                mmc->cid[0] >> 24, (mmc->cid[2] & 0xffff),
                (mmc->cid[3] >> 16) & 0xffff);
@@ -1856,7 +2632,8 @@ static int mmc_startup(struct mmc *mmc)
        bdesc->product[0] = 0;
        bdesc->revision[0] = 0;
 #endif
-#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBDISK_SUPPORT)
+
+#if !defined(CONFIG_DM_MMC) && (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBDISK_SUPPORT))
        part_init(bdesc);
 #endif
 
@@ -1902,20 +2679,12 @@ static int mmc_power_init(struct mmc *mmc)
        ret = device_get_supply_regulator(mmc->dev, "vmmc-supply",
                                          &mmc->vmmc_supply);
        if (ret)
-               debug("%s: No vmmc supply\n", mmc->dev->name);
+               pr_debug("%s: No vmmc supply\n", mmc->dev->name);
 
        ret = device_get_supply_regulator(mmc->dev, "vqmmc-supply",
                                          &mmc->vqmmc_supply);
        if (ret)
-               debug("%s: No vqmmc supply\n", mmc->dev->name);
-
-       if (mmc->vmmc_supply) {
-               ret = regulator_set_enable(mmc->vmmc_supply, true);
-               if (ret) {
-                       puts("Error enabling VMMC supply\n");
-                       return ret;
-               }
-       }
+               pr_debug("%s: No vqmmc supply\n", mmc->dev->name);
 #endif
 #else /* !CONFIG_DM_MMC */
        /*
@@ -1927,23 +2696,82 @@ static int mmc_power_init(struct mmc *mmc)
        return 0;
 }
 
-int mmc_start_init(struct mmc *mmc)
+/*
+ * put the host in the initial state:
+ * - turn on Vdd (card power supply)
+ * - configure the bus width and clock to minimal values
+ */
+static void mmc_set_initial_state(struct mmc *mmc)
 {
-       bool no_card;
        int err;
 
-       /* we pretend there's no card when init is NULL */
-       no_card = mmc_getcd(mmc) == 0;
-#if !CONFIG_IS_ENABLED(DM_MMC)
-       no_card = no_card || (mmc->cfg->ops->init == NULL);
-#endif
-       if (no_card) {
-               mmc->has_init = 0;
-#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
-               printf("MMC: no card present\n");
+       /* First try to set 3.3V. If it fails set to 1.8V */
+       err = mmc_set_signal_voltage(mmc, MMC_SIGNAL_VOLTAGE_330);
+       if (err != 0)
+               err = mmc_set_signal_voltage(mmc, MMC_SIGNAL_VOLTAGE_180);
+       if (err != 0)
+               pr_warn("mmc: failed to set signal voltage\n");
+
+       mmc_select_mode(mmc, MMC_LEGACY);
+       mmc_set_bus_width(mmc, 1);
+       mmc_set_clock(mmc, 0, MMC_CLK_ENABLE);
+}
+
+static int mmc_power_on(struct mmc *mmc)
+{
+#if CONFIG_IS_ENABLED(DM_MMC) && CONFIG_IS_ENABLED(DM_REGULATOR)
+       if (mmc->vmmc_supply) {
+               int ret = regulator_set_enable(mmc->vmmc_supply, true);
+
+               if (ret) {
+                       puts("Error enabling VMMC supply\n");
+                       return ret;
+               }
+       }
 #endif
-               return -ENOMEDIUM;
+       return 0;
+}
+
+static int mmc_power_off(struct mmc *mmc)
+{
+       mmc_set_clock(mmc, 0, MMC_CLK_DISABLE);
+#if CONFIG_IS_ENABLED(DM_MMC) && CONFIG_IS_ENABLED(DM_REGULATOR)
+       if (mmc->vmmc_supply) {
+               int ret = regulator_set_enable(mmc->vmmc_supply, false);
+
+               if (ret) {
+                       pr_debug("Error disabling VMMC supply\n");
+                       return ret;
+               }
        }
+#endif
+       return 0;
+}
+
+static int mmc_power_cycle(struct mmc *mmc)
+{
+       int ret;
+
+       ret = mmc_power_off(mmc);
+       if (ret)
+               return ret;
+
+       ret = mmc_host_power_cycle(mmc);
+       if (ret)
+               return ret;
+
+       /*
+        * SD spec recommends at least 1ms of delay. Let's wait for 2ms
+        * to be on the safer side.
+        */
+       udelay(2000);
+       return mmc_power_on(mmc);
+}
+
+int mmc_get_op_cond(struct mmc *mmc)
+{
+       bool uhs_en = supports_uhs(mmc->cfg->host_caps);
+       int err;
 
        if (mmc->has_init)
                return 0;
@@ -1955,6 +2783,27 @@ int mmc_start_init(struct mmc *mmc)
        if (err)
                return err;
 
+#ifdef CONFIG_MMC_QUIRKS
+       mmc->quirks = MMC_QUIRK_RETRY_SET_BLOCKLEN |
+                     MMC_QUIRK_RETRY_SEND_CID |
+                     MMC_QUIRK_RETRY_APP_CMD;
+#endif
+
+       err = mmc_power_cycle(mmc);
+       if (err) {
+               /*
+                * if power cycling is not supported, we should not try
+                * to use the UHS modes, because we wouldn't be able to
+                * recover from an error during the UHS initialization.
+                */
+               pr_debug("Unable to do a full power cycle. Disabling the UHS modes for safety\n");
+               uhs_en = false;
+               mmc->host_caps &= ~UHS_CAPS;
+               err = mmc_power_on(mmc);
+       }
+       if (err)
+               return err;
+
 #if CONFIG_IS_ENABLED(DM_MMC)
        /* The device has already been probed ready for use */
 #else
@@ -1964,8 +2813,9 @@ int mmc_start_init(struct mmc *mmc)
                return err;
 #endif
        mmc->ddr_mode = 0;
-       mmc_set_bus_width(mmc, 1);
-       mmc_set_clock(mmc, 1);
+
+retry:
+       mmc_set_initial_state(mmc);
 
        /* Reset the Card */
        err = mmc_go_idle(mmc);
@@ -1980,7 +2830,12 @@ int mmc_start_init(struct mmc *mmc)
        err = mmc_send_if_cond(mmc);
 
        /* Now try to get the SD card's operating condition */
-       err = sd_send_op_cond(mmc);
+       err = sd_send_op_cond(mmc, uhs_en);
+       if (err && uhs_en) {
+               uhs_en = false;
+               mmc_power_cycle(mmc);
+               goto retry;
+       }
 
        /* If the command timed out, we check for an MMC card */
        if (err == -ETIMEDOUT) {
@@ -1988,12 +2843,48 @@ int mmc_start_init(struct mmc *mmc)
 
                if (err) {
 #if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
-                       printf("Card did not respond to voltage select!\n");
+                       pr_err("Card did not respond to voltage select!\n");
 #endif
                        return -EOPNOTSUPP;
                }
        }
 
+       return err;
+}
+
+int mmc_start_init(struct mmc *mmc)
+{
+       bool no_card;
+       int err = 0;
+
+       /*
+        * all hosts are capable of 1 bit bus-width and able to use the legacy
+        * timings.
+        */
+       mmc->host_caps = mmc->cfg->host_caps | MMC_CAP(MMC_LEGACY) |
+                        MMC_CAP(MMC_LEGACY) | MMC_MODE_1BIT;
+#if CONFIG_IS_ENABLED(DM_MMC)
+       mmc_deferred_probe(mmc);
+#endif
+#if !defined(CONFIG_MMC_BROKEN_CD)
+       no_card = mmc_getcd(mmc) == 0;
+#else
+       no_card = 0;
+#endif
+#if !CONFIG_IS_ENABLED(DM_MMC)
+       /* we pretend there's no card when init is NULL */
+       no_card = no_card || (mmc->cfg->ops->init == NULL);
+#endif
+       if (no_card) {
+               mmc->has_init = 0;
+#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
+               pr_err("MMC: no card present\n");
+#endif
+               return -ENOMEDIUM;
+       }
+
+       err = mmc_get_op_cond(mmc);
+
        if (!err)
                mmc->init_in_progress = 1;
 
@@ -2020,7 +2911,7 @@ static int mmc_complete_init(struct mmc *mmc)
 int mmc_init(struct mmc *mmc)
 {
        int err = 0;
-       __maybe_unused unsigned start;
+       __maybe_unused ulong start;
 #if CONFIG_IS_ENABLED(DM_MMC)
        struct mmc_uclass_priv *upriv = dev_get_uclass_priv(mmc->dev);
 
@@ -2037,11 +2928,37 @@ int mmc_init(struct mmc *mmc)
        if (!err)
                err = mmc_complete_init(mmc);
        if (err)
-               printf("%s: %d, time %lu\n", __func__, err, get_timer(start));
+               pr_info("%s: %d, time %lu\n", __func__, err, get_timer(start));
 
        return err;
 }
 
+#if CONFIG_IS_ENABLED(MMC_UHS_SUPPORT) || \
+    CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) || \
+    CONFIG_IS_ENABLED(MMC_HS400_SUPPORT)
+int mmc_deinit(struct mmc *mmc)
+{
+       u32 caps_filtered;
+
+       if (!mmc->has_init)
+               return 0;
+
+       if (IS_SD(mmc)) {
+               caps_filtered = mmc->card_caps &
+                       ~(MMC_CAP(UHS_SDR12) | MMC_CAP(UHS_SDR25) |
+                         MMC_CAP(UHS_SDR50) | MMC_CAP(UHS_DDR50) |
+                         MMC_CAP(UHS_SDR104));
+
+               return sd_select_mode_and_width(mmc, caps_filtered);
+       } else {
+               caps_filtered = mmc->card_caps &
+                       ~(MMC_CAP(MMC_HS_200) | MMC_CAP(MMC_HS_400));
+
+               return mmc_select_mode_and_width(mmc, caps_filtered);
+       }
+}
+#endif
+
 int mmc_set_dsr(struct mmc *mmc, u16 val)
 {
        mmc->dsr = val;
@@ -2065,12 +2982,7 @@ void mmc_set_preinit(struct mmc *mmc, int preinit)
        mmc->preinit = preinit;
 }
 
-#if CONFIG_IS_ENABLED(DM_MMC) && defined(CONFIG_SPL_BUILD)
-static int mmc_probe(bd_t *bis)
-{
-       return 0;
-}
-#elif CONFIG_IS_ENABLED(DM_MMC)
+#if CONFIG_IS_ENABLED(DM_MMC)
 static int mmc_probe(bd_t *bis)
 {
        int ret, i;
@@ -2094,7 +3006,7 @@ static int mmc_probe(bd_t *bis)
        uclass_foreach_dev(dev, uc) {
                ret = device_probe(dev);
                if (ret)
-                       printf("%s - probe failed: %d\n", dev->name, ret);
+                       pr_err("%s - probe failed: %d\n", dev->name, ret);
        }
 
        return 0;
@@ -2134,6 +3046,30 @@ int mmc_initialize(bd_t *bis)
        return 0;
 }
 
+#if CONFIG_IS_ENABLED(DM_MMC)
+int mmc_init_device(int num)
+{
+       struct udevice *dev;
+       struct mmc *m;
+       int ret;
+
+       ret = uclass_get_device(UCLASS_MMC, num, &dev);
+       if (ret)
+               return ret;
+
+       m = mmc_get_mmc_dev(dev);
+       if (!m)
+               return 0;
+#ifdef CONFIG_FSL_ESDHC_ADAPTER_IDENT
+       mmc_set_preinit(m, 1);
+#endif
+       if (m->preinit)
+               mmc_start_init(m);
+
+       return 0;
+}
+#endif
+
 #ifdef CONFIG_CMD_BKOPS_ENABLE
 int mmc_set_bkops_enable(struct mmc *mmc)
 {