Skip to contentSkip to conversation

Patch "PM / wakeirq: report a wakeup_event on dedicated wekup irq" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Nov 6, 2017

Subsystems (5)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

PM / wakeirq: report a wakeup_event on dedicated wekup irq

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
pm-wakeirq-report-a-wakeup_event-on-dedicated-wekup-irq.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Mon Nov 6 10:07:35 CET 2017

From: Grygorii Strashko <[email protected]>
Date: Sat, 7 Oct 2017 22:36:47 +0000
Subject: PM / wakeirq: report a wakeup_event on dedicated wekup irq

From: Grygorii Strashko <[email protected]>

[ Upstream commit 09bb6e93956ae5175b96905b723ec879c3ca0765 ]

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)
[ [email protected]: added missing return to avoid warnings ]
---
 drivers/base/power/wakeirq.c |    7 +++++++
 1 file changed, 7 insertions(+)
drivers/base/power/wakeirq.c +7 -0
@@ -141,6 +141,13 @@ static irqreturn_t handle_threaded_wake_
 	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)

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/pm-wakeirq-report-a-wakeup_event-on-dedicated-wekup-irq.patch