mmc: tmio: core: Add end operation into tmio_mmc_dma_ops (6dca9a9c) · Commits · 戴 / test

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>

drivers/mmc/host/tmio_mmc.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -118,6 +118,9 @@ struct tmio_mmc_dma_ops {
		void (release)(struct tmio_mmc_host host);
		void (abort)(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 {

drivers/mmc/host/tmio_mmc_core.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,12 @@ static inline void tmio_mmc_start_dma(struct tmio_mmc_host *host,
		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)
		{
		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);

		tmio_mmc_end_dma(host);

		mrq = host->mrq;
		if (IS_ERR_OR_NULL(mrq)) {
		spin_unlock_irqrestore(&host->lock, flags);

Admin message