mmc: sdricoh_cs: Respect the cmd->busy_timeout from the mmc core

Using a fixed 1s polling timeout for all commands is a bit problematic.

For some commands it means waiting longer than needed for the polling to be
aborted, which may not a big issue, but still. For other commands, like for
an erase (CMD38) that uses a R1B response, may require longer timeouts than
1s. In these cases, we may end up treating the command as it failed, while
it just needed some more time to complete successfully.

Fix the problem by respecting the cmd->busy_timeout, which is provided by
the mmc core.

Note that, even if the sdricoh_cs driver may currently not support HW busy
detection on DAT0, some comments in the code refer to that the HW may
support it. Therefore, it seems better to be proactive in this case.

Cc: Sascha Sommer <saschasommer@freenet.de>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Link: https://lore.kernel.org/r/20200508095228.14230-1-ulf.hansson@linaro.org

diff --git a/drivers/mmc/host/sdricoh_cs.c b/drivers/mmc/host/sdricoh_cs.c
index 0594b5ffe15144a581b9e1f62ec0ee73835b286e..76a8cd3a186f6d8a2cf8246c0358eb1a01ed2747 100644 (file)
--- a/drivers/mmc/host/sdricoh_cs.c
+++ b/drivers/mmc/host/sdricoh_cs.c
@@ -157,7 +157,7 @@ static int sdricoh_query_status(struct sdricoh_host *host, unsigned int wanted)
 
 static int sdricoh_mmc_cmd(struct sdricoh_host *host, struct mmc_command *cmd)
 {
-       unsigned int status;
+       unsigned int status, timeout_us;
        int ret;
        unsigned char opcode = cmd->opcode;
 
@@ -179,9 +179,12 @@ static int sdricoh_mmc_cmd(struct sdricoh_host *host, struct mmc_command *cmd)
        if (!opcode)
                return 0;
 
+       timeout_us = cmd->busy_timeout ? cmd->busy_timeout * 1000 :
+               SDRICOH_CMD_TIMEOUT_US;
+
        ret = read_poll_timeout(sdricoh_readl, status,
                        sdricoh_status_ok(host, status, STATUS_CMD_FINISHED),
-                       32, SDRICOH_CMD_TIMEOUT_US, false,
+                       32, timeout_us, false,
                        host, R21C_STATUS);
 
        /*