Commit 0363b12d authored Oct 12, 2017 by Douglas Anderson Committed by Ulf Hansson Oct 30, 2017

mmc: dw_mmc: cancel the CTO timer after a voltage switch



When running with the commit 03de1921 ("mmc: dw_mmc: introduce
timer for broken command transfer over scheme") I found this message
in the log:
  Unexpected command timeout, state 7

It turns out that we weren't properly cancelling the new CTO timer in
the case that a voltage switch was done.  Let's promote the cancel
into the dw_mci_cmd_interrupt() function to fix this.

Fixes: 03de1921 ("mmc: dw_mmc: introduce timer for broken command transfer over scheme")
Tested-by: Emil Renner Berthing <kernel@esmil.dk>
Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent 48e1dc10

drivers/mmc/host/dw_mmc.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2570,6 +2570,8 @@ static void dw_mci_write_data_pio(struct dw_mci *host)

	static void dw_mci_cmd_interrupt(struct dw_mci *host, u32 status)		static void dw_mci_cmd_interrupt(struct dw_mci *host, u32 status)
	{		{
			del_timer(&host->cto_timer);

	if (!host->cmd_status)		if (!host->cmd_status)
	host->cmd_status = status;		host->cmd_status = status;

	@@ -2662,7 +2664,6 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id)
	}		}

	if (pending & SDMMC_INT_CMD_DONE) {		if (pending & SDMMC_INT_CMD_DONE) {
	del_timer(&host->cto_timer);
	mci_writel(host, RINTSTS, SDMMC_INT_CMD_DONE);		mci_writel(host, RINTSTS, SDMMC_INT_CMD_DONE);
	dw_mci_cmd_interrupt(host, pending);		dw_mci_cmd_interrupt(host, pending);
	}		}