UPSTREAM: mmc: mmc: use ops->card_busy() to check card status in __mmc_switch()

some MMC host do not support MMC_CAP_WAIT_WHILE_BUSY but provides
ops->card_busy(), So, add this method to check card status after
switch command.

This patch also fix CMD23 command response timeout which found on
evb-rk3288.

[   13.725563  ] mmcblk0: timed out sending SET_BLOCK_COUNT
command,card status 0x400e00
[   13.733328  ] mmcblk0: command error, retrying timeout
[   13.741792  ] mmcblk0: timed out sending SET_BLOCK_COUNT command,card
status 0x400e00
[   13.749555  ] mmcblk0: command error, retrying timeout
[   13.758246  ] mmcblk0: timed out sending SET_BLOCK_COUNT command,card
status 0x400e00

(cherry picked from commit 87a18a6a565271a886d48df49e5e27ba99e26c60)

Change-Id: I7e1b0f0001639e0b43d4a6951148ed5f625e18dd
Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com>
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>

diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index 2db16bfc855b34c3b274149904fffd35da6432ef..8c3043184ead4b49c7984d489f757bfd269e7472 100644 (file)
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -490,6 +490,7 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
        u32 status = 0;
        bool use_r1b_resp = use_busy_signal;
        bool expired = false;
+       bool busy = false;
 
        mmc_retune_hold(host);
 
@@ -545,19 +546,24 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
        /* Must check status to be sure of no errors. */
        timeout = jiffies + msecs_to_jiffies(timeout_ms) + 1;
        do {
+               /*
+                * Due to the possibility of being preempted after
+                * sending the status command, check the expiration
+                * time first.
+                */
+               expired = time_after(jiffies, timeout);
                if (send_status) {
-                       /*
-                        * Due to the possibility of being preempted after
-                        * sending the status command, check the expiration
-                        * time first.
-                        */
-                       expired = time_after(jiffies, timeout);
                        err = __mmc_send_status(card, &status, ignore_crc);
                        if (err)
                                goto out;
                }
                if ((host->caps & MMC_CAP_WAIT_WHILE_BUSY) && use_r1b_resp)
                        break;
+               if (host->ops->card_busy) {
+                       if (!host->ops->card_busy(host))
+                               break;
+                       busy = true;
+               }
                if (mmc_host_is_spi(host))
                        break;
 
@@ -566,19 +572,20 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
                 * does'nt support MMC_CAP_WAIT_WHILE_BUSY, then we can only
                 * rely on waiting for the stated timeout to be sufficient.
                 */
-               if (!send_status) {
+               if (!send_status && !host->ops->card_busy) {
                        mmc_delay(timeout_ms);
                        goto out;
                }
 
                /* Timeout if the device never leaves the program state. */
-               if (expired && R1_CURRENT_STATE(status) == R1_STATE_PRG) {
+               if (expired &&
+                   (R1_CURRENT_STATE(status) == R1_STATE_PRG || busy)) {
                        pr_err("%s: Card stuck in programming state! %s\n",
                                mmc_hostname(host), __func__);
                        err = -ETIMEDOUT;
                        goto out;
                }
-       } while (R1_CURRENT_STATE(status) == R1_STATE_PRG);
+       } while (R1_CURRENT_STATE(status) == R1_STATE_PRG || busy);
 
        err = mmc_switch_status_error(host, status);
 out: