1 files changed, 18 insertions, 26 deletions

diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 74972c241dff..9e645e19cec6 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -444,8 +444,7 @@ static void sd_update_bus_speed_mode(struct mmc_card *card)
          * If the host doesn't support any of the UHS-I modes, fallback on
          * default speed.
          */
-        if (!(card->host->caps & (MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25 |
-            MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_SDR104 | MMC_CAP_UHS_DDR50))) {
+        if (!mmc_host_uhs(card->host)) {
                 card->sd_bus_speed = 0;
                 return;
         }
@@ -713,6 +712,14 @@ int mmc_sd_get_cid(struct mmc_host *host, u32 ocr, u32 *cid, u32 *rocr)
 {
         int err;
         u32 max_current;
+        int retries = 10;
+
+try_again:
+        if (!retries) {
+                ocr &= ~SD_OCR_S18R;
+                pr_warning("%s: Skipping voltage switch\n",
+                        mmc_hostname(host));
+        }
 
         /*
          * Since we're changing the OCR value, we seem to
@@ -734,10 +741,10 @@ int mmc_sd_get_cid(struct mmc_host *host, u32 ocr, u32 *cid, u32 *rocr)
 
         /*
          * If the host supports one of UHS-I modes, request the card
-         * to switch to 1.8V signaling level.
+         * to switch to 1.8V signaling level. If the card has failed
+         * repeatedly to switch however, skip this.
          */
-        if (host->caps & (MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25 |
-            MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_SDR104 | MMC_CAP_UHS_DDR50))
+        if (retries && mmc_host_uhs(host))
                 ocr |= SD_OCR_S18R;
 
         /*
@@ -748,7 +755,6 @@ int mmc_sd_get_cid(struct mmc_host *host, u32 ocr, u32 *cid, u32 *rocr)
         if (max_current > 150)
                 ocr |= SD_OCR_XPC;
 
-try_again:
         err = mmc_send_app_op_cond(host, ocr, rocr);
         if (err)
                 return err;
@@ -759,9 +765,12 @@ try_again:
          */
         if (!mmc_host_is_spi(host) && rocr &&
            ((*rocr & 0x41000000) == 0x41000000)) {
-                err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180, true);
-                if (err) {
-                        ocr &= ~SD_OCR_S18R;
+                err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180);
+                if (err == -EAGAIN) {
+                        retries--;
+                        goto try_again;
+                } else if (err) {
+                        retries = 0;
                         goto try_again;
                 }
         }
@@ -960,16 +969,6 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
 
                 /* Card is an ultra-high-speed card */
                 mmc_card_set_uhs(card);
-
-                /*
-                 * Since initialization is now complete, enable preset
-                 * value registers for UHS-I cards.
-                 */
-                if (host->ops->enable_preset_value) {
-                        mmc_host_clk_hold(card->host);
-                        host->ops->enable_preset_value(host, true);
-                        mmc_host_clk_release(card->host);
-                }
         } else {
                 /*
                  * Attempt to change to high-speed (if supported)
@@ -1148,13 +1147,6 @@ int mmc_attach_sd(struct mmc_host *host)
         BUG_ON(!host);
         WARN_ON(!host->claimed);
 
-        /* Disable preset value enable if already set since last time */
-        if (host->ops->enable_preset_value) {
-                mmc_host_clk_hold(host);
-                host->ops->enable_preset_value(host, false);
-                mmc_host_clk_release(host);
-        }
-
         err = mmc_send_app_op_cond(host, 0, &ocr);
         if (err)
                 return err;