| Message ID | 1487917471-5501-3-git-send-email-jeffy.chen@rock-chips.com |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
Jeffy Chen <jeffy.chen@rock-chips.com> writes: > Currrently we are disabling this wake irq after receiving it. If this > happens before we finish suspend and the pm event check is disabled, > the system will continue suspending, and this irq would not work again. > > We may need to abort system suspend to avoid that. > > Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> I only see patch 3 in patchwork. Where are patches 1 and 2?
Hi Kalle, On 02/24/2017 07:01 PM, Kalle Valo wrote: > Jeffy Chen <jeffy.chen@rock-chips.com> writes: > >> Currrently we are disabling this wake irq after receiving it. If this >> happens before we finish suspend and the pm event check is disabled, >> the system will continue suspending, and this irq would not work again. >> >> We may need to abort system suspend to avoid that. >> >> Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> > I only see patch 3 in patchwork. Where are patches 1 and 2? > the other two are much like this one, but for bluetooth :) please check: https://patchwork.kernel.org/patch/9589455 New [1/3] btusb: wake system up when receives a wake irq https://patchwork.kernel.org/patch/9589453 New [2/3] btmrvl: wake system up when receives a wake irq https://patchwork.kernel.org/patch/9589457 New [3/3] mwifiex: wake system up when receives a wake irq (sorry, this is a resent mail, because the last one was rejected due to wrong format)
Jeffy Chen <jeffy.chen@rock-chips.com> wrote: > Currrently we are disabling this wake irq after receiving it. If this > happens before we finish suspend and the pm event check is disabled, > the system will continue suspending, and this irq would not work again. > > We may need to abort system suspend to avoid that. > > Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> Patch applied to wireless-drivers-next.git, thanks. ef7e07147425 mwifiex: wake system up when receives a wake irq
diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c index 5ebca1d..30f4994 100644 --- a/drivers/net/wireless/marvell/mwifiex/main.c +++ b/drivers/net/wireless/marvell/mwifiex/main.c @@ -17,6 +17,8 @@ * this warranty disclaimer. */ +#include <linux/suspend.h> + #include "main.h" #include "wmm.h" #include "cfg80211.h" @@ -1509,6 +1511,7 @@ static irqreturn_t mwifiex_irq_wakeup_handler(int irq, void *priv) /* Notify PM core we are wakeup source */ pm_wakeup_event(adapter->dev, 0); + pm_system_wakeup(); return IRQ_HANDLED; }
Currrently we are disabling this wake irq after receiving it. If this happens before we finish suspend and the pm event check is disabled, the system will continue suspending, and this irq would not work again. We may need to abort system suspend to avoid that. Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> --- drivers/net/wireless/marvell/mwifiex/main.c | 3 +++ 1 file changed, 3 insertions(+)