brcmfmac: fix sdio suspend and resume

commit 330b4e4be937 ("brcmfmac: Add wowl support for SDIO devices.")
changed the behaviour by removing the MMC_PM_KEEP_POWER flag for
non-wowl scenario, which needs to be restored. Another necessary
change is to mark the card as being non-removable. With this in place
the suspend resume test passes successfully doing:

 # echo devices > /sys/power/pm_test
 # echo mem > /sys/power/state

Note that power may still be switched off when system is going
in S3 state.

Reported-by: Fu, Zhonghui <<zhonghui.fu@linux.intel.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
index 9b508bd3b839256e7595ed90c6ad2eb1bb4709f7..8a69544485a93d7bf7ac87452fd2dffb407382ab 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -1011,6 +1011,14 @@ static int brcmf_sdiod_remove(struct brcmf_sdio_dev *sdiodev)
        return 0;
 }
 
+static void brcmf_sdiod_host_fixup(struct mmc_host *host)
+{
+       /* runtime-pm powers off the device */
+       pm_runtime_forbid(host->parent);
+       /* avoid removal detection upon resume */
+       host->caps |= MMC_CAP_NONREMOVABLE;
+}
+
 static int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev)
 {
        struct sdio_func *func;
@@ -1076,7 +1084,7 @@ static int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev)
                ret = -ENODEV;
                goto out;
        }
-       pm_runtime_forbid(host->parent);
+       brcmf_sdiod_host_fixup(host);
 out:
        if (ret)
                brcmf_sdiod_remove(sdiodev);
@@ -1246,15 +1254,15 @@ static int brcmf_ops_sdio_suspend(struct device *dev)
        brcmf_sdiod_freezer_on(sdiodev);
        brcmf_sdio_wd_timer(sdiodev->bus, 0);
 
+       sdio_flags = MMC_PM_KEEP_POWER;
        if (sdiodev->wowl_enabled) {
-               sdio_flags = MMC_PM_KEEP_POWER;
                if (sdiodev->pdata->oob_irq_supported)
                        enable_irq_wake(sdiodev->pdata->oob_irq_nr);
                else
-                       sdio_flags = MMC_PM_WAKE_SDIO_IRQ;
-               if (sdio_set_host_pm_flags(sdiodev->func[1], sdio_flags))
-                       brcmf_err("Failed to set pm_flags %x\n", sdio_flags);
+                       sdio_flags |= MMC_PM_WAKE_SDIO_IRQ;
        }
+       if (sdio_set_host_pm_flags(sdiodev->func[1], sdio_flags))
+               brcmf_err("Failed to set pm_flags %x\n", sdio_flags);
        return 0;
 }