brcmfmac: avoid runtime-pm for sdio host controller
authorArend van Spriel <arend@broadcom.com>
Wed, 18 Mar 2015 12:25:21 +0000 (13:25 +0100)
committerKalle Valo <kvalo@codeaurora.org>
Fri, 20 Mar 2015 07:03:23 +0000 (09:03 +0200)
Several host controllers supporting runtime-pm are causing issues
with our sdio wireless cards because they disable the sdio interrupt
upon going into runtime suspend. This patch avoids that by doing
a pm_runtime_forbid() call during the probe. Tested with Sony Vaio
Duo 13 which uses sdhci-acpi host controller.

Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c

index 43995308307d0495bc791cdb5cf5429aeec05ab5..9667b6aabc00d1ebc617c91318c902424338ed41 100644 (file)
@@ -29,6 +29,7 @@
 #include <linux/mmc/host.h>
 #include <linux/platform_device.h>
 #include <linux/platform_data/brcmfmac-sdio.h>
+#include <linux/pm_runtime.h>
 #include <linux/suspend.h>
 #include <linux/errno.h>
 #include <linux/module.h>
@@ -1006,6 +1007,7 @@ static int brcmf_sdiod_remove(struct brcmf_sdio_dev *sdiodev)
        sg_free_table(&sdiodev->sgtable);
        sdiodev->sbwad = 0;
 
+       pm_runtime_allow(sdiodev->func[1]->card->host->parent);
        return 0;
 }
 
@@ -1074,7 +1076,7 @@ static int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev)
                ret = -ENODEV;
                goto out;
        }
-
+       pm_runtime_forbid(host->parent);
 out:
        if (ret)
                brcmf_sdiod_remove(sdiodev);