lkml.org 
[lkml]   [2022]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 20/68] mmc: block: Use generic_cmd6_time when modifying INAND_CMD38_ARG_EXT_CSD
    Date
    From: Ulf Hansson <ulf.hansson@linaro.org>

    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>
    ---
    drivers/mmc/core/block.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- a/drivers/mmc/core/block.c
    +++ b/drivers/mmc/core/block.c
    @@ -1126,7 +1126,7 @@ static void mmc_blk_issue_discard_rq(str
    card->erase_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, card->erase_arg);
    @@ -1168,7 +1168,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;
    }
    @@ -1186,7 +1186,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;
    }

    \
     
     \ /
      Last update: 2022-05-23 19:19    [W:4.172 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site