mmc: core: sdio: hold retuning if sdio in 1-bit mode

commit 32a9cdb8869dc111a0c96cf8e1762be9684af15b upstream.

tuning only support in 4-bit mode or 8 bit mode, so in 1-bit mode,
need to hold retuning.

Find this issue when use manual tuning method on imx93. When system
resume back, SDIO WIFI try to switch back to 4 bit mode, first will
trigger retuning, and all tuning command failed.

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Fixes: dfa13ebbe334 ("mmc: host: Add facility to support re-tuning")
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20230830093922.3095850-1-haibo.chen@nxp.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 5447c47157aa5503ace8f6ae4fefa9cc1f867e08..eda2dbd965392df23fa44423aaa27e221001cc4e 100644 (file)
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -1073,8 +1073,14 @@ static int mmc_sdio_resume(struct mmc_host *host)
                }
                err = mmc_sdio_reinit_card(host);
        } else if (mmc_card_wake_sdio_irq(host)) {
-               /* We may have switched to 1-bit mode during suspend */
+               /*
+                * We may have switched to 1-bit mode during suspend,
+                * need to hold retuning, because tuning only supprt
+                * 4-bit mode or 8 bit mode.
+                */
+               mmc_retune_hold_now(host);
                err = sdio_enable_4bit_bus(host->card);
+               mmc_retune_release(host);
        }
 
        if (err)