diff mbox series

[1/3] mmc: tmio: when resetting, reset DMA controller, too

Message ID 20201106072549.1495-2-wsa+renesas@sang-engineering.com (mailing list archive)
State Accepted
Commit 1023e290ba567af0640f9a5bd878207a5dff6ed2
Delegated to: Geert Uytterhoeven
Headers show
Series tmio/sdhi: fix workaround for a regression | expand

Commit Message

Wolfram Sang Nov. 6, 2020, 7:25 a.m. UTC
When applying a revert, the assumption that DMA only needs to be cleared
in specific cases was wrong. We want to reset the DMA controller every
time the rest of the HW gets reset, too.

Fixes: 34e3211e5492 ("Revert "mmc: tmio: fix reset operation"")
Reported-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
 drivers/mmc/host/tmio_mmc_core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox series


diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c
index 2fce0518632d..cfb53d7c63d7 100644
--- a/drivers/mmc/host/tmio_mmc_core.c
+++ b/drivers/mmc/host/tmio_mmc_core.c
@@ -175,6 +175,8 @@  static void tmio_mmc_reset(struct tmio_mmc_host *host)
 	if (host->reset)
+	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);
@@ -223,8 +225,6 @@  static void tmio_mmc_reset_work(struct work_struct *work)
 	/* Ready for new calls */
 	host->mrq = NULL;
-	tmio_mmc_abort_dma(host);
 	mmc_request_done(host->mmc, mrq);