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

Merge "MMC : host: clear interrupt after halt in case of error"

Browse source
This commit is contained in:
Linux Build Service Account 2017-02-21 05:33:39 -08:00 • committed by Gerrit - the friendly Code Review server
commit d2c8f5b696
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/mmc/host/cmdq_hci.c
View file

@ -845,7 +845,6 @@ irqreturn_t cmdq_irq(struct mmc_host *mmc, int err)
u32 dbr_set = 0; u32 dbr_set = 0;
status = cmdq_readl(cq_host, CQIS); status = cmdq_readl(cq_host, CQIS);
cmdq_writel(cq_host, status, CQIS);
if (!status && !err) if (!status && !err)
return IRQ_NONE; return IRQ_NONE;
@ -868,6 +867,17 @@ irqreturn_t cmdq_irq(struct mmc_host *mmc, int err)
if (ret) if (ret)
pr_err("%s: %s: halt failed ret=%d\n", pr_err("%s: %s: halt failed ret=%d\n",
mmc_hostname(mmc), __func__, ret); mmc_hostname(mmc), __func__, ret);
/*
* Clear the CQIS after halting incase of error. This is done
* because if CQIS is cleared before halting, the CQ will
* continue with issueing commands for rest of requests with
* Doorbell rung. This will overwrite the Resp Arg register.
* So CQ must be halted first and then CQIS cleared incase
* of error
*/
cmdq_writel(cq_host, status, CQIS);
cmdq_dumpregs(cq_host); cmdq_dumpregs(cq_host);
if (!err_info) { if (!err_info) {
@ -956,13 +966,16 @@ skip_cqterri:
mrq->cmdq_req->resp_err = true; mrq->cmdq_req->resp_err = true;
pr_err("%s: Response error (0x%08x) from card !!!", pr_err("%s: Response error (0x%08x) from card !!!",
mmc_hostname(mmc), status); mmc_hostname(mmc), cmdq_readl(cq_host, CQCRA));
} else { } else {
mrq->cmdq_req->resp_idx = cmdq_readl(cq_host, CQCRI); mrq->cmdq_req->resp_idx = cmdq_readl(cq_host, CQCRI);
mrq->cmdq_req->resp_arg = cmdq_readl(cq_host, CQCRA); mrq->cmdq_req->resp_arg = cmdq_readl(cq_host, CQCRA);
} }
cmdq_finish_data(mmc, tag); cmdq_finish_data(mmc, tag);
} else {
cmdq_writel(cq_host, status, CQIS);
} }
if (status & CQIS_TCC) { if (status & CQIS_TCC) {