diff options
| author | Jarkko Lavinen <jarkko.lavinen@nokia.com> | 2008-03-26 16:10:02 -0400 |
|---|---|---|
| committer | Pierre Ossman <drzeus@drzeus.cx> | 2008-04-18 20:05:31 +0200 |
| commit | 9d7c6eee523c78b6ea4b56bd3927860d850616e5 (patch) | |
| tree | 12e88c776370fc88956b08b8c204835324bc2686 /drivers | |
| parent | 0f602ec79ac4fd2a42075c5a170086ded439f36d (diff) | |
| download | linux-stable-9d7c6eee523c78b6ea4b56bd3927860d850616e5.tar.gz linux-stable-9d7c6eee523c78b6ea4b56bd3927860d850616e5.tar.bz2 linux-stable-9d7c6eee523c78b6ea4b56bd3927860d850616e5.zip | |
MMC: OMAP: Do not busy wait for end of command for ever
The limit was a fixed 100k limit in the busy loop, which is not
accurate. It would better to have time limit for the worst case
which occurs when sending 80 cycles at 400 kHz and takes about
200 microseconds, so limit the max time spend in the busy loop
for some 250 microseconds.
Signed-off-by: Jarkko Lavinen <jarkko.lavinen@nokia.com>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/host/omap.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index ab0974d261e5..14759e9f42ad 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c @@ -1276,11 +1276,17 @@ static void mmc_omap_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) OMAP_MMC_WRITE(host, CON, dsor); slot->saved_con = dsor; if (ios->power_mode == MMC_POWER_ON) { + /* worst case at 400kHz, 80 cycles makes 200 microsecs */ + int usecs = 250; + /* Send clock cycles, poll completion */ OMAP_MMC_WRITE(host, IE, 0); OMAP_MMC_WRITE(host, STAT, 0xffff); OMAP_MMC_WRITE(host, CMD, 1 << 7); - while ((OMAP_MMC_READ(host, STAT) & 1) == 0); + while (usecs > 0 && (OMAP_MMC_READ(host, STAT) & 1) == 0) { + udelay(1); + usecs--; + } OMAP_MMC_WRITE(host, STAT, 1); } |