Messages in this thread | | | Date | Mon, 12 Jan 2015 11:00:57 +0100 | From | Arend van Spriel <> | Subject | Re: [PATCH] brcmfmac: avoid duplicated suspend/resume operation |
| |
On 01/12/15 07:41, Fu, Zhonghui wrote: > From 8685c3c2746b4275fc808d9db23c364b2f54b52a Mon Sep 17 00:00:00 2001 > From: Zhonghui Fu<zhonghui.fu@linux.intel.com> > Date: Mon, 12 Jan 2015 14:25:46 +0800 > Subject: [PATCH] brcmfmac: avoid duplicated suspend/resume operation > > WiFi chip has 2 SDIO functions, and PM core will trigger > twice suspend/resume operations for one WiFi chip to do > the same things. This patch avoid this case. > > Acked-by: Arend van Spriel<arend@broadcom.com> > Acked-by: Sergei Shtylyov<sergei.shtylyov@cogentembedded.com> > Signed-off-by: Zhonghui Fu<zhonghui.fu@linux.intel.com>
This patch needs to be rebased.
Kalle,
Please drop this one.
Regards, Arend
> --- > drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 21 +++++++++++++++++---- > 1 files changed, 17 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c > index 9880dae..8f71485 100644 > --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c > +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c > @@ -1070,7 +1070,7 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func, > */ > if ((sdio_get_host_pm_caps(sdiodev->func[1])& MMC_PM_KEEP_POWER)&& > ((sdio_get_host_pm_caps(sdiodev->func[1])& MMC_PM_WAKE_SDIO_IRQ) || > - (sdiodev->pdata&& sdiodev->pdata->oob_irq_supported))) > + (sdiodev->pdata->oob_irq_supported))) > bus_if->wowl_supported = true; > #endif > > @@ -1139,11 +1139,17 @@ void brcmf_sdio_wowl_config(struct device *dev, bool enabled) > static int brcmf_ops_sdio_suspend(struct device *dev) > { > struct brcmf_bus *bus_if = dev_get_drvdata(dev); > - struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio; > + struct brcmf_sdio_dev *sdiodev; > mmc_pm_flag_t sdio_flags; > + struct sdio_func *func = dev_to_sdio_func(dev); > > brcmf_dbg(SDIO, "Enter\n"); > > + if (func->num == 2) > + return 0; > + > + sdiodev = bus_if->bus_priv.sdio; > + > atomic_set(&sdiodev->suspend, true); > > if (sdiodev->wowl_enabled) { > @@ -1164,10 +1170,17 @@ static int brcmf_ops_sdio_suspend(struct device *dev) > static int brcmf_ops_sdio_resume(struct device *dev) > { > struct brcmf_bus *bus_if = dev_get_drvdata(dev); > - struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio; > + struct brcmf_sdio_dev *sdiodev; > + struct sdio_func *func = dev_to_sdio_func(dev); > > brcmf_dbg(SDIO, "Enter\n"); > - if (sdiodev->pdata&& sdiodev->pdata->oob_irq_supported) > + > + if (func->num == 2) > + return 0; > + > + sdiodev = bus_if->bus_priv.sdio; > + > + if (sdiodev->pdata->oob_irq_supported) > disable_irq_wake(sdiodev->pdata->oob_irq_nr); > brcmf_sdio_wd_timer(sdiodev->bus, BRCMF_WD_POLL_MS); > atomic_set(&sdiodev->suspend, false); > -- 1.7.1 >
| |