From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: [PATCH] PM / wakeirq: report a wakeup_event on dedicated wekup irq Date: Mon, 13 Feb 2017 12:43:22 -0800 Message-ID: <20170213204322.27588-1-tony@atomide.com> Return-path: Sender: linux-kernel-owner@vger.kernel.org To: "Rafael J . Wysocki" , Alan Stern Cc: Brian Norris , Dmitry Torokhov , Greg Kroah-Hartman , Grygorii Strashko , Len Brown , Nishanth Menon , Pavel Machek , Ulf Hansson , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, Tero Kristo List-Id: linux-pm@vger.kernel.org From: Grygorii Strashko There are two reasons for reporting wakeup event when dedicated wakeup IRQ is triggered: - wakeup events accounting, so proper statistical data will be displayed in sysfs and debugfs; - there are small window when System is entering suspend during which dedicated wakeup IRQ can be lost: dpm_suspend_noirq() |- device_wakeup_arm_wake_irqs() |- dev_pm_arm_wake_irq(X) |- IRQ is enabled and marked as wakeup source [1]... |- suspend_device_irqs() |- suspend_device_irq(X) |- irqd_set(X, IRQD_WAKEUP_ARMED); |- wakup IRQ armed The wakeup IRQ can be lost if it's triggered at point [1] and not armed yet. Hence, fix above cases by adding simple pm_wakeup_event() call in handle_threaded_wake_irq(). Fixes: 4990d4fe327b ("PM / Wakeirq: Add automated device wake IRQ handling") Cc: Brian Norris Cc: Tero Kristo Signed-off-by: Grygorii Strashko Tested-by: Keerthy [tony@atomide.com: added missing return to avoid warnings] Tested-by: Tony Lindgren Signed-off-by: Tony Lindgren --- drivers/base/power/wakeirq.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/base/power/wakeirq.c b/drivers/base/power/wakeirq.c --- a/drivers/base/power/wakeirq.c +++ b/drivers/base/power/wakeirq.c @@ -141,6 +141,13 @@ static irqreturn_t handle_threaded_wake_irq(int irq, void *_wirq) struct wake_irq *wirq = _wirq; int res; + /* Maybe abort suspend? */ + if (irqd_is_wakeup_set(irq_get_irq_data(irq))) { + pm_wakeup_event(wirq->dev, 0); + + return IRQ_HANDLED; + } + /* We don't want RPM_ASYNC or RPM_NOWAIT here */ res = pm_runtime_resume(wirq->dev); if (res < 0) -- 2.11.1