mmc: sdio: Fix 1-bit mode for SD-combo cards during suspend

Commit 6b5eda369ac3 ("sdio: put active devices into 1-bit mode during
suspend") disabled 4-bit mode during system suspend. After this patch,
commit 7310ece86ad7 ("mmc: implement SD-combo (IO+mem) support") used
new sdio_enable_4bit_bus() instead of sdio_enable_wide() to support
SD-combo cards, also for card resume. However, no corresponding support
added during suspend. That is not correct. Let's fix it.

Signed-off-by: Yue Hu <huyue2@yulong.com>
Link: https://lore.kernel.org/r/20200609081431.6376-1-zbestahu@gmail.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index d9ba7dd7cf1bfc578c2a86a9fe0d5aed77430738..0e32ca7b948865cf2accf7c45a4a35a1eda20eb9 100644 (file)
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -303,6 +303,27 @@ static int sdio_disable_wide(struct mmc_card *card)
        return 0;
 }
 
+static int sdio_disable_4bit_bus(struct mmc_card *card)
+{
+       int err;
+
+       if (card->type == MMC_TYPE_SDIO)
+               goto out;
+
+       if (!(card->host->caps & MMC_CAP_4_BIT_DATA))
+               return 0;
+
+       if (!(card->scr.bus_widths & SD_SCR_BUS_WIDTH_4))
+               return 0;
+
+       err = mmc_app_set_bus_width(card, MMC_BUS_WIDTH_1);
+       if (err)
+               return err;
+
+out:
+       return sdio_disable_wide(card);
+}
+
 
 static int sdio_enable_4bit_bus(struct mmc_card *card)
 {
@@ -970,7 +991,7 @@ static int mmc_sdio_suspend(struct mmc_host *host)
        mmc_claim_host(host);
 
        if (mmc_card_keep_power(host) && mmc_card_wake_sdio_irq(host))
-               sdio_disable_wide(host->card);
+               sdio_disable_4bit_bus(host->card);
 
        if (!mmc_card_keep_power(host)) {
                mmc_power_off(host);