summaryrefslogtreecommitdiff
path: root/drivers/mmc
diff options
context:
space:
mode:
authorPavan Kunapuli <pkunapuli@nvidia.com>2013-10-24 18:54:41 +0530
committerHarry Hong <hhong@nvidia.com>2013-10-29 17:54:48 -0700
commit7202e576c8049b8a2f665727cdf86cc3f5bbe847 (patch)
tree7464547e11ae91d186377dc54ba222a79e725ee4 /drivers/mmc
parentc1ef31ca4e256d02e7f11582d1ed0ac012591805 (diff)
mmc: sdhci: Increase SW timeout for sanitize cmd
Sanitize cmds have very long busy wait times. Increasing the SW timeout timer for sanitize cmd to ensure that the driver doesn't trigger timeout in the middle of sanitize busy wait. Bug 1385731 Bug 1392724 Change-Id: Ibb73b27159508b2ae851032a6ea1432f76b1f384 Signed-off-by: Pavan Kunapuli <pkunapuli@nvidia.com> Reviewed-on: http://git-master/r/303361 (cherry picked from commit 86455fb1b1e9416b192fe8e8e37212da9a242ccb) Reviewed-on: http://git-master/r/304792 Reviewed-by: Harry Hong <hhong@nvidia.com> Tested-by: Harry Hong <hhong@nvidia.com>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sdhci.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 0f9de643dd83..ee0602f8af4c 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -989,7 +989,14 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)
mdelay(1);
}
- mod_timer(&host->timer, jiffies + 10 * HZ);
+ if ((cmd->opcode == MMC_SWITCH) &&
+ (((cmd->arg >> 16) & EXT_CSD_SANITIZE_START)
+ == EXT_CSD_SANITIZE_START))
+ timeout = 100;
+ else
+ timeout = 10;
+
+ mod_timer(&host->timer, jiffies + timeout * HZ);
host->cmd = cmd;