FAILED: patch "[PATCH] mmc: block: Be sure to wait while busy in CQE error recovery" failed to apply to 5.4-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y
git checkout FETCH_HEAD
git cherry-pick -x c616696a902987352426fdaeec1b0b3240949e6b
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023120314-freeware-thesis-5dd5@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^..
Possible dependencies:
c616696a9029 ("mmc: block: Be sure to wait while busy in CQE error recovery")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From c616696a902987352426fdaeec1b0b3240949e6b Mon Sep 17 00:00:00 2001
From: Adrian Hunter <[email protected]>
Date: Fri, 3 Nov 2023 10:47:17 +0200
Subject: [PATCH] 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().
drivers/mmc/core/core.c +2 -0
@@ -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 */
PATCH 1/1 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().
--- drivers/mmc/core/core.c | 2 ++ drivers/mmc/core/mmc_ops.c | 5 +++-- drivers/mmc/core/mmc_ops.h | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-)
drivers/mmc/core/core.c +2 -0
@@ -570,6 +570,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
@@ -450,8 +450,8 @@ 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, -bool send_status,bool retry_crc_err) +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;int err;
@@ -504,6 +504,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
@@ -31,6 +31,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);
Signature · 1 line
2.34.1
Greg KH
maintainerRe: [PATCH 5.4] mmc: block: Be sure to wait while busy in CQE error recovery
Quoted 15 lines · Adrian Hunter
commit
c616696a902987352426fdaeec1b0b3240949e6bupstream.STOP command does not guarantee to wait while busy, but subsequent command
MMC_CMDQ_TASK_MGMTto discard the queue will fail if the card is busy, so be sure to wait by employingmmc_poll_for_busy().Fixes 72a5af554df8 ("mmc: core: Add support for handling CQE requests")Signed-off-by Adrian Hunter <[email protected]>Reviewed-by Avri Altman <[email protected]>Reviewed-by Christian Loehle <[email protected]>Signed-off-by Ulf Hansson <[email protected]>Tested-by Adrian Hunter <[email protected]>Signed-off-by Adrian Hunter <[email protected]>
Quoted 5 lines
--- drivers/mmc/core/core.c | 2 ++ drivers/mmc/core/mmc_ops.c | 5 +++-- drivers/mmc/core/mmc_ops.h | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-)
Both now queued up, thanks.
greg k-h