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

Commit d8975304 authored by Sahitya Tummala's avatar Sahitya Tummala Committed by Veerabhadrarao Badiganti
Browse files

mmc: sdhci: Fix SDHCI_QUIRK2_IGNORE_DATATOUT_FOR_R1BCMD handling 



If this quirk is set, then data timeout interrupt must not be
handled for R1B commands, as those commands may need larger
timeout value (larger than max timeout that controller can handle).

Change-Id: I7453b1914add21b47393b3eb1578d88e72da7406
Signed-off-by: default avatarSahitya Tummala <stummala@codeaurora.org>
Signed-off-by: default avatarVeerabhadrarao Badiganti <vbadigan@codeaurora.org>
parent d14a930f

drivers/mmc/host/sdhci.c

+6 −6
Original line number Diff line number Diff line
@@ -3088,12 +3088,6 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) 
		 * above in sdhci_cmd_irq().

		 */

		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;

				/*
@@ -3110,6 +3104,12 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) 
			if (host->quirks2 &

				SDHCI_QUIRK2_IGNORE_DATATOUT_FOR_R1BCMD)

				return;

			if (intmask & SDHCI_INT_DATA_TIMEOUT) {

				host->data_cmd = NULL;

				data_cmd->error = -ETIMEDOUT;

				sdhci_finish_mrq(host, data_cmd->mrq);

				return;

			}

		}



		/*