summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/core
diff options
context:
space:
mode:
authorMatt Gumbel <matthew.k.gumbel@intel.com>2016-05-20 10:33:46 +0300
committerBen Hutchings <ben@decadent.org.uk>2016-08-22 22:38:04 +0100
commita888f891c2f77bf9564aba0d74a7a7ddc9435d73 (patch)
tree519bc46cee3a6b982bce86f0a51a0486b1117526 /drivers/mmc/core
parent1a4f083e09e1472df4e5e7c7915eb00e6948fe83 (diff)
downloadlinux-stable-a888f891c2f77bf9564aba0d74a7a7ddc9435d73.tar.gz
linux-stable-a888f891c2f77bf9564aba0d74a7a7ddc9435d73.tar.bz2
linux-stable-a888f891c2f77bf9564aba0d74a7a7ddc9435d73.zip
mmc: longer timeout for long read time quirk
commit 32ecd320db39bcb007679ed42f283740641b81ea upstream. 008GE0 Toshiba mmc in some Intel Baytrail tablets responds to MMC_SEND_EXT_CSD in 450-600ms. This patch will... () Increase the long read time quirk timeout from 300ms to 600ms. Original author of that quirk says 300ms was only a guess and that the number may need to be raised in the future. () Add this specific MMC to the quirk Signed-off-by: Matt Gumbel <matthew.k.gumbel@intel.com> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/mmc/core')
-rw-r--r--drivers/mmc/core/core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index aba0b8c632ee..2b051b32f38f 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -811,11 +811,11 @@ void mmc_set_data_timeout(struct mmc_data *data, const struct mmc_card *card)
/*
* Some cards require longer data read timeout than indicated in CSD.
* Address this by setting the read timeout to a "reasonably high"
- * value. For the cards tested, 300ms has proven enough. If necessary,
+ * value. For the cards tested, 600ms has proven enough. If necessary,
* this value can be increased if other problematic cards require this.
*/
if (mmc_card_long_read_time(card) && data->flags & MMC_DATA_READ) {
- data->timeout_ns = 300000000;
+ data->timeout_ns = 600000000;
data->timeout_clks = 0;
}