lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mxcmmc : Reset the SDHC hardware if software timeout occurs.

Browse Source 
When a software timeout occurs in polling mode hardware was left in
an indeterminate state causing subsequent operations to block.

Signed-off-by: Martin Fuzzey <mfuzzey@gmail.com>
This commit is contained in:
Martin Fuzzey
2009-04-16 22:00:36 +02:00
committed by Pierre Ossman
parent 85b843227a
commit 18489fa2ba
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/mmc/host/mxcmmc.c
View File

@@ -140,6 +140,8 @@ struct mxcmci_host {
struct work_struct datawork; struct work_struct datawork;
}; };
static void mxcmci_set_clk_rate(struct mxcmci_host *host, unsigned int clk_ios);
static inline int mxcmci_use_dma(struct mxcmci_host *host) static inline int mxcmci_use_dma(struct mxcmci_host *host)
{ {
return host->do_dma; return host->do_dma;
@@ -345,8 +347,11 @@ static int mxcmci_poll_status(struct mxcmci_host *host, u32 mask)
stat = readl(host->base + MMC_REG_STATUS); stat = readl(host->base + MMC_REG_STATUS);
if (stat & STATUS_ERR_MASK) if (stat & STATUS_ERR_MASK)
return stat; return stat;
if (time_after(jiffies, timeout)) if (time_after(jiffies, timeout)) {
mxcmci_softreset(host);
mxcmci_set_clk_rate(host, host->clock);
return STATUS_TIME_OUT_READ; return STATUS_TIME_OUT_READ;
}
if (stat & mask) if (stat & mask)
return 0; return 0;
cpu_relax(); cpu_relax();