diff options
| author | Pavan Kunapuli <pkunapuli@nvidia.com> | 2013-10-24 18:54:41 +0530 |
|---|---|---|
| committer | Kerwin Wan <kerwinw@nvidia.com> | 2014-03-26 02:20:25 -0700 |
| commit | 7bb40d20b02ec1f7d46f9a2c2faf898b4245f8f7 (patch) | |
| tree | a5ec70fb0cdb10428e002a911440ee05289d373b /drivers/mmc | |
| parent | 91300aef2a8655f5d089ab659c67bd70e660ad32 (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
Bug 1484117
Reviewed-on: http://git-master/r/303361
Change-Id: Ibb73b27159508b2ae851032a6ea1432f76b1f384
Signed-off-by: Pavan Kunapuli <pkunapuli@nvidia.com>
Signed-off-by: Naveen Kumar Arepalli <naveenk@nvidia.com>
Reviewed-on: http://git-master/r/384773
(cherry picked from commit 021b596219b1f2ca280e239a8a8e64a3e8802ac8)
Reviewed-on: http://git-master/r/386119
Reviewed-by: Automatic_Commit_Validation_User
Tested-by: Kerwin Wan <kerwinw@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Venu Byravarasu <vbyravarasu@nvidia.com>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 1b29947a4395..9a8c3d8596ff 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1307,7 +1307,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; |