github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-23 05:04:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

mmc: moxart: report DMA completion timeout

Browse Source 
moxart_transfer_dma() waits for the DMA completion but ignores
wait_for_completion_interruptible_timeout(). It then unconditionally
reports the full transfer length in data->bytes_xfered.

Terminate the DMA channel and set data->error when the wait is
interrupted or times out. Only report host->data_len as transferred
after the completion is observed.

Signed-off-by: Pengpeng Hou <pengpeng@iscas.ac.cn>
Signed-off-by: Ulf Hansson <ulfh@kernel.org>
This commit is contained in:
Pengpeng Hou 2026-06-23 14:11:12 +08:00 committed by Ulf Hansson
parent 1f8c98dc95
commit e29e650077
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/mmc/host/moxart-mmc.c
View File

@ -264,6 +264,7 @@ static void moxart_transfer_dma(struct mmc_data *data, struct moxart_host *host)
u32 len, dir_slave;
struct dma_async_tx_descriptor *desc = NULL;
struct dma_chan *dma_chan;
long timeout;
if (host->data_len == data->bytes_xfered)
return;
@ -296,11 +297,17 @@ static void moxart_transfer_dma(struct mmc_data *data, struct moxart_host *host)
dma_async_issue_pending(dma_chan);
}
wait_for_completion_interruptible_timeout(&host->dma_complete,
host->timeout);
timeout = wait_for_completion_interruptible_timeout(&host->dma_complete,
host->timeout);
if (timeout <= 0) {
dmaengine_terminate_sync(dma_chan);
data->error = timeout ?: -ETIMEDOUT;
goto unmap;
}
data->bytes_xfered = host->data_len;
unmap:
dma_unmap_sg(dma_chan->device->dev,
data->sg, data->sg_len,
mmc_get_dma_dir(data));