Commit c616696a authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: block: Be sure to wait while busy in CQE error recovery 



STOP command does not guarantee to wait while busy, but subsequent command
MMC_CMDQ_TASK_MGMT to discard the queue will fail if the card is busy, so
be sure to wait by employing mmc_poll_for_busy().

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>
Reviewed-by: default avatarChristian Loehle <christian.loehle@arm.com>
Link: https://lore.kernel.org/r/20231103084720.6886-4-adrian.hunter@intel.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent b578d5d1

drivers/mmc/core/core.c

+2 −0
Original line number Diff line number Diff line
@@ -553,6 +553,8 @@ int mmc_cqe_recovery(struct mmc_host *host) 
	cmd.busy_timeout = MMC_CQE_RECOVERY_TIMEOUT;

	mmc_wait_for_cmd(host, &cmd, 0);



	mmc_poll_for_busy(host->card, MMC_CQE_RECOVERY_TIMEOUT, true, MMC_BUSY_IO);



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

	cmd.opcode       = MMC_CMDQ_TASK_MGMT;

	cmd.arg          = 1; /* Discard entire queue */