AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[MMC] sdhci: fix sdhci reset timeout

Browse Source 
The reset register is automatically cleared when the reset has completed.
Hence, we should busy wait and not have a fixed delay.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Pierre Ossman 2006-06-30 02:22:24 -07:00 committed by Russell King
parent 7cb2c76fa2
commit e16514d8d8
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/mmc/sdhci.c
View File

@ -94,12 +94,27 @@ static void sdhci_dumpregs(struct sdhci_host *host)
static void sdhci_reset(struct sdhci_host *host, u8 mask) static void sdhci_reset(struct sdhci_host *host, u8 mask)
{ {
unsigned long timeout;
writeb(mask, host->ioaddr + SDHCI_SOFTWARE_RESET); writeb(mask, host->ioaddr + SDHCI_SOFTWARE_RESET);
if (mask & SDHCI_RESET_ALL) { if (mask & SDHCI_RESET_ALL)
host->clock = 0; host->clock = 0;
mdelay(50); /* Wait max 100 ms */
timeout = 100;
/* hw clears the bit when it's done */
while (readb(host->ioaddr + SDHCI_SOFTWARE_RESET) & mask) {
if (timeout == 0) {
printk(KERN_ERR "%s: Reset 0x%x never completed. "
"Please report this to " BUGMAIL ".\n",
mmc_hostname(host->mmc), (int)mask);
sdhci_dumpregs(host);
return;
}
timeout--;
mdelay(1);
} }
} }
@ -619,9 +634,7 @@ static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
*/ */
if (ios->power_mode == MMC_POWER_OFF) { if (ios->power_mode == MMC_POWER_OFF) {
writel(0, host->ioaddr + SDHCI_SIGNAL_ENABLE); writel(0, host->ioaddr + SDHCI_SIGNAL_ENABLE);
spin_unlock_irqrestore(&host->lock, flags);
sdhci_init(host); sdhci_init(host);
spin_lock_irqsave(&host->lock, flags);
} }
sdhci_set_clock(host, ios->clock); sdhci_set_clock(host, ios->clock);