mmc: renesas_sdhi_internal_dmac: Fix dma unmapping in error cases (58a91d96) · Commits · 戴 / test

If this controller doesn't issue interrupt for response of command, this driver lacks to call dma_unmap_sg(). So, fix the issue by using end() of struct tmio_mmc_dma_ops. Reported-by:

Takeshi Saito <takeshi.saito.xv@renesas.com> Fixes: ("mmc: renesas-sdhi: add support for R-Car Gen3 SDHI DMAC") Signed-off-by:

Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Link: https://lore.kernel.org/r/1590044466-28372-4-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/renesas_sdhi_internal_dmac.c

+12 −0

Original line number	Diff line number	Diff line
		@@ -233,6 +233,9 @@ static bool renesas_sdhi_internal_dmac_complete(struct tmio_mmc_host *host)
		{
		enum dma_data_direction dir;

		if (!host->dma_on)
		return false;

		if (!host->data)
		return false;

		@@ -247,6 +250,8 @@ static bool renesas_sdhi_internal_dmac_complete(struct tmio_mmc_host *host)
		if (dir == DMA_FROM_DEVICE)
		clear_bit(SDHI_INTERNAL_DMAC_RX_IN_USE, &global_flags);

		host->dma_on = false;

		return true;
		}

		@@ -263,6 +268,12 @@ out:
		spin_unlock_irq(&host->lock);
		}

		static void renesas_sdhi_internal_dmac_end_dma(struct tmio_mmc_host *host)
		{
		if (host->data)
		renesas_sdhi_internal_dmac_complete(host);
		}

		static void
		renesas_sdhi_internal_dmac_request_dma(struct tmio_mmc_host *host,
		struct tmio_mmc_data *pdata)
		@@ -300,6 +311,7 @@ static const struct tmio_mmc_dma_ops renesas_sdhi_internal_dmac_dma_ops = {
		.release = renesas_sdhi_internal_dmac_release_dma,
		.abort = renesas_sdhi_internal_dmac_abort_dma,
		.dataend = renesas_sdhi_internal_dmac_dataend_dma,
		.end = renesas_sdhi_internal_dmac_end_dma,
		};

		/*

Admin message