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

mmc: cqhci: Increase recovery halt timeout 

stable inclusion
from stable-v5.10.203
commit e94ededefc423906faa99df72d90d9005f9d33c8
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=e94ededefc423906faa99df72d90d9005f9d33c8



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

[ Upstream commit b578d5d18e929aa7c007a98cce32657145dde219 ]

Failing to halt complicates the recovery. Additionally, unless the card or
controller are stuck, which is expected to be very rare, then the halt
should succeed, so it is better to wait. Set a large timeout.

Fixes: a4080225 ("mmc: cqhci: support for command queue enabled host")
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-3-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 6612b96d

drivers/mmc/host/cqhci.c

+3 −3
Original line number Diff line number Diff line
@@ -932,10 +932,10 @@ static bool cqhci_halt(struct mmc_host *mmc, unsigned int timeout) 
/*

 * After halting we expect to be able to use the command line. We interpret the

 * failure to halt to mean the data lines might still be in use (and the upper

 * layers will need to send a STOP command), so we set the timeout based on a

 * generous command timeout.

 * layers will need to send a STOP command), however failing to halt complicates

 * the recovery, so set a timeout that would reasonably allow I/O to complete.

 */

#define CQHCI_START_HALT_TIMEOUT	5

#define CQHCI_START_HALT_TIMEOUT	500



static void cqhci_recovery_start(struct mmc_host *mmc)

{