mmc: sdhci: execute tuning when device is not busy

We find tuning timeout because of the secure erase operation lasts too
long, so don't do tuning when device is busy.

Signed-off-by: Yi Sun <yi.y.sun@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

2 files changed, 5 insertions, 3 deletions

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index db113aba35d0..cbd433712756 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1366,11 +1366,12 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq)
                 present_state = sdhci_readl(host, SDHCI_PRESENT_STATE);
                 /*
                  * Check if the re-tuning timer has already expired and there
-                 * is no on-going data transfer. If so, we need to execute
-                 * tuning procedure before sending command.
+                 * is no on-going data transfer and DAT0 is not busy. If so,
+                 * we need to execute tuning procedure before sending command.
                  */
                 if ((host->flags & SDHCI_NEEDS_RETUNING) &&
-                    !(present_state & (SDHCI_DOING_WRITE | SDHCI_DOING_READ))) {
+                    !(present_state & (SDHCI_DOING_WRITE | SDHCI_DOING_READ)) &&
+                    (present_state & SDHCI_DATA_0_LVL_MASK)) {
                         if (mmc->card) {
                                 /* eMMC uses cmd21 but sd and sdio use cmd19 */
                                 tuning_opcode =
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index 9828ff83d84c..31896a779d4e 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -72,6 +72,7 @@
 #define  SDHCI_WRITE_PROTECT    0x00080000
 #define  SDHCI_DATA_LVL_MASK    0x00F00000
 #define   SDHCI_DATA_LVL_SHIFT  20
+#define   SDHCI_DATA_0_LVL_MASK 0x00100000
 
 #define SDHCI_HOST_CONTROL      0x28
 #define  SDHCI_CTRL_LED         0x01