Commit ab0cdefe authored Mar 17, 2021 by Wolfram Sang Committed by Ulf Hansson Mar 30, 2021

mmc: tmio: abort DMA before reset

We will soon allow resetting the whole IP core via a reset controller.
For this case, DMA must be terminated before the actual reset. For the
other cases, it is probably better, too.

Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20210317091622.31890-2-wsa+renesas@sang-engineering.com

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent 08f3dff7

drivers/mmc/host/tmio_mmc_core.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -172,11 +172,11 @@ static void tmio_mmc_reset(struct tmio_mmc_host *host)
		sd_ctrl_write16(host, CTL_RESET_SD, 0x0001);
		usleep_range(10000, 11000);

		tmio_mmc_abort_dma(host);

		if (host->reset)
		host->reset(host);

		tmio_mmc_abort_dma(host);

		if (host->pdata->flags & TMIO_MMC_SDIO_IRQ) {
		sd_ctrl_write16(host, CTL_SDIO_IRQ_MASK, host->sdio_irq_mask);
		sd_ctrl_write16(host, CTL_TRANSACTION_CTL, 0x0001);