mmc: mtk-sd: fix hang when data read quickly
authormingming lee <mingming.lee@mediatek.com>
Tue, 31 Dec 2019 03:29:25 +0000 (11:29 +0800)
committerTom Rini <trini@konsulko.com>
Thu, 16 Jan 2020 14:39:45 +0000 (09:39 -0500)
For CMD21 tuning data, the 128/64 bytes data may coming in very
short time, before msdc_start_data(), the read data has already
come, in this case, clear MSDC_INT will cause the interrupt disappear
and lead to the thread hang.

the solution is just clear all interrupts before command was sent.

Signed-off-by: mingming lee <mingming.lee@mediatek.com>
drivers/mmc/mtk-sd.c

index 23413731dca9ce7a0e5df0cd46cf21e1c76baf6a..b0365877d7fde5adc96ee926fd0bf78a938064d1 100644 (file)
@@ -14,7 +14,6 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <stdbool.h>
-#include <watchdog.h>
 #include <asm/gpio.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
@@ -531,6 +530,7 @@ static int msdc_start_command(struct msdc_host *host, struct mmc_cmd *cmd,
                blocks = data->blocks;
 
        writel(CMD_INTS_MASK, &host->base->msdc_int);
+       writel(DATA_INTS_MASK, &host->base->msdc_int);
        writel(blocks, &host->base->sdc_blk_num);
        writel(cmd->cmdarg, &host->base->sdc_arg);
        writel(rawcmd, &host->base->sdc_cmd);
@@ -677,13 +677,9 @@ static int msdc_start_data(struct msdc_host *host, struct mmc_data *data)
        u32 size;
        int ret;
 
-       WATCHDOG_RESET();
-
        if (data->flags == MMC_DATA_WRITE)
                host->last_data_write = 1;
 
-       writel(DATA_INTS_MASK, &host->base->msdc_int);
-
        size = data->blocks * data->blocksize;
 
        if (data->flags == MMC_DATA_WRITE)