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

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

stable inclusion
from stable-v5.10.204
commit d7c3a467f47a947c81021be01c0035c4b30920f0
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9J4PL

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



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

commit c616696a902987352426fdaeec1b0b3240949e6b upstream.

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>
Tested-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 9e3b2180

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, MMC_CMD_RETRIES);



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



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

	cmd.opcode       = MMC_CMDQ_TASK_MGMT;

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

drivers/mmc/core/mmc_ops.c

+2 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ static int mmc_busy_status(struct mmc_card *card, bool retry_crc_err, 
	u32 status = 0;

	int err;



	if (host->ops->card_busy) {

	if (busy_cmd != MMC_BUSY_IO && host->ops->card_busy) {

		*busy = host->ops->card_busy(host);

		return 0;

	}
@@ -473,6 +473,7 @@ static int mmc_busy_status(struct mmc_card *card, bool retry_crc_err, 
		err = R1_STATUS(status) ? -EIO : 0;

		break;

	case MMC_BUSY_HPI:

	case MMC_BUSY_IO:

		break;

	default:

		err = -EINVAL;

drivers/mmc/core/mmc_ops.h

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ enum mmc_busy_cmd { 
	MMC_BUSY_CMD6,

	MMC_BUSY_ERASE,

	MMC_BUSY_HPI,

	MMC_BUSY_IO,

};



struct mmc_host;