diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2023-09-25 12:36:48 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-09-25 12:36:48 +0200 |
| commit | b674fcfbf465c08b5d5b445c308fc0101cdd1f74 (patch) | |
| tree | 4dc12088451551c5f618a3e73313a6b4b5c418e8 /drivers/mci/sdhci.c | |
| parent | 93eb4971be7045571e612ff240c55293d4bf139f (diff) | |
| parent | 290960f33d0ca45a9263e87f5107ca4133fb6ed6 (diff) | |
| download | barebox-b674fcfbf465c08b5d5b445c308fc0101cdd1f74.tar.gz barebox-b674fcfbf465c08b5d5b445c308fc0101cdd1f74.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/mci/sdhci.c')
| -rw-r--r-- | drivers/mci/sdhci.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/mci/sdhci.c b/drivers/mci/sdhci.c index 3587539e44..6ad11b8099 100644 --- a/drivers/mci/sdhci.c +++ b/drivers/mci/sdhci.c @@ -252,6 +252,7 @@ int sdhci_transfer_data_dma(struct sdhci *sdhci, struct mci_data *data, dma_addr_t dma) { struct device *dev = sdhci->mci->hw_dev; + u64 start; int nbytes; u32 irqstat; int ret; @@ -261,6 +262,8 @@ int sdhci_transfer_data_dma(struct sdhci *sdhci, struct mci_data *data, nbytes = data->blocks * data->blocksize; + start = get_time_ns(); + do { irqstat = sdhci_read32(sdhci, SDHCI_INT_STATUS); @@ -299,6 +302,13 @@ int sdhci_transfer_data_dma(struct sdhci *sdhci, struct mci_data *data, if (irqstat & SDHCI_INT_XFER_COMPLETE) break; + + if (is_timeout(start, 10 * SECOND)) { + dev_alert(dev, "DMA wait timed out. Resetting, but recovery unlikely\n"); + sdhci_reset(sdhci, SDHCI_RESET_ALL); + ret = -ETIMEDOUT; + goto out; + } } while (1); ret = 0; |