lkml.org 
[lkml]   [2019]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 029/132] mmc: mediatek: fix cannot receive new request when msdc_cmd_is_ready fail
    Date
    From: Chaotian Jing <chaotian.jing@mediatek.com>

    [ Upstream commit f38a9774ddde9d79b3487dd888edd8b8623552af ]

    when msdc_cmd_is_ready return fail, the req_timeout work has not been
    inited and cancel_delayed_work() will return false, then, the request
    return directly and never call mmc_request_done().

    so need call mod_delayed_work() before msdc_cmd_is_ready()

    Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com>
    Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mmc/host/mtk-sd.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c
    index 0bf0d0e9dbdba..5ef25463494f4 100644
    --- a/drivers/mmc/host/mtk-sd.c
    +++ b/drivers/mmc/host/mtk-sd.c
    @@ -846,6 +846,7 @@ static void msdc_start_command(struct msdc_host *host,
    WARN_ON(host->cmd);
    host->cmd = cmd;

    + mod_delayed_work(system_wq, &host->req_timeout, DAT_TIMEOUT);
    if (!msdc_cmd_is_ready(host, mrq, cmd))
    return;

    @@ -857,7 +858,6 @@ static void msdc_start_command(struct msdc_host *host,

    cmd->error = 0;
    rawcmd = msdc_cmd_prepare_raw_cmd(host, mrq, cmd);
    - mod_delayed_work(system_wq, &host->req_timeout, DAT_TIMEOUT);

    sdr_set_bits(host->base + MSDC_INTEN, cmd_ints_mask);
    writel(cmd->arg, host->base + SDC_ARG);
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-11-27 22:45    [W:2.207 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site