Commit 1023e290 authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson
Browse files

mmc: tmio: when resetting, reset DMA controller, too 



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: 34e3211e ("Revert "mmc: tmio: fix reset operation"")
Reported-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Tested-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Link: https://lore.kernel.org/r/20201106072549.1495-2-wsa+renesas@sang-engineering.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 71b05327

drivers/mmc/host/tmio_mmc_core.c

+2 −2
Original line number Diff line number Diff line
@@ -175,6 +175,8 @@ static void tmio_mmc_reset(struct tmio_mmc_host *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);
@@ -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);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE