diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2021-06-24 17:16:14 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-19 08:53:15 +0200 |
| commit | 2d95959fa4f43a4035c79bf9c3b3ca11ee1233a3 (patch) | |
| tree | 04000ce7beb4c6cf8e00586a850493fb5f12b656 | |
| parent | 7e3b6e797a4383e6506ebbd0154efad1354c4f30 (diff) | |
| download | linux-stable-2d95959fa4f43a4035c79bf9c3b3ca11ee1233a3.tar.gz linux-stable-2d95959fa4f43a4035c79bf9c3b3ca11ee1233a3.tar.bz2 linux-stable-2d95959fa4f43a4035c79bf9c3b3ca11ee1233a3.zip | |
mmc: core: clear flags before allowing to retune
commit 77347eda64ed5c9383961d1de9165f9d0b7d8df6 upstream.
It might be that something goes wrong during tuning so the MMC core will
immediately trigger a retune. In our case it was:
- we sent a tuning block
- there was an error so we need to send an abort cmd to the eMMC
- the abort cmd had a CRC error
- retune was set by the MMC core
This lead to a vicious circle causing a performance regression of 75%.
So, clear retuning flags before we enable retuning to start with a known
cleared state.
Reported-by Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Suggested-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Fixes: bd11e8bd03ca ("mmc: core: Flag re-tuning is needed on CRC errors")
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20210624151616.38770-2-wsa+renesas@sang-engineering.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/mmc/core/core.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 460a456bcdd2..8f94c2539508 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -953,11 +953,14 @@ int mmc_execute_tuning(struct mmc_card *card) err = host->ops->execute_tuning(host, opcode); - if (err) + if (err) { pr_err("%s: tuning execution failed: %d\n", mmc_hostname(host), err); - else + } else { + host->retune_now = 0; + host->need_retune = 0; mmc_retune_enable(host); + } return err; } |