PM: wakup: export wakeup irq when system aborts suspend
Subsystems (4)
PATCH 1/1 PM: wakup: export wakeup irq when system aborts suspend
When suspend is aborted because of an ARMED irq, we can not get any useful information about which irq is triggered.
Export the wakeup irq via suspend_resume trace event in this case.
--- drivers/base/power/wakeup.c | 1 + 1 file changed, 1 insertion(+)
drivers/base/power/wakeup.c +1 -0
@@ -875,6 +875,7 @@ void pm_system_irq_wakeup(unsigned int irq_number) {if (pm_wakeup_irq ==0 ) { pm_wakeup_irq = irq_number; +trace_suspend_resume (TPS ("irq_wakeup" ), irq_number, true);pm_system_wakeup (); } }
Signature · 1 line
2.7.4
Rafael J. Wysocki
maintainerQuoted 3 lines · Zhang Rui
When suspend is aborted because of an ARMED irq, we can not get any useful information about which irq is triggered.
That should be provided via the /sys/power/pm_wakeup_irq attribute.
Quoted 13 lines
Export the wakeup irq via
suspend_resumetrace event in this case.Signed-off-by Brandt, Todd E <[email protected]>Signed-off-by Zhang Rui <[email protected]>--- drivers/base/power/wakeup.c | 1 + 1 file changed, 1 insertion(+)drivers/base/power/wakeup.c +0
-0
drivers/base/power/wakeup.c void pm_system_irq_wakeup(unsigned int irq_number) · line 878
Quoted 4 lines
drivers/base/power/wakeup.c +1
-0@@ -875,6 +875,7 @@ void pm_system_irq_wakeup(unsigned int irq_number) {if (pm_wakeup_irq ==0 ) { pm_wakeup_irq = irq_number; +trace_suspend_resume (TPS ("irq_wakeup" ), irq_number, true);
pm_wakeup_irq can be read from /sys/power/pm_wakeup_irq, so why is it necessary to trace it additionally?
Quoted 4 lines
drivers/base/power/wakeup.c +0
-1pm_system_wakeup (); } } --
Quoted 8 lines · Rafael J. Wysocki
Quoted 4 lines · Zhang Rui
When suspend is aborted because of an ARMED irq, we can not get any useful information about which irq is triggered.
That should be provided via the
/sys/power/pm_wakeup_irqattribute.
another case is that,
say we got spurious wakeup interrupts in the idle loop, and then waked by a real wakeup interrupt, say, rtc. /sys/power/pm_wakeup_irq only shows the latest one, and we can not find out the spurious wakeup interrupts.
I should add this in the changelog as well.
thanks,
rui
Quoted 29 lines
Quoted 15 lines
Export the wakeup irq via
suspend_resumetrace event in this case.Signed-off-by Brandt, Todd E <[email protected]>Signed-off-by Zhang Rui <[email protected]>---
drivers/base/power/wakeup.c | 1 +1 file changed, 1 insertion(+)drivers/base/power/wakeup.c +0
-0drivers/base/power/wakeup.c void pm_system_irq_wakeup(unsigned int · line 880
Quoted 6 lines
drivers/base/power/wakeup.c +1
-0@@ -875,6 +875,7 @@ void pm_system_irq_wakeup(unsigned int irq_number) { if (pm_wakeup_irq == 0) { pm_wakeup_irq = irq_number; + trace_suspend_resume(TPS("irq_wakeup"), irq_number, true);
pm_wakeup_irqcan be read from/sys/power/pm_wakeup_irq, so why is it necessary to trace it additionally?Quoted 5 lines
drivers/base/power/wakeup.c +0
-0pm_system_wakeup();}
}
--
Rafael J. Wysocki
maintainerQuoted 6 lines · Zhang Rui
Quoted 4 lines · Rafael J. Wysocki
Quoted 2 lines · Zhang Rui
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
When suspend is aborted because of an ARMED irq, we can not get any useful information about which irq is triggered.
That should be provided via the
/sys/power/pm_wakeup_irqattribute.another case is that,
say we got spurious wakeup interrupts in the idle loop, and then waked by a real wakeup interrupt, say, rtc./sys/power/pm_wakeup_irqonly shows the latest one,
No it doesn't, it shows the *first* one.
Please look at the code: pm_wakeup_irq is only set when it is zero which is unless it has been set before.
Quoted 1 line
and we can not find out the spurious wakeup interrupts.
The wakeup interrupts that have occurred after the first one are not recorded, but your patch doesn't change that.
Your patch causes pm_wakeup_irq to be added to the trace only when it is set, but that is the /sys/power/pm_wakeup_irq which is my point.
Quoted 22 lines · Rafael J. Wysocki
Quoted 12 lines · Zhang Rui
Quoted 9 lines · Rafael J. Wysocki
Quoted 6 lines · Zhang Rui
When suspend is aborted because of an ARMED irq, we can not get any
useful information about which irq is triggered.Quoted 8 lines
Quoted 3 lines
That should be provided via the
/sys/power/pm_wakeup_irqattribute.another case is that,
say we got spurious wakeup interrupts in the idle loop, and then waked
by a real wakeup interrupt, say, rtc./sys/power/pm_wakeup_irqonly shows the latest one,
Quoted 5 lines
No it doesn't, it shows the *first* one.
Please look at the code:
pm_wakeup_irqis only set when it is zero which is unless it has been set before.
hmmm, by reading the code, pm_wakeup_clear() clears pm_wakeup_irq, and it is invoked inside the s2idle loop. So I think pm_wakeup_irq is cleared and set again if there is a second spurious interrupt.
Quoted 6 lines
Quoted 1 line
and we can not find out the spurious wakeup interrupts.
The wakeup interrupts that have occurred after the first one are not recorded, but your patch doesn't change that.
Your patch causes
pm_wakeup_irqto be added to the trace only when it is set, but that is the/sys/power/pm_wakeup_irqwhich is my point.
yes, the first case (suspend aborted) can be covered
by /sys/power/pm_wakeup_irq.
For the spurious wakeup case, I think I observed the behavior before, e.g, pm_wakeup_irq keeps on showing 9 because of spurious GPE, and then returns 8 because of RTC wakeup event. Anyway, let me do some experimental to confirm and get back to you then.
thanks,
rui
Rafael J. Wysocki
maintainerQuoted 24 lines · Zhang Rui
Quoted 22 lines · Rafael J. Wysocki
Quoted 20 lines · Zhang Rui
Quoted 6 lines · Rafael J. Wysocki
Quoted 3 lines · Zhang Rui
Quoted 6 lines
Quoted 3 lines
When suspend is aborted because of an ARMED irq, we can not get any
useful information about which irq is triggered.That should be provided via the
/sys/power/pm_wakeup_irqattribute.another case is that,
say we got spurious wakeup interrupts in the idle loop, and then waked
by a real wakeup interrupt, say, rtc./sys/power/pm_wakeup_irqonly shows the latest one,
Quoted 7 lines
Quoted 5 lines
No it doesn't, it shows the *first* one.
Please look at the code:
pm_wakeup_irqis only set when it is zero which is unless it has been set before.hmmm, by reading the code,
pm_wakeup_clear()clearspm_wakeup_irq, and it is invoked inside the s2idle loop. So I thinkpm_wakeup_irqis cleared and set again if there is a second spurious interrupt.
If that is a concern, I would suggest adding a debug printout to pm_wakeup_clear() to print the current value of pm_wakeup_irq before clearing it (if not zero already).