| Message ID | 1475613462-93384-1-git-send-email-rajatja@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | df566a481ee8fb4ce90c1d498bc8fab5c0ec887a |
| Delegated to: | Kalle Valo |
| Headers | show |
Rajat Jain <rajatja@google.com> wrote: > Register the WLAN device as a wakeup source since it can > wake the system via wake-on-wireless-lan. In an actual wowlan > event, notify the PM core that we are the current wakeup source. > This allows the PM core to update the wakeup attributes in /sys. > > This was causing wakeup issues on chromeos as the system was > apparently confused about the wakeup source. > > Signed-off-by: Wei-Ning Huang <wnhuang@google.com> > Signed-off-by: Rajat Jain <rajatja@google.com> > Tested-by: Wei-Ning Huang <wnhuang@chromium.org> > Reviewed-by: Eric Caruso <ejcaruso@chromium.org> > Acked-by: Amitkumar Karwar <akarwar@marvell.com> Patch applied to wireless-drivers-next.git, thanks. df566a481ee8 mwifiex: report wakeup for wowlan
diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c index d3e1561..a5f63e4 100644 --- a/drivers/net/wireless/marvell/mwifiex/sdio.c +++ b/drivers/net/wireless/marvell/mwifiex/sdio.c @@ -89,6 +89,9 @@ static irqreturn_t mwifiex_wake_irq_wifi(int irq, void *priv) disable_irq_nosync(irq); } + /* Notify PM core we are wakeup source */ + pm_wakeup_event(cfg->dev, 0); + return IRQ_HANDLED; } @@ -112,6 +115,7 @@ static int mwifiex_sdio_probe_of(struct device *dev, struct sdio_mmc_card *card) GFP_KERNEL); cfg = card->plt_wake_cfg; if (cfg && card->plt_of_node) { + cfg->dev = dev; cfg->irq_wifi = irq_of_parse_and_map(card->plt_of_node, 0); if (!cfg->irq_wifi) { dev_dbg(dev, @@ -130,6 +134,10 @@ static int mwifiex_sdio_probe_of(struct device *dev, struct sdio_mmc_card *card) } } + ret = device_init_wakeup(dev, true); + if (ret) + dev_err(dev, "fail to init wakeup for mwifiex"); + return 0; } diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.h b/drivers/net/wireless/marvell/mwifiex/sdio.h index db837f1..07cdd23 100644 --- a/drivers/net/wireless/marvell/mwifiex/sdio.h +++ b/drivers/net/wireless/marvell/mwifiex/sdio.h @@ -155,6 +155,7 @@ } while (0) struct mwifiex_plt_wake_cfg { + struct device *dev; int irq_wifi; bool wake_by_wifi; };