| Message ID | 1474995052-122337-1-git-send-email-rajatja@google.com |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
Please ignore, not sure why this landed without a subject. On Tue, Sep 27, 2016 at 9:50 AM, Rajat Jain <rajatja@google.com> wrote: > From: Wei-Ning Huang <wnhuang@google.com> > > Date: Thu, 17 Mar 2016 11:43:16 +0800 > Subject: [PATCH] mwifiex: report wakeup for wowlan > > Enable notifying wakeup source to the PM core. This allow darkresume to > correctly track wakeup source and mark mwifiex_plt as 'automatic' 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> > --- > drivers/net/wireless/marvell/mwifiex/sdio.c | 8 ++++++++ > drivers/net/wireless/marvell/mwifiex/sdio.h | 1 + > 2 files changed, 9 insertions(+) > > 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; > }; > -- > 2.8.0.rc3.226.g39d4020 >
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; };