openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Adrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org # v4.8+
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Adrian Hunter 2016-11-02 15:49:09 +02:00 committed by Ulf Hansson
parent 6ebebeab51
commit 69b962a65a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/mmc/host/sdhci.c
View File

@ -2521,9 +2521,6 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)
if (!host->data) { if (!host->data) {
struct mmc_command *data_cmd = host->data_cmd; struct mmc_command *data_cmd = host->data_cmd;
if (data_cmd)
host->data_cmd = NULL;
/* /*
* The "data complete" interrupt is also used to * The "data complete" interrupt is also used to
* indicate that a busy state has ended. See comment * 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 (data_cmd && (data_cmd->flags & MMC_RSP_BUSY)) {
if (intmask & SDHCI_INT_DATA_TIMEOUT) { if (intmask & SDHCI_INT_DATA_TIMEOUT) {
host->data_cmd = NULL;
data_cmd->error = -ETIMEDOUT; data_cmd->error = -ETIMEDOUT;
sdhci_finish_mrq(host, data_cmd->mrq); sdhci_finish_mrq(host, data_cmd->mrq);
return; return;
} }
if (intmask & SDHCI_INT_DATA_END) { if (intmask & SDHCI_INT_DATA_END) {
host->data_cmd = NULL;
/* /*
* Some cards handle busy-end interrupt * Some cards handle busy-end interrupt
* before the command completed, so make * before the command completed, so make