leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mmc: tmio: core: Add end operation into tmio_mmc_dma_ops

Browse Source 
Related drivers like renesas_sdhi_internal_dmac are possible
to lack dma unmaping in error cases (for example response timeout).

Since tmio_mmc_finish_request() will be always called in any case,
to fix the issue, add end operation into struct tmio_mmc_dma_ops and
call the operation in tmio_mmc_finish_request() to call dma_ummap API
by the related drivers correctly.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Link: https://lore.kernel.org/r/1590044466-28372-2-git-send-email-yoshihiro.shimoda.uh@renesas.com
Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Yoshihiro Shimoda 2020-05-21 16:01:04 +09:00 committed by Ulf Hansson
parent 4f7872ae92
commit 6dca9a9c0c
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/mmc/host/tmio_mmc.h
View File

@ -118,6 +118,9 @@ struct tmio_mmc_dma_ops {
void (*release)(struct tmio_mmc_host *host); void (*release)(struct tmio_mmc_host *host);
void (*abort)(struct tmio_mmc_host *host); void (*abort)(struct tmio_mmc_host *host);
void (*dataend)(struct tmio_mmc_host *host); void (*dataend)(struct tmio_mmc_host *host);
/* optional */
void (*end)(struct tmio_mmc_host *host); /* held host->lock */
}; };
struct tmio_mmc_host { struct tmio_mmc_host {

8
drivers/mmc/host/tmio_mmc_core.c
View File

@ -57,6 +57,12 @@ static inline void tmio_mmc_start_dma(struct tmio_mmc_host *host,
host->dma_ops->start(host, data); host->dma_ops->start(host, data);
} }
static inline void tmio_mmc_end_dma(struct tmio_mmc_host *host)
{
if (host->dma_ops && host->dma_ops->end)
host->dma_ops->end(host);
}
static inline void tmio_mmc_enable_dma(struct tmio_mmc_host *host, bool enable) static inline void tmio_mmc_enable_dma(struct tmio_mmc_host *host, bool enable)
{ {
if (host->dma_ops) if (host->dma_ops)
@ -797,6 +803,8 @@ static void tmio_mmc_finish_request(struct tmio_mmc_host *host)
spin_lock_irqsave(&host->lock, flags); spin_lock_irqsave(&host->lock, flags);
tmio_mmc_end_dma(host);
mrq = host->mrq; mrq = host->mrq;
if (IS_ERR_OR_NULL(mrq)) { if (IS_ERR_OR_NULL(mrq)) {
spin_unlock_irqrestore(&host->lock, flags); spin_unlock_irqrestore(&host->lock, flags);