Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4acb73ae authored by Adrian Hunter's avatar Adrian Hunter Committed by Greg Kroah-Hartman
Browse files

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



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>
parent 863a9cab

drivers/mmc/core/core.c

+2 −0
Original line number Diff line number Diff line
@@ -573,6 +573,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, true, true);



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

	cmd.opcode       = MMC_CMDQ_TASK_MGMT;

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

drivers/mmc/core/mmc_ops.c

+3 −2
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ int mmc_switch_status(struct mmc_card *card) 
	return __mmc_switch_status(card, true);

}



static int mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms,

int mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms,

		      bool send_status, bool retry_crc_err)

{

	struct mmc_host *host = card->host;
@@ -502,6 +502,7 @@ static int mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms, 


	return 0;

}

EXPORT_SYMBOL_GPL(mmc_poll_for_busy);



/**

 *	__mmc_switch - modify EXT_CSD register

drivers/mmc/core/mmc_ops.h

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ int mmc_can_ext_csd(struct mmc_card *card); 
int mmc_get_ext_csd(struct mmc_card *card, u8 **new_ext_csd);

int mmc_switch_status(struct mmc_card *card);

int __mmc_switch_status(struct mmc_card *card, bool crc_err_fatal);

int mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms,

		      bool send_status, bool retry_crc_err);

int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,

		unsigned int timeout_ms, unsigned char timing,

		bool use_busy_signal, bool send_status,	bool retry_crc_err);