We map DMA buffers during sdhci_setup_data_dma and unmap them inside
sdhci_transfer_data_dma, but if an error happens between these two
functions, DMA buffers are never unmapped.
Fix this to silence CONFIG_DMA_API_DEBUG observed during a timeout on an
i.MX8M.
Signed-off-by: Ahmad Fatoum <a.fat...@pengutronix.de>
---
drivers/mci/am654-sdhci.c | 4 +++-
drivers/mci/arasan-sdhci.c | 4 +++-
drivers/mci/dwcmshc-sdhci.c | 4 +++-
drivers/mci/imx-esdhc-common.c | 19 +++++++++++++------
drivers/mci/rockchip-dwcmshc-sdhci.c | 4 +++-
drivers/mci/sdhci.c | 22 ++++++++++++++++++----
drivers/mci/sdhci.h | 1 +
7 files changed, 44 insertions(+), 14 deletions(-)
diff --git a/drivers/mci/am654-sdhci.c b/drivers/mci/am654-sdhci.c
index 2c1fa5d80451..a378e3d53c91 100644
--- a/drivers/mci/am654-sdhci.c
+++ b/drivers/mci/am654-sdhci.c
@@ -488,8 +488,10 @@ static int am654_sdhci_send_cmd(struct mci_host *mci,
struct mci_cmd *cmd,
sdhci_write16(&host->sdhci, SDHCI_COMMAND, command);
ret = sdhci_wait_for_done(&host->sdhci, SDHCI_INT_CMD_COMPLETE);
- if (ret)
+ if (ret) {
+ sdhci_teardown_data(&host->sdhci, data, dma);
goto error;
+ }
sdhci_read_response(&host->sdhci, cmd);
sdhci_write32(&host->sdhci, SDHCI_INT_STATUS, SDHCI_INT_CMD_COMPLETE);
diff --git a/drivers/mci/arasan-sdhci.c b/drivers/mci/arasan-sdhci.c
index 0ec4cb57ab76..f98f7eb3d10b 100644
--- a/drivers/mci/arasan-sdhci.c
+++ b/drivers/mci/arasan-sdhci.c
@@ -284,8 +284,10 @@ static int arasan_sdhci_send_cmd(struct mci_host *mci,
struct mci_cmd *cmd,
mask = SDHCI_INT_DATA_AVAIL;
ret = sdhci_wait_for_done(&host->sdhci, mask);
- if (ret)
+ if (ret) {
+ sdhci_teardown_data(&host->sdhci, data, dma);
goto error;
+ }
sdhci_read_response(&host->sdhci, cmd);
sdhci_write32(&host->sdhci, SDHCI_INT_STATUS, SDHCI_INT_CMD_COMPLETE);
diff --git a/drivers/mci/dwcmshc-sdhci.c b/drivers/mci/dwcmshc-sdhci.c
index 8398889a703c..f6d559e393d4 100644
--- a/drivers/mci/dwcmshc-sdhci.c
+++ b/drivers/mci/dwcmshc-sdhci.c
@@ -153,8 +153,10 @@ static int do_send_cmd(struct mci_host *mci, struct
mci_cmd *cmd,
sdhci_write16(&host->sdhci, SDHCI_COMMAND, command);
ret = sdhci_wait_for_done(&host->sdhci, SDHCI_INT_CMD_COMPLETE);
- if (ret)
+ if (ret) {
+ sdhci_teardown_data(&host->sdhci, data, dma);
goto error;
+ }
sdhci_read_response(&host->sdhci, cmd);
diff --git a/drivers/mci/imx-esdhc-common.c b/drivers/mci/imx-esdhc-common.c
index a51e38734cb3..7673220fe8d4 100644
--- a/drivers/mci/imx-esdhc-common.c
+++ b/drivers/mci/imx-esdhc-common.c
@@ -164,16 +164,20 @@ int __esdhc_send_cmd(struct fsl_esdhc_host *host, struct
mci_cmd *cmd,
100 * MSECOND);
if (ret) {
dev_dbg(host->dev, "timeout 1\n");
- return -ETIMEDOUT;
+ goto undo_setup_data;
}
irqstat = sdhci_read32(&host->sdhci, SDHCI_INT_STATUS);
- if (irqstat & CMD_ERR)
- return -EIO;
+ if (irqstat & CMD_ERR) {
+ ret = -EIO;
+ goto undo_setup_data;
+ }
- if (irqstat & SDHCI_INT_TIMEOUT)
- return -ETIMEDOUT;
+ if (irqstat & SDHCI_INT_TIMEOUT) {
+ ret = -ETIMEDOUT;
+ goto undo_setup_data;
+ }
/* Workaround for ESDHC errata ENGcm03648 / ENGcm12360 */
if (!data && (cmd->resp_type & MMC_RSP_BUSY)) {
@@ -186,7 +190,7 @@ int __esdhc_send_cmd(struct fsl_esdhc_host *host, struct
mci_cmd *cmd,
2500 * MSECOND);
if (ret) {
dev_err(host->dev, "timeout PRSSTAT_DAT0\n");
- return -ETIMEDOUT;
+ goto undo_setup_data;
}
}
@@ -223,5 +227,8 @@ int __esdhc_send_cmd(struct fsl_esdhc_host *host, struct
mci_cmd *cmd,
}
return 0;
+undo_setup_data:
+ sdhci_teardown_data(&host->sdhci, data, dma);
+ return ret;
}
diff --git a/drivers/mci/rockchip-dwcmshc-sdhci.c
b/drivers/mci/rockchip-dwcmshc-sdhci.c
index 6f3795465765..a7da64f4d7db 100644
--- a/drivers/mci/rockchip-dwcmshc-sdhci.c
+++ b/drivers/mci/rockchip-dwcmshc-sdhci.c
@@ -269,8 +269,10 @@ static int rk_sdhci_send_cmd(struct mci_host *mci, struct
mci_cmd *cmd,
sdhci_write16(&host->sdhci, SDHCI_COMMAND, command);
ret = sdhci_wait_for_done(&host->sdhci, SDHCI_INT_CMD_COMPLETE);
- if (ret)
+ if (ret) {
+ sdhci_teardown_data(&host->sdhci, data, dma);
goto error;
+ }
sdhci_read_response(&host->sdhci, cmd);
sdhci_write32(&host->sdhci, SDHCI_INT_STATUS, SDHCI_INT_CMD_COMPLETE);
diff --git a/drivers/mci/sdhci.c b/drivers/mci/sdhci.c
index f54cc6d58b2c..d0caee22f2f7 100644
--- a/drivers/mci/sdhci.c
+++ b/drivers/mci/sdhci.c
@@ -507,6 +507,23 @@ void sdhci_setup_data_dma(struct sdhci *sdhci, struct
mci_data *data,
sdhci_set_sdma_addr(sdhci, *dma);
}
+void sdhci_teardown_data(struct sdhci *sdhci,
+ struct mci_data *data, dma_addr_t dma)
+{
+ struct device *dev = sdhci_dev(sdhci);
+ unsigned nbytes;
+
+ if (IN_PBL || !data || dma_mapping_error(dev, dma))
+ return;
+
+ nbytes = data->blocks * data->blocksize;
+
+ if (data->flags & MMC_DATA_READ)
+ dma_unmap_single(dev, dma, nbytes, DMA_FROM_DEVICE);
+ else
+ dma_unmap_single(dev, dma, nbytes, DMA_TO_DEVICE);
+}
+
int sdhci_transfer_data_dma(struct sdhci *sdhci, struct mci_data *data,
dma_addr_t dma)
{
@@ -572,10 +589,7 @@ int sdhci_transfer_data_dma(struct sdhci *sdhci, struct
mci_data *data,
ret = 0;
out:
- if (data->flags & MMC_DATA_READ)
- dma_unmap_single(dev, dma, nbytes, DMA_FROM_DEVICE);
- else
- dma_unmap_single(dev, dma, nbytes, DMA_TO_DEVICE);
+ sdhci_teardown_data(sdhci, data, dma);
return ret;
}
diff --git a/drivers/mci/sdhci.h b/drivers/mci/sdhci.h
index 841e39af05ee..d3b681153134 100644
--- a/drivers/mci/sdhci.h
+++ b/drivers/mci/sdhci.h
@@ -323,6 +323,7 @@ void sdhci_set_cmd_xfer_mode(struct sdhci *host, struct
mci_cmd *cmd,
u32 *xfer);
void sdhci_setup_data_pio(struct sdhci *sdhci, struct mci_data *data);
void sdhci_setup_data_dma(struct sdhci *sdhci, struct mci_data *data,
dma_addr_t *dma);
+void sdhci_teardown_data(struct sdhci *sdhci, struct mci_data *data,
dma_addr_t dma);
int sdhci_transfer_data(struct sdhci *sdhci, struct mci_data *data, dma_addr_t
dma);
int sdhci_transfer_data_pio(struct sdhci *sdhci, struct mci_data *data);
int sdhci_transfer_data_dma(struct sdhci *sdhci, struct mci_data *data,
--
2.39.5
