Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "mmc: cmdq_hci: Increase HAC interrupt wait time in halt path"

This commit is contained in:
Linux Build Service Account 2017-07-21 18:32:02 -07:00 committed by Gerrit - the friendly Code Review server
parent 4e2cb525b4 bf86cf1cb6
commit cb5b5db1cf
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/mmc/host/cmdq_hci.c
View File

@ -29,8 +29,8 @@
#define DCMD_SLOT 31
#define NUM_SLOTS 32
/* 1 sec */
#define HALT_TIMEOUT_MS 1000
/* 10 sec */
#define HALT_TIMEOUT_MS 10000
static int cmdq_halt_poll(struct mmc_host *mmc);
static int cmdq_halt(struct mmc_host *mmc, bool halt);
@ -878,6 +878,7 @@ static int cmdq_halt(struct mmc_host *mmc, bool halt)
{
struct cmdq_host *cq_host = (struct cmdq_host *)mmc_cmdq_private(mmc);
u32 val;
u32 config = 0;
int retries = 3;
if (halt) {
@ -886,9 +887,28 @@ static int cmdq_halt(struct mmc_host *mmc, bool halt)
CQCTL);
val = wait_for_completion_timeout(&cq_host->halt_comp,
msecs_to_jiffies(HALT_TIMEOUT_MS));
if (!val && !(cmdq_readl(cq_host, CQCTL) & HALT)) {
retries--;
continue;
if (!val) {
pr_warn("%s: %s: HAC int timeout\n",
mmc_hostname(mmc), __func__);
if ((cmdq_readl(cq_host, CQCTL) & HALT)) {
/*
* Don't retry if CQE is halted but irq
* is not triggered in timeout period.
* And since we are returning error,
* un-halt CQE. Since irq was not fired
* yet, no need to set other params
*/
retries = 0;
config = cmdq_readl(cq_host, CQCTL);
config &= ~HALT;
cmdq_writel(cq_host, config, CQCTL);
} else {
pr_warn("%s: %s: retryng halt (%d)\n",
mmc_hostname(mmc), __func__,
retries);
retries--;
continue;
}
} else {
break;
}