diff options
| author | Marek Vasut <marex@denx.de> | 2015-07-27 22:39:37 +0200 |
|---|---|---|
| committer | Pantelis Antoniou <pantelis.antoniou@konsulko.com> | 2015-08-11 20:44:21 +0300 |
| commit | d9dbb97be0e4a550457aec5f11afefb446169c90 (patch) | |
| tree | 098fe17b0212da3f9ad7daa7f90a52e5cc6c7653 /drivers/mmc | |
| parent | 603b2f3a74412110b5bc515a0d75929f8651dc6c (diff) | |
| download | blackbird-obmc-uboot-d9dbb97be0e4a550457aec5f11afefb446169c90.tar.gz blackbird-obmc-uboot-d9dbb97be0e4a550457aec5f11afefb446169c90.zip | |
mmc: dw_mmc: Zap endless timeout
Endless timeouts are bad, since if we get stuck in one, we have no
way out. Zap this one by implementing proper timeout.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Pantelis Antoniou <panto@antoniou-consulting.com>
Cc: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/dw_mmc.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c index 3fffa71166..0f61f163e2 100644 --- a/drivers/mmc/dw_mmc.c +++ b/drivers/mmc/dw_mmc.c @@ -211,14 +211,29 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, } if (data) { - do { + start = get_timer(0); + timeout = 1000; + for (;;) { mask = dwmci_readl(host, DWMCI_RINTSTS); + /* Error during data transfer. */ if (mask & (DWMCI_DATA_ERR | DWMCI_DATA_TOUT)) { printf("%s: DATA ERROR!\n", __func__); bounce_buffer_stop(&bbstate); return -1; } - } while (!(mask & DWMCI_INTMSK_DTO)); + + /* Data arrived correctly. */ + if (mask & DWMCI_INTMSK_DTO) + break; + + /* Check for timeout. */ + if (get_timer(start) > timeout) { + printf("%s: Timeout waiting for data!\n", + __func__); + bounce_buffer_stop(&bbstate); + return TIMEOUT; + } + } dwmci_writel(host, DWMCI_RINTSTS, mask); |
