lkml.org 
[lkml]   [2021]   [Feb]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 076/120] mmc: core: Limit retries when analyse of SDIO tuples fails
    Date
    From: Fengnan Chang <fengnanchang@gmail.com>

    commit f92e04f764b86e55e522988e6f4b6082d19a2721 upstream.

    When analysing tuples fails we may loop indefinitely to retry. Let's avoid
    this by using a 10s timeout and bail if not completed earlier.

    Signed-off-by: Fengnan Chang <fengnanchang@gmail.com>
    Cc: stable@vger.kernel.org
    Link: https://lore.kernel.org/r/20210123033230.36442-1-fengnanchang@gmail.com
    Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/mmc/core/sdio_cis.c | 6 ++++++
    1 file changed, 6 insertions(+)

    --- a/drivers/mmc/core/sdio_cis.c
    +++ b/drivers/mmc/core/sdio_cis.c
    @@ -20,6 +20,8 @@
    #include "sdio_cis.h"
    #include "sdio_ops.h"

    +#define SDIO_READ_CIS_TIMEOUT_MS (10 * 1000) /* 10s */
    +
    static int cistpl_vers_1(struct mmc_card *card, struct sdio_func *func,
    const unsigned char *buf, unsigned size)
    {
    @@ -274,6 +276,8 @@ static int sdio_read_cis(struct mmc_card

    do {
    unsigned char tpl_code, tpl_link;
    + unsigned long timeout = jiffies +
    + msecs_to_jiffies(SDIO_READ_CIS_TIMEOUT_MS);

    ret = mmc_io_rw_direct(card, 0, 0, ptr++, 0, &tpl_code);
    if (ret)
    @@ -326,6 +330,8 @@ static int sdio_read_cis(struct mmc_card
    prev = &this->next;

    if (ret == -ENOENT) {
    + if (time_after(jiffies, timeout))
    + break;
    /* warn about unknown tuples */
    pr_warn_ratelimited("%s: queuing unknown"
    " CIS tuple 0x%02x (%u bytes)\n",

    \
     
     \ /
      Last update: 2021-02-08 18:20    [W:9.216 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site