colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mmc: mtk-sd: fix hang when data read quickly

Browse Source 
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>
This commit is contained in:
mingming lee
2019-12-31 11:29:25 +08:00
committed by Tom Rini
parent 3b0397d48b
commit fb80eaa9d8
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mmc/mtk-sd.c
View File

@@ -14,7 +14,6 @@
#include <malloc.h> #include <malloc.h>
#include <mapmem.h> #include <mapmem.h>
#include <stdbool.h> #include <stdbool.h>
#include <watchdog.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <dm/pinctrl.h> #include <dm/pinctrl.h>
#include <linux/bitops.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; blocks = data->blocks;
writel(CMD_INTS_MASK, &host->base->msdc_int); writel(CMD_INTS_MASK, &host->base->msdc_int);
writel(DATA_INTS_MASK, &host->base->msdc_int);
writel(blocks, &host->base->sdc_blk_num); writel(blocks, &host->base->sdc_blk_num);
writel(cmd->cmdarg, &host->base->sdc_arg); writel(cmd->cmdarg, &host->base->sdc_arg);
writel(rawcmd, &host->base->sdc_cmd); 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; u32 size;
int ret; int ret;
WATCHDOG_RESET();
if (data->flags == MMC_DATA_WRITE) if (data->flags == MMC_DATA_WRITE)
host->last_data_write = 1; host->last_data_write = 1;
writel(DATA_INTS_MASK, &host->base->msdc_int);
size = data->blocks * data->blocksize; size = data->blocks * data->blocksize;
if (data->flags == MMC_DATA_WRITE) if (data->flags == MMC_DATA_WRITE)