Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69b962a6 authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: sdhci: Fix unexpected data interrupt handling 



In the busy response case (i.e. !host->data), an unexpected data interrupt
would result in clearing the data command as though it had completed but
without informing the upper layers and thus resulting in a hang.  Fix by
only clearing the data command for data interrupts that are expected.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org # v4.8+
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 6ebebeab

drivers/mmc/host/sdhci.c

+2 −3
Original line number Diff line number Diff line
@@ -2521,9 +2521,6 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) 
	if (!host->data) {

		struct mmc_command *data_cmd = host->data_cmd;



		if (data_cmd)

			host->data_cmd = NULL;



		/*

		 * The "data complete" interrupt is also used to

		 * indicate that a busy state has ended. See comment
@@ -2531,11 +2528,13 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) 
		 */

		if (data_cmd && (data_cmd->flags & MMC_RSP_BUSY)) {

			if (intmask & SDHCI_INT_DATA_TIMEOUT) {

				host->data_cmd = NULL;

				data_cmd->error = -ETIMEDOUT;

				sdhci_finish_mrq(host, data_cmd->mrq);

				return;

			}

			if (intmask & SDHCI_INT_DATA_END) {

				host->data_cmd = NULL;

				/*

				 * Some cards handle busy-end interrupt

				 * before the command completed, so make