Commit 734f2ecf authored by Adrian Hunter's avatar Adrian Hunter Committed by sanglipeng
Browse files

mmc: block: Retry commands in CQE error recovery 

stable inclusion
from stable-v5.10.203
commit 376fabe3677a767e9aa0dd122cddf80340c2332d
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9GXII

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=376fabe3677a767e9aa0dd122cddf80340c2332d



--------------------------------

[ Upstream commit 8155d1fa3a747baad5caff5f8303321d68ddd48c ]

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: 72a5af55 ("mmc: core: Add support for handling CQE requests")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Reviewed-by: default avatarAvri Altman <avri.altman@wdc.com>
Link: https://lore.kernel.org/r/20231103084720.6886-5-adrian.hunter@intel.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent e20a7ba9

drivers/mmc/core/core.c

+5 −2
Original line number Diff line number Diff line
@@ -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);



	memset(&cmd, 0, sizeof(cmd));

	cmd.opcode       = MMC_CMDQ_TASK_MGMT;
@@ -559,10 +559,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;