mmc: block: Use generic_cmd6_time when modifying INAND_CMD38_ARG_EXT_CSD

commit ad91619aa9d78ab1c6d4a969c3db68bc331ae76c upstream

The INAND_CMD38_ARG_EXT_CSD is a vendor specific EXT_CSD register, which is
used to prepare an erase/trim operation. However, it doesn't make sense to
use a timeout of 10 minutes while updating the register, which becomes the
case when the timeout_ms argument for mmc_switch() is set to zero.

Instead, let's use the generic_cmd6_time, as that seems like a reasonable
timeout to use for these cases.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Link: https://lore.kernel.org/r/20200122142747.5690-3-ulf.hansson@linaro.org
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index 36ea671c912e11f38ed00b982ce4b964773e257f..79e5acc6e964562ce126dad2d0f2756acd8dbdbd 100644 (file)
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -1345,7 +1345,7 @@ static void mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request *req)
                                         arg == MMC_TRIM_ARG ?
                                         INAND_CMD38_ARG_TRIM :
                                         INAND_CMD38_ARG_ERASE,
-                                        0);
+                                        card->ext_csd.generic_cmd6_time);
                }
                if (!err)
                        err = mmc_erase(card, from, nr, arg);
@@ -1387,7 +1387,7 @@ retry:
                                 arg == MMC_SECURE_TRIM1_ARG ?
                                 INAND_CMD38_ARG_SECTRIM1 :
                                 INAND_CMD38_ARG_SECERASE,
-                                0);
+                                card->ext_csd.generic_cmd6_time);
                if (err)
                        goto out_retry;
        }
@@ -1405,7 +1405,7 @@ retry:
                        err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
                                         INAND_CMD38_ARG_EXT_CSD,
                                         INAND_CMD38_ARG_SECTRIM2,
-                                        0);
+                                        card->ext_csd.generic_cmd6_time);
                        if (err)
                                goto out_retry;
                }