diff options
| author | Lei Wen <leiwen@marvell.com> | 2011-10-08 04:14:57 +0000 |
|---|---|---|
| committer | Andy Fleming <afleming@freescale.com> | 2011-11-03 02:14:59 -0500 |
| commit | a004abde88e509443a45cc309f310db128cec5f2 (patch) | |
| tree | ae106b6cf64a39bee6e190935af137eef411406b /drivers/mmc/sdhci.c | |
| parent | 6cf1b17cd0af756bab5ec07cbf9f8ed13c229220 (diff) | |
| download | talos-obmc-uboot-a004abde88e509443a45cc309f310db128cec5f2.tar.gz talos-obmc-uboot-a004abde88e509443a45cc309f310db128cec5f2.zip | |
mmc: sdhci: add timeout for data transfer
Signed-off-by: Lei Wen <leiwen@marvell.com>
Diffstat (limited to 'drivers/mmc/sdhci.c')
| -rw-r--r-- | drivers/mmc/sdhci.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index 31c738e9af..77a9e708d0 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -81,8 +81,9 @@ static void sdhci_transfer_pio(struct sdhci_host *host, struct mmc_data *data) static int sdhci_transfer_data(struct sdhci_host *host, struct mmc_data *data, unsigned int start_addr) { - unsigned int stat, rdy, mask, block = 0; + unsigned int stat, rdy, mask, timeout, block = 0; + timeout = 10000; rdy = SDHCI_INT_SPACE_AVAIL | SDHCI_INT_DATA_AVAIL; mask = SDHCI_DATA_AVAILABLE | SDHCI_SPACE_AVAILABLE; do { @@ -108,6 +109,12 @@ static int sdhci_transfer_data(struct sdhci_host *host, struct mmc_data *data, sdhci_writel(host, start_addr, SDHCI_DMA_ADDRESS); } #endif + if (timeout-- > 0) + udelay(10); + else { + printf("Transfer data timeout\n"); + return -1; + } } while (!(stat & SDHCI_INT_DATA_END)); return 0; } |
