1 files changed, 28 insertions, 16 deletions

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index bd8a0982aec3..9ddef4763541 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -898,8 +898,13 @@ static void sdhci_set_transfer_mode(struct sdhci_host *host,
         u16 mode;
         struct mmc_data *data = cmd->data;
 
-        if (data == NULL)
+        if (data == NULL) {
+                /* clear Auto CMD settings for no data CMDs */
+                mode = sdhci_readw(host, SDHCI_TRANSFER_MODE);
+                sdhci_writew(host, mode & ~(SDHCI_TRNS_AUTO_CMD12 |
+                                SDHCI_TRNS_AUTO_CMD23), SDHCI_TRANSFER_MODE);
                 return;
+        }
 
         WARN_ON(!host->data);
 
@@ -1013,7 +1018,12 @@ void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)
                 mdelay(1);
         }
 
-        mod_timer(&host->timer, jiffies + 10 * HZ);
+        timeout = jiffies;
+        if (!cmd->data && cmd->cmd_timeout_ms > 9000)
+                timeout += DIV_ROUND_UP(cmd->cmd_timeout_ms, 1000) * HZ + HZ;
+        else
+                timeout += 10 * HZ;
+        mod_timer(&host->timer, timeout);
 
         host->cmd = cmd;
 
@@ -1391,6 +1401,13 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq)
                                         mmc->card->type == MMC_TYPE_MMC ?
                                         MMC_SEND_TUNING_BLOCK_HS200 :
                                         MMC_SEND_TUNING_BLOCK;
+
+                                /* Here we need to set the host->mrq to NULL,
+                                 * in case the pending finish_tasklet
+                                 * finishes it incorrectly.
+                                 */
+                                host->mrq = NULL;
+
                                 spin_unlock_irqrestore(&host->lock, flags);
                                 sdhci_execute_tuning(mmc, tuning_opcode);
                                 spin_lock_irqsave(&host->lock, flags);
@@ -1845,12 +1862,12 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode)
         unsigned long timeout;
         int err = 0;
         bool requires_tuning_nonuhs = false;
+        unsigned long flags;
 
         host = mmc_priv(mmc);
 
         sdhci_runtime_pm_get(host);
-        disable_irq(host->irq);
-        spin_lock(&host->lock);
+        spin_lock_irqsave(&host->lock, flags);
 
         ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2);
 
@@ -1870,15 +1887,13 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode)
             requires_tuning_nonuhs)
                 ctrl |= SDHCI_CTRL_EXEC_TUNING;
         else {
-                spin_unlock(&host->lock);
-                enable_irq(host->irq);
+                spin_unlock_irqrestore(&host->lock, flags);
                 sdhci_runtime_pm_put(host);
                 return 0;
         }
 
         if (host->ops->platform_execute_tuning) {
-                spin_unlock(&host->lock);
-                enable_irq(host->irq);
+                spin_unlock_irqrestore(&host->lock, flags);
                 err = host->ops->platform_execute_tuning(host, opcode);
                 sdhci_runtime_pm_put(host);
                 return err;
@@ -1951,15 +1966,12 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode)
                 host->cmd = NULL;
                 host->mrq = NULL;
 
-                spin_unlock(&host->lock);
-                enable_irq(host->irq);
-
+                spin_unlock_irqrestore(&host->lock, flags);
                 /* Wait for Buffer Read Ready interrupt */
                 wait_event_interruptible_timeout(host->buf_ready_int,
                                         (host->tuning_done == 1),
                                         msecs_to_jiffies(50));
-                disable_irq(host->irq);
-                spin_lock(&host->lock);
+                spin_lock_irqsave(&host->lock, flags);
 
                 if (!host->tuning_done) {
                         pr_info(DRIVER_NAME ": Timeout waiting for "
@@ -2034,8 +2046,7 @@ out:
                 err = 0;
 
         sdhci_clear_set_irqs(host, SDHCI_INT_DATA_AVAIL, ier);
-        spin_unlock(&host->lock);
-        enable_irq(host->irq);
+        spin_unlock_irqrestore(&host->lock, flags);
         sdhci_runtime_pm_put(host);
 
         return err;
@@ -3004,7 +3015,8 @@ int sdhci_add_host(struct sdhci_host *host)
                 /* SD3.0: SDR104 is supported so (for eMMC) the caps2
                  * field can be promoted to support HS200.
                  */
-                mmc->caps2 |= MMC_CAP2_HS200;
+                if (!(host->quirks2 & SDHCI_QUIRK2_BROKEN_HS200))
+                        mmc->caps2 |= MMC_CAP2_HS200;
         } else if (caps[1] & SDHCI_SUPPORT_SDR50)
                 mmc->caps |= MMC_CAP_UHS_SDR50;