evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mmc: sdhci: propagate error to command queue engine

Browse source 
eMMC controller detects error, generates error interrupt and
notifies the CQE. Hence, parse the correct error and propagate
it to CQE handler for further processing.

Command queue interrupt handler may return IRQ_NONE
or IRQ_HANDLED. Check for the return value and either
proceed or return from handler.

Change-Id: I29c7b22848d3d728a79ba215f8d2f594d19fba63
Signed-off-by: Asutosh Das <asutoshd@codeaurora.org>
Signed-off-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
This commit is contained in:
Asutosh Das 2015-02-27 00:02:02 +05:30 • committed by Subhash Jadavani
parent 444223d884
commit f446730be1
1 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
drivers/mmc/host/sdhci.c
View file

@ -2920,9 +2920,37 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)
}
#ifdef CONFIG_MMC_CQ_HCI
static int sdhci_get_cmd_err(u32 intmask)
{
if (intmask & SDHCI_INT_TIMEOUT)
return -ETIMEDOUT;
else if (intmask & (SDHCI_INT_CRC | SDHCI_INT_END_BIT |
SDHCI_INT_INDEX))
return -EILSEQ;
return 0;
}
static int sdhci_get_data_err(u32 intmask)
{
if (intmask & SDHCI_INT_DATA_TIMEOUT)
return -ETIMEDOUT;
else if (intmask & (SDHCI_INT_DATA_END_BIT | SDHCI_INT_DATA_CRC))
return -EILSEQ;
else if (intmask & SDHCI_INT_ADMA_ERROR)
return -EIO;
return 0;
}
static irqreturn_t sdhci_cmdq_irq(struct mmc_host *mmc, u32 intmask)
{
return cmdq_irq(mmc, intmask);
int err = 0;
if (intmask & SDHCI_INT_CMD_MASK)
err = sdhci_get_cmd_err(intmask);
else if (intmask & SDHCI_INT_DATA_MASK)
err = sdhci_get_data_err(intmask);
return cmdq_irq(mmc, err);
}
#else
@ -2960,7 +2988,8 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id)
mmc_hostname(host->mmc),
intmask);
result = sdhci_cmdq_irq(host->mmc, intmask);
goto out;
if (result == IRQ_HANDLED)
goto out;
}
if (intmask & SDHCI_INT_AUTO_CMD_ERR)