aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@intel.com>2016-05-05 01:12:28 -0400
committerUlf Hansson <ulf.hansson@linaro.org>2016-05-16 05:31:28 -0400
commit1c447116d017a98c90f8f71c8c5a611e0aa42178 (patch)
tree1f53292995e28eb4211442365ad8a77079bbca6c
parent685d29ef1783af0049c4aeeec43722e410d5845d (diff)
mmc: mmc: Fix partition switch timeout for some eMMCs
Some eMMCs set the partition switch timeout too low. Now typically eMMCs are considered a critical component (e.g. because they store the root file system) and consequently are expected to be reliable. Thus we can neglect the use case where eMMCs can't switch reliably and we might want a lower timeout to facilitate speedy recovery. Although we could employ a quirk for the cards that are affected (if we could identify them all), as described above, there is little benefit to having a low timeout, so instead simply set a minimum timeout. The minimum is set to 300ms somewhat arbitrarily - the examples that have been seen had a timeout of 10ms but were sometimes taking 60-70ms. Cc: stable@vger.kernel.org Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r--drivers/mmc/core/mmc.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 35873d4cc442..b81b08f81325 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -333,6 +333,9 @@ static void mmc_manage_gp_partitions(struct mmc_card *card, u8 *ext_csd)
333 } 333 }
334} 334}
335 335
336/* Minimum partition switch timeout in milliseconds */
337#define MMC_MIN_PART_SWITCH_TIME 300
338
336/* 339/*
337 * Decode extended CSD. 340 * Decode extended CSD.
338 */ 341 */
@@ -397,6 +400,10 @@ static int mmc_decode_ext_csd(struct mmc_card *card, u8 *ext_csd)
397 400
398 /* EXT_CSD value is in units of 10ms, but we store in ms */ 401 /* EXT_CSD value is in units of 10ms, but we store in ms */
399 card->ext_csd.part_time = 10 * ext_csd[EXT_CSD_PART_SWITCH_TIME]; 402 card->ext_csd.part_time = 10 * ext_csd[EXT_CSD_PART_SWITCH_TIME];
403 /* Some eMMC set the value too low so set a minimum */
404 if (card->ext_csd.part_time &&
405 card->ext_csd.part_time < MMC_MIN_PART_SWITCH_TIME)
406 card->ext_csd.part_time = MMC_MIN_PART_SWITCH_TIME;
400 407
401 /* Sleep / awake timeout in 100ns units */ 408 /* Sleep / awake timeout in 100ns units */
402 if (sa_shift > 0 && sa_shift <= 0x17) 409 if (sa_shift > 0 && sa_shift <= 0x17)