Skip to content

Commit b578d5d

Browse files
ahunter6Ulf Hansson
authored andcommitted
mmc: cqhci: Increase recovery halt timeout
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: a408022 ("mmc: cqhci: support for command queue enabled host") Cc: stable@vger.kernel.org Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Reviewed-by: Avri Altman <avri.altman@wdc.com> Link: https://lore.kernel.org/r/20231103084720.6886-3-adrian.hunter@intel.com Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
1 parent 174925d commit b578d5d

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

drivers/mmc/host/cqhci-core.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -984,10 +984,10 @@ static bool cqhci_halt(struct mmc_host *mmc, unsigned int timeout)
984984
/*
985985
* After halting we expect to be able to use the command line. We interpret the
986986
* failure to halt to mean the data lines might still be in use (and the upper
987-
* layers will need to send a STOP command), so we set the timeout based on a
988-
* generous command timeout.
987+
* layers will need to send a STOP command), however failing to halt complicates
988+
* the recovery, so set a timeout that would reasonably allow I/O to complete.
989989
*/
990-
#define CQHCI_START_HALT_TIMEOUT 5
990+
#define CQHCI_START_HALT_TIMEOUT 500
991991

992992
static void cqhci_recovery_start(struct mmc_host *mmc)
993993
{

0 commit comments

Comments
 (0)