Commit ee0fc86c authored by Matt Gumbel's avatar Matt Gumbel Committed by Sasha Levin

mmc: longer timeout for long read time quirk

[ Upstream commit 32ecd320 ]

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: default avatarMatt Gumbel <matthew.k.gumbel@intel.com>
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent f4502e6e
...@@ -2410,11 +2410,12 @@ static const struct mmc_fixup blk_fixups[] = ...@@ -2410,11 +2410,12 @@ static const struct mmc_fixup blk_fixups[] =
MMC_QUIRK_BLK_NO_CMD23), MMC_QUIRK_BLK_NO_CMD23),
/* /*
* Some Micron MMC cards needs longer data read timeout than * Some MMC cards need longer data read timeout than indicated in CSD.
* indicated in CSD.
*/ */
MMC_FIXUP(CID_NAME_ANY, CID_MANFID_MICRON, 0x200, add_quirk_mmc, MMC_FIXUP(CID_NAME_ANY, CID_MANFID_MICRON, 0x200, add_quirk_mmc,
MMC_QUIRK_LONG_READ_TIME), MMC_QUIRK_LONG_READ_TIME),
MMC_FIXUP("008GE0", CID_MANFID_TOSHIBA, CID_OEMID_ANY, add_quirk_mmc,
MMC_QUIRK_LONG_READ_TIME),
/* /*
* On these Samsung MoviNAND parts, performing secure erase or * On these Samsung MoviNAND parts, performing secure erase or
......
...@@ -811,11 +811,11 @@ void mmc_set_data_timeout(struct mmc_data *data, const struct mmc_card *card) ...@@ -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. * Some cards require longer data read timeout than indicated in CSD.
* Address this by setting the read timeout to a "reasonably high" * 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. * this value can be increased if other problematic cards require this.
*/ */
if (mmc_card_long_read_time(card) && data->flags & MMC_DATA_READ) { if (mmc_card_long_read_time(card) && data->flags & MMC_DATA_READ) {
data->timeout_ns = 300000000; data->timeout_ns = 600000000;
data->timeout_clks = 0; data->timeout_clks = 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment