On 14 April 2015 at 20:10, Arend van Spriel <[email protected]> wrote:
> 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 <<[email protected]>
> Reviewed-by: Pieter-Paul Giesberts <[email protected]>
> Reviewed-by: Franky (Zhenhui) Lin <[email protected]>
> Signed-off-by: Arend van Spriel <[email protected]>
> ---
> drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 18 +++++++++++++-----
> 1 file changed, 13 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
> b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
> index 9b508bd..8a69544 100644
> --- 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);
That you need this, clearly shows that something is broken in the mmc
core/host layer.
Could you elaborate a bit on what configuration you are using. Like
what mmc host, which SDIO bus speed mode.
And have you tested different configurations? Like what happens if you
use a different SDIO bus speed mode?
> + /* 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;
> }
>
> --
> 1.9.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Kind regards
Uffe
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
