| Message ID | 20231103084720.6886-5-adrian.hunter@intel.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | mmc: block: Fixes for CQE error recovery recovery | expand |
> It is important that MMC_CMDQ_TASK_MGMT command to discard the > queue is successful because otherwise a subsequent reset might fail to flush > the cache first. Retry it and the previous STOP command. > > Fixes: 72a5af554df8 ("mmc: core: Add support for handling CQE requests") > Cc: stable@vger.kernel.org > Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Reviewed-by: Avri Altman <avri.altman@wdc.com> > --- > drivers/mmc/core/core.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index > befde2bd26d3..a8c17b4cd737 100644 > --- a/drivers/mmc/core/core.c > +++ b/drivers/mmc/core/core.c > @@ -551,7 +551,7 @@ int mmc_cqe_recovery(struct mmc_host *host) > cmd.flags = MMC_RSP_R1B | MMC_CMD_AC; > cmd.flags &= ~MMC_RSP_CRC; /* Ignore CRC */ > cmd.busy_timeout = MMC_CQE_RECOVERY_TIMEOUT; > - mmc_wait_for_cmd(host, &cmd, 0); > + mmc_wait_for_cmd(host, &cmd, MMC_CMD_RETRIES); > > mmc_poll_for_busy(host->card, MMC_CQE_RECOVERY_TIMEOUT, true, > MMC_BUSY_IO); > > @@ -561,10 +561,13 @@ int mmc_cqe_recovery(struct mmc_host *host) > cmd.flags = MMC_RSP_R1B | MMC_CMD_AC; > cmd.flags &= ~MMC_RSP_CRC; /* Ignore CRC */ > cmd.busy_timeout = MMC_CQE_RECOVERY_TIMEOUT; > - err = mmc_wait_for_cmd(host, &cmd, 0); > + err = mmc_wait_for_cmd(host, &cmd, MMC_CMD_RETRIES); > > host->cqe_ops->cqe_recovery_finish(host); > > + if (err) > + err = mmc_wait_for_cmd(host, &cmd, MMC_CMD_RETRIES); > + > mmc_retune_release(host); > > return err; > -- > 2.34.1
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index befde2bd26d3..a8c17b4cd737 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -551,7 +551,7 @@ int mmc_cqe_recovery(struct mmc_host *host) cmd.flags = MMC_RSP_R1B | MMC_CMD_AC; cmd.flags &= ~MMC_RSP_CRC; /* Ignore CRC */ cmd.busy_timeout = MMC_CQE_RECOVERY_TIMEOUT; - mmc_wait_for_cmd(host, &cmd, 0); + mmc_wait_for_cmd(host, &cmd, MMC_CMD_RETRIES); mmc_poll_for_busy(host->card, MMC_CQE_RECOVERY_TIMEOUT, true, MMC_BUSY_IO); @@ -561,10 +561,13 @@ int mmc_cqe_recovery(struct mmc_host *host) cmd.flags = MMC_RSP_R1B | MMC_CMD_AC; cmd.flags &= ~MMC_RSP_CRC; /* Ignore CRC */ cmd.busy_timeout = MMC_CQE_RECOVERY_TIMEOUT; - err = mmc_wait_for_cmd(host, &cmd, 0); + err = mmc_wait_for_cmd(host, &cmd, MMC_CMD_RETRIES); host->cqe_ops->cqe_recovery_finish(host); + if (err) + err = mmc_wait_for_cmd(host, &cmd, MMC_CMD_RETRIES); + mmc_retune_release(host); return err;
It is important that MMC_CMDQ_TASK_MGMT command to discard the queue is successful because otherwise a subsequent reset might fail to flush the cache first. Retry it and the previous STOP command. Fixes: 72a5af554df8 ("mmc: core: Add support for handling CQE requests") Cc: stable@vger.kernel.org Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> --- drivers/mmc/core/core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)