Commit 5c41ea6d authored by Faiz Abbas's avatar Faiz Abbas Committed by Ulf Hansson
Browse files

mmc: sdhci-omap: Don't finish_mrq() on a command error during tuning 



commit 5b0d6210 ("mmc: sdhci-omap: Add platform specific reset
callback") skips data resets during tuning operation. Because of this,
a data error or data finish interrupt might still arrive after a command
error has been handled and the mrq ended. This ends up with a "mmc0: Got
data interrupt 0x00000002 even though no data operation was in progress"
error message.

Fix this by adding a platform specific callback for sdhci_irq. Mark the
mrq as a failure but wait for a data interrupt instead of calling
finish_mrq().

Fixes: 5b0d6210 ("mmc: sdhci-omap: Add platform specific reset
callback")
Signed-off-by: default avatarFaiz Abbas <faiz_abbas@ti.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 157c99c5

drivers/mmc/host/sdhci-omap.c

+38 −0
Original line number Diff line number Diff line
@@ -797,6 +797,43 @@ void sdhci_omap_reset(struct sdhci_host *host, u8 mask) 
	sdhci_reset(host, mask);

}



#define CMD_ERR_MASK (SDHCI_INT_CRC | SDHCI_INT_END_BIT | SDHCI_INT_INDEX |\

		      SDHCI_INT_TIMEOUT)

#define CMD_MASK (CMD_ERR_MASK | SDHCI_INT_RESPONSE)



static u32 sdhci_omap_irq(struct sdhci_host *host, u32 intmask)

{

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct sdhci_omap_host *omap_host = sdhci_pltfm_priv(pltfm_host);



	if (omap_host->is_tuning && host->cmd && !host->data_early &&

	    (intmask & CMD_ERR_MASK)) {



		/*

		 * Since we are not resetting data lines during tuning

		 * operation, data error or data complete interrupts

		 * might still arrive. Mark this request as a failure

		 * but still wait for the data interrupt

		 */

		if (intmask & SDHCI_INT_TIMEOUT)

			host->cmd->error = -ETIMEDOUT;

		else

			host->cmd->error = -EILSEQ;



		host->cmd = NULL;



		/*

		 * Sometimes command error interrupts and command complete

		 * interrupt will arrive together. Clear all command related

		 * interrupts here.

		 */

		sdhci_writel(host, intmask & CMD_MASK, SDHCI_INT_STATUS);

		intmask &= ~CMD_MASK;

	}



	return intmask;

}



static struct sdhci_ops sdhci_omap_ops = {

	.set_clock = sdhci_omap_set_clock,

	.set_power = sdhci_omap_set_power,
@@ -807,6 +844,7 @@ static struct sdhci_ops sdhci_omap_ops = { 
	.platform_send_init_74_clocks = sdhci_omap_init_74_clocks,

	.reset = sdhci_omap_reset,

	.set_uhs_signaling = sdhci_omap_set_uhs_signaling,

	.irq = sdhci_omap_irq,

};



static int sdhci_omap_set_capabilities(struct sdhci_omap_host *omap_host)

CRA Git | Maintained and supported by SUSTech CRA and CCSE