summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorSubhash Jadavani <subhashj@codeaurora.org>2014-12-04 15:16:17 +0200
committerSubhash Jadavani <subhashj@codeaurora.org>2016-05-31 15:25:42 -0700
commit18941a3b87ccea2595ad5638c65fe7ba69f86eef (patch)
treee21be4af5880f685bd2491f8070db08998e0c860 /drivers
parent23bf7111217b01b45af465f2cb4cf4bf37c0842b (diff)
mmc: block: reduce the block timeout to 30 secs
After completion of block write request, MMC block driver waits for the card to come out of the programming state. If card doesn't come out of the programming state in 10 mins, it would be considered as error condition and card would reinitialized. But this 10 mins is just too huge and if card is continuously stuck in programming state for 10 mins, mmcqd thread would take increase the CPU load significantly as we are continuously polling for the card status (by sending status commands). This patch reduces this timeout from 10 mins to 30 secs which is quite reasonable for all well-behaved cards. Change-Id: I4e8eaf29c836a81419220f312ee867b0dd5cccc7 Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org> [merez@codeaurora.org: fix trivial conflicts] Signed-off-by: Maya Erez <merez@codeaurora.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/card/block.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 50b37f38e6e8..9559ddfef99a 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -61,7 +61,7 @@ MODULE_ALIAS("mmc:block");
#define INAND_CMD38_ARG_SECERASE 0x80
#define INAND_CMD38_ARG_SECTRIM1 0x81
#define INAND_CMD38_ARG_SECTRIM2 0x88
-#define MMC_BLK_TIMEOUT_MS (10 * 60 * 1000) /* 10 minute timeout */
+#define MMC_BLK_TIMEOUT_MS (30 * 1000) /* 30 sec timeout */
#define MMC_SANITIZE_REQ_TIMEOUT 240000
#define MMC_EXTRACT_INDEX_FROM_ARG(x) ((x & 0x00FF0000) >> 16)