mmc: msm_sdcc: Update the request timeout for certain SanDisk eMMC cards
Some INAND MCP devices advertise incorrect data timeout values
which in turn require higher request timeout value.
Update the request timeout for such devices for proper functionality.
CRs-Fixed: 359037
Change-Id: Ice18f3b20e3d646030f0facadae78f5535c92920
Signed-off-by: Pratibhasagar V <pratibha@codeaurora.org>
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index 3b115ab..0d6c5f1 100644
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -1850,7 +1850,7 @@
msmsdcc_request(struct mmc_host *mmc, struct mmc_request *mrq)
{
struct msmsdcc_host *host = mmc_priv(mmc);
- unsigned long flags;
+ unsigned long flags, timeout;
/*
* Get the SDIO AL client out of LPM.
@@ -1904,11 +1904,18 @@
mrq->cmd->opcode, host->curr.mrq->cmd->opcode);
/*
- * Kick the software command timeout timer here.
- * Timer expires in 10 secs.
+ * Set timeout value to 10 secs (or more in case of buggy cards)
+ */
+ if ((mmc->card) && (mmc->card->quirks & MMC_QUIRK_INAND_DATA_TIMEOUT))
+ timeout = 20000;
+ else
+ timeout = MSM_MMC_REQ_TIMEOUT;
+ /*
+ * Kick the software request timeout timer here with the timeout
+ * value identified above
*/
mod_timer(&host->req_tout_timer,
- (jiffies + msecs_to_jiffies(MSM_MMC_REQ_TIMEOUT)));
+ (jiffies + msecs_to_jiffies(timeout)));
host->curr.mrq = mrq;
if (mrq->data && (mrq->data->flags & MMC_DATA_WRITE)) {
diff --git a/drivers/mmc/host/msm_sdcc.h b/drivers/mmc/host/msm_sdcc.h
index 718ef43..e6bd16c 100644
--- a/drivers/mmc/host/msm_sdcc.h
+++ b/drivers/mmc/host/msm_sdcc.h
@@ -212,10 +212,7 @@
#define MSM_MMC_IDLE_TIMEOUT 5000 /* msecs */
-/*
- * Set the request timeout to 10secs to allow
- * bad cards/controller to respond.
- */
+/* Set the request timeout to 10secs */
#define MSM_MMC_REQ_TIMEOUT 10000 /* msecs */
#define MSM_MMC_DISABLE_TIMEOUT 200 /* msecs */