Report interrupt(s) that caused system wakeup
Subsystems (5)
A message that is not in the archive (sent off-list or not yet received): [PATCH V6] Report interrupt(s) that caused system wakeup
PATCH v6 1/1 Report interrupt(s) that caused system wakeup
From: ayates1 <[email protected]>
Hi Rafael,
The current patch reflects the changes requested by Thomas Gleixner.
Please accept my patch.
Thank you,
Alexandra.
Alexandra Yates (1):
Report interrupt(s) that caused system wakeup
Documentation/ABI/testing/sysfs-power | 11 +++++++++++ drivers/base/power/wakeup.c | 33 ++++++++++++++++++++++++++++++++- include/linux/suspend.h | 5 +++-- kernel/irq/pm.c | 2 +- kernel/power/main.c | 23 +++++++++++++++++++++++ 5 files changed, 70 insertions(+), 4 deletions(-)
Signature · 1 line
1.9.1
PATCH v6 1/1 Report interrupt(s) that caused system wakeup
This feature reports which IRQs cause the system to wakeup from sleep last time it was suspended.
It adds a new sysfs attribute under /sys/power/ named: pm_last_wakeup_irqs when read, will return a list of IRQs that caused the system to wakeup. That will be useful for system wakeup diagnostics.
--- Documentation/ABI/testing/sysfs-power | 11 +++++++++++ drivers/base/power/wakeup.c | 33 ++++++++++++++++++++++++++++++++- include/linux/suspend.h | 5 +++-- kernel/irq/pm.c | 2 +- kernel/power/main.c | 23 +++++++++++++++++++++++ 5 files changed, 70 insertions(+), 4 deletions(-)
Documentation/ABI/testing/sysfs-power +11 -0
@@ -256,3 +256,14 @@ Description: Writing a "1" enables this printing while writing a "0" disables it. The default value is "0". Reading from this file will display the current value. + +What: /sys/power/pm_last_wakeup_irqs +Date: April 2015 +Contact: Alexandra Yates <[email protected]> +Description: + The /sys/power/pm_last_wakeup_irqs file allows user space + to identify and report the IRQs responsible for waking the + system up from sleep. The IRQD_WAKEUP_TRIGGERED flag is set and + reported when the given IRQ fires after it has been armed for + system wakeup. This output is useful for system wakeup + diagnostics.
drivers/base/power/wakeup.c +32 -1
@@ -28,6 +28,9 @@ bool events_check_enabled __read_mostly;/* If set and the system is suspending, terminate the suspend. */ static bool pm_abort_suspend__read_mostly ; +/* IRQ number which causes system wakeup */ +static unsigned int wakeup_irq; +/* * Combined counters of registered wakeup events and wakeup events in progress. * They need to be modified together atomically, so it's better to use one
@@ -858,8 +861,9 @@ bool pm_wakeup_pending(void)return ret || pm_abort_suspend; } -void pm_system_wakeup (void ) +void pm_system_irq_wakeup (unsigned int irq_number) { + wakeup_irq = irq_number; pm_abort_suspend = true;freeze_wake (); }
@@ -870,6 +874,33 @@ void pm_wakeup_clear(void) pm_abort_suspend = false; } +#ifdef CONFIG_PM_SLEEP_DEBUG +/* +* pm_get_last_wakeup_irqs - gets interrupt number that +* caused the system to wake up from suspend-to-idle. +* @buf: keeps track of the irqs that casued the system to wakeup +*/ +ssize_t pm_get_last_wakeup_irqs (char *buf,size_t size) +{ +char *str = buf; +char *end = buf + size; + +if (!pm_abort_suspend) +return 0 ; + +/* If pm_abort_suspend is not set, the previous suspend was aborted +* before arming the wakeup IRQs, so avoid printing stale information +* in that case. +*/ + str +=scnprintf (str, end - str,"%d " , wakeup_irq); + +if (str != buf) + str--; + +return (str - buf); +} +#endif /* CONFIG_PM_SLEEP_DEBUG */ +/** * pm_get_wakeup_count - Read the number of registered wakeup events. * @count: Address to store the value at.
include/linux/suspend.h +3 -2
@@ -378,6 +378,7 @@ void restore_processor_state(void);/* kernel/power/main.c */ extern int register_pm_notifier (struct notifier_block *nb);extern int unregister_pm_notifier (struct notifier_block *nb); +extern ssize_t pm_get_last_wakeup_irqs (char *buf,size_t size);#define pm_notifier (fn, pri) { \ static struct notifier_block fn##_nb = \
@@ -389,7 +390,7 @@ extern int unregister_pm_notifier(struct notifier_block *nb);extern bool events_check_enabled;extern bool pm_wakeup_pending (void ); -extern void pm_system_wakeup (void ); +extern void pm_system_irq_wakeup (unsigned int );extern void pm_wakeup_clear (void );extern bool pm_get_wakeup_count (unsigned int *count,bool block);extern bool pm_save_wakeup_count (unsigned int count);
@@ -438,7 +439,7 @@ static inline int unregister_pm_notifier(struct notifier_block *nb)#define pm_notifier (fn, pri) do { (void)(fn); } while (0)static inline bool pm_wakeup_pending (void ) {return false; } -static inline void pm_system_wakeup (void ) {} +static inline void pm_system_irq_wakeup (unsigned int ) {}static inline void pm_wakeup_clear (void ) {}static inline void lock_system_sleep (void ) {}
kernel/irq/pm.c +1 -1
@@ -21,7 +21,7 @@ bool irq_pm_check_wakeup(struct irq_desc *desc) desc->istate |=IRQS_SUSPENDED |IRQS_PENDING ; desc->depth++;irq_disable (desc); -pm_system_wakeup (); +pm_system_irq_wakeup (irq_desc_get_irq (desc));return true; }return false;
kernel/power/main.c +23 -0
@@ -272,6 +272,28 @@ static inline void pm_print_times_init(void) { pm_print_times_enabled = !!initcall_debug; } + +static ssize_t pm_last_wakeup_irqs_show (struct kobject *kobj, +struct kobj_attribute *attr, +char *buf) +{ +size_t ret; + + ret =pm_get_last_wakeup_irqs (buf,PAGE_SIZE ); +if (ret) + buf[ret++] ='\n' ; + +return ret; +} + +static ssize_t pm_last_wakeup_irqs_store (struct kobject *kobj, +struct kobj_attribute *attr, +const char *buf,size_t n) +{ +return -EINVAL ; +} +power_attr (pm_last_wakeup_irqs); +#else /* !CONFIG_PM_SLEEP_DEBUG */ static inline void pm_print_times_init (void ) {}#endif /* CONFIG_PM_SLEEP_DEBUG */
@@ -604,6 +626,7 @@ static struct attribute * g[] = {#endif #ifdef CONFIG_PM_SLEEP_DEBUG &pm_print_times_attr.attr, + &pm_last_wakeup_irqs_attr.attr,#endif #endif #ifdef CONFIG_FREEZER
Signature · 1 line
1.9.1
Quoted 21 lines · Alexandra Yates
This feature reports which IRQs cause the system to wakeup from sleep last time it was suspended.
It adds a new sysfs attribute under
/sys/power/named:pm_last_wakeup_irqswhen read, will return a list of IRQs that caused the system to wakeup. That will be useful for system wakeup diagnostics.Signed-off-by Alexandra Yates <[email protected]>--- Documentation/ABI/testing/sysfs-power | 11 +++++++++++ drivers/base/power/wakeup.c | 33 ++++++++++++++++++++++++++++++++- include/linux/suspend.h | 5 +++-- kernel/irq/pm.c | 2 +- kernel/power/main.c | 23 +++++++++++++++++++++++ 5 files changed, 70 insertions(+), 4 deletions(-)Documentation/ABI/testing/sysfs-power +0
-0
Documentation/ABI/testing/sysfs-power Description: · line 260
Quoted 5 lines
Documentation/ABI/testing/sysfs-power +2
-0@@ -256,3 +256,14 @@ Description: Writing a "1" enables this printing while writing a "0" disables it. The default value is "0". Reading from this file will display the current value. + +What: /sys/power/pm_last_wakeup_irqs
There will be only one now, so I'll call it simply "pm_wakeup_irq".
Quoted 24 lines
Documentation/ABI/testing/sysfs-power +9
-0+Date: April 2015 +Contact: Alexandra Yates <[email protected]> +Description: + The /sys/power/pm_last_wakeup_irqs file allows user space + to identify and report the IRQs responsible for waking the + system up from sleep. The IRQD_WAKEUP_TRIGGERED flag is set and + reported when the given IRQ fires after it has been armed for + system wakeup. This output is useful for system wakeup + diagnostics.drivers/base/power/wakeup.c +3
-0@@ -28,6 +28,9 @@ bool events_check_enabled __read_mostly;/* If set and the system is suspending, terminate the suspend. */ static bool pm_abort_suspend__read_mostly ; +/* IRQ number which causes system wakeup */ +static unsigned int wakeup_irq; +/* * Combined counters of registered wakeup events and wakeup events in progress. * They need to be modified together atomically, so it's better to use one
drivers/base/power/wakeup.c bool pm_wakeup_pending(void) · line 861
Quoted 4 lines
drivers/base/power/wakeup.c +0
-1@@ -858,8 +861,9 @@ bool pm_wakeup_pending(void)return ret || pm_abort_suspend; } -void pm_system_wakeup (void )
You can't replace pm_system_wakeup() with the new thing, because it is used beyond the IRQ subsystem. You can make pm_system_irq_wakeup() call pm_system_wakeup().
Quoted 19 lines
drivers/base/power/wakeup.c +11
-0+void pm_system_irq_wakeup (unsigned int irq_number) { + wakeup_irq = irq_number; pm_abort_suspend = true;freeze_wake (); }@@ -870,6 +874,33 @@ void pm_wakeup_clear(void) pm_abort_suspend = false; } +#ifdef CONFIG_PM_SLEEP_DEBUG +/* +* pm_get_last_wakeup_irqs - gets interrupt number that +* caused the system to wake up from suspend-to-idle. +* @buf: keeps track of the irqs that casued the system to wakeup +*/ +ssize_t pm_get_last_wakeup_irqs (char *buf,size_t size) +{ +char *str = buf;
drivers/base/power/wakeup.c void pm_wakeup_clear(void) · line 895
Quoted 10 lines
drivers/base/power/wakeup.c +10
-0+char *end = buf + size; + +if (!pm_abort_suspend) +return 0 ; + +/* If pm_abort_suspend is not set, the previous suspend was aborted +* before arming the wakeup IRQs, so avoid printing stale information +* in that case. +*/ + str +=scnprintf (str, end - str,"%d " , wakeup_irq);
Why do we need the extra space?
Why do we need str? It should be sufficient to do
return pm_abort_suspend ? scnprintf(str, size, "%u", wakeup_irq) : 0;
as the whole function body, shouldn't it?
But I think it would be cleaner to simply make wakeup_irq extern and read it from main.c instead of doing this here.
Quoted 89 lines
drivers/base/power/wakeup.c +8
-0+ +if (str != buf) + str--; + + return (str - buf); +} +#endif /* CONFIG_PM_SLEEP_DEBUG */ +/** * pm_get_wakeup_count - Read the number of registered wakeup events. * @count: Address to store the value at. include/linux/suspend.h +3
-2@@ -378,6 +378,7 @@ void restore_processor_state(void);/* kernel/power/main.c */ extern int register_pm_notifier (struct notifier_block *nb);extern int unregister_pm_notifier (struct notifier_block *nb); +extern ssize_t pm_get_last_wakeup_irqs (char *buf,size_t size);#define pm_notifier (fn, pri) { \ static struct notifier_block fn##_nb = \@@ -389,7 +390,7 @@ extern int unregister_pm_notifier(struct notifier_block *nb);extern bool events_check_enabled;extern bool pm_wakeup_pending (void ); -extern void pm_system_wakeup (void ); +extern void pm_system_irq_wakeup (unsigned int );extern void pm_wakeup_clear (void );extern bool pm_get_wakeup_count (unsigned int *count,bool block);extern bool pm_save_wakeup_count (unsigned int count);@@ -438,7 +439,7 @@ static inline int unregister_pm_notifier(struct notifier_block *nb)#define pm_notifier (fn, pri) do { (void)(fn); } while (0)static inline bool pm_wakeup_pending (void ) {return false; } -static inline void pm_system_wakeup (void ) {} +static inline void pm_system_irq_wakeup (unsigned int ) {}static inline void pm_wakeup_clear (void ) {}static inline void lock_system_sleep (void ) {}kernel/irq/pm.c +1
-1@@ -21,7 +21,7 @@ bool irq_pm_check_wakeup(struct irq_desc *desc) desc->istate |=IRQS_SUSPENDED |IRQS_PENDING ; desc->depth++;irq_disable (desc); -pm_system_wakeup (); +pm_system_irq_wakeup (irq_desc_get_irq (desc));return true; }return false;kernel/power/main.c +22
-0@@ -272,6 +272,28 @@ static inline void pm_print_times_init(void) { pm_print_times_enabled = !!initcall_debug; } + +static ssize_t pm_last_wakeup_irqs_show (struct kobject *kobj, +struct kobj_attribute *attr, +char *buf) +{ +size_t ret; + + ret =pm_get_last_wakeup_irqs (buf,PAGE_SIZE ); +if (ret) + buf[ret++] ='\n' ; + +return ret; +} + +static ssize_t pm_last_wakeup_irqs_store (struct kobject *kobj, +struct kobj_attribute *attr, +const char *buf,size_t n) +{ +return -EINVAL ; +} +power_attr (pm_last_wakeup_irqs); +#else /* !CONFIG_PM_SLEEP_DEBUG */ static inline void pm_print_times_init (void ) {}#endif /* CONFIG_PM_SLEEP_DEBUG */
kernel/power/main.c static struct attribute * g[] = { · line 632
Quoted 7 lines
kernel/power/main.c +1
-0@@ -604,6 +626,7 @@ static struct attribute * g[] = {#endif #ifdef CONFIG_PM_SLEEP_DEBUG &pm_print_times_attr.attr, + &pm_last_wakeup_irqs_attr.attr,#endif #endif #ifdef CONFIG_FREEZER
Thanks,
Rafael
Quoted 3 lines · Rafael J. Wysocki
Quoted 2 lines · Alexandra Yates
This feature reports which IRQs cause the system to wakeup from sleep last time it was suspended.
A minor complaint... This doesn't actually report which IRQs caused the system to wake up. In reality, it reports all the wakeup-enabled IRQs that have occurred since the system went to sleep. _One_ of those IRQs was responsible for waking the system up, but the others weren't.
In fact, even that previous sentence need not be true. If a wakeup-enabled IRQ occurs at the right point during a system sleep transition, it can cause the entire transition to be aborted. The sleep returns to normal operation without ever going fully to sleep.
Thus, it would be more accurate to say above that one of those IRQs was responsible for waking the system up or preventing the system from going to sleep.
Alan Stern
Quoted 9 lines · Alan Stern
Quoted 3 lines · Rafael J. Wysocki
Quoted 2 lines · Alexandra Yates
This feature reports which IRQs cause the system to wakeup from sleep last time it was suspended.
A minor complaint... This doesn't actually report which IRQs caused the system to wake up. In reality, it reports all the wakeup-enabled IRQs that have occurred since the system went to sleep.
The current version of the patch reports the last one to be precisie. It should report the first one though I think.
Quoted 11 lines
_One_ of those IRQs was responsible for waking the system up, but the others weren't.
In fact, even that previous sentence need not be true. If a wakeup-enabled IRQ occurs at the right point during a system sleep transition, it can cause the entire transition to be aborted. The sleep returns to normal operation without ever going fully to sleep.
Thus, it would be more accurate to say above that one of those IRQs was responsible for waking the system up or preventing the system from going to sleep.
Right.
Thanks,
Rafael
Quoted 63 lines · Rafael J. Wysocki
Quoted 21 lines · Alexandra Yates
This feature reports which IRQs cause the system to wakeup from sleep last time it was suspended.
It adds a new sysfs attribute under
/sys/power/named:pm_last_wakeup_irqswhen read, will return a list of IRQs that caused the system to wakeup. That will be useful for system wakeup diagnostics.Signed-off-by Alexandra Yates <[email protected]>--- Documentation/ABI/testing/sysfs-power | 11 +++++++++++ drivers/base/power/wakeup.c | 33 ++++++++++++++++++++++++++++++++- include/linux/suspend.h | 5 +++-- kernel/irq/pm.c | 2 +- kernel/power/main.c | 23 +++++++++++++++++++++++ 5 files changed, 70 insertions(+), 4 deletions(-)Documentation/ABI/testing/sysfs-power +0
-0Documentation/ABI/testing/sysfs-power Description: · line 260
Quoted 5 lines
Documentation/ABI/testing/sysfs-power +2
-0@@ -256,3 +256,14 @@ Description: Writing a "1" enables this printing while writing a "0" disables it. The default value is "0". Reading from this file will display the current value. + +What: /sys/power/pm_last_wakeup_irqsThere will be only one now, so I'll call it simply "
pm_wakeup_irq".Quoted 24 lines
Documentation/ABI/testing/sysfs-power +9
-0+Date: April 2015 +Contact: Alexandra Yates <[email protected]> +Description: + The /sys/power/pm_last_wakeup_irqs file allows user space + to identify and report the IRQs responsible for waking the + system up from sleep. The IRQD_WAKEUP_TRIGGERED flag is set and + reported when the given IRQ fires after it has been armed for + system wakeup. This output is useful for system wakeup + diagnostics.drivers/base/power/wakeup.c +3
-0@@ -28,6 +28,9 @@ bool events_check_enabled __read_mostly;/* If set and the system is suspending, terminate the suspend. */ static bool pm_abort_suspend__read_mostly ; +/* IRQ number which causes system wakeup */ +static unsigned int wakeup_irq; +/* * Combined counters of registered wakeup events and wakeup events in progress. * They need to be modified together atomically, so it's better to use one drivers/base/power/wakeup.c bool pm_wakeup_pending(void) · line 861
Quoted 4 lines
drivers/base/power/wakeup.c +0
-1@@ -858,8 +861,9 @@ bool pm_wakeup_pending(void)return ret || pm_abort_suspend; } -void pm_system_wakeup (void )You can't replace
pm_system_wakeup()with the new thing, because it is used beyond the IRQ subsystem. You can makepm_system_irq_wakeup()callpm_system_wakeup().
Quoted 6 lines
drivers/base/power/wakeup.c bool pm_wakeup_pending(void) · line 869
Quoted 6 lines
drivers/base/power/wakeup.c +2
-0+void pm_system_irq_wakeup (unsigned int irq_number) { + wakeup_irq = irq_number; pm_abort_suspend = true;freeze_wake (); }
One more point.
We need this to register the first wakeup interrupt and ignore the next ones, but this code will simply register the last wakeup interrupt during the cycle.
Thanks,
Rafael
Hi,
Quoted 74 lines · Rafael J. Wysocki
Quoted 61 lines · Rafael J. Wysocki
Quoted 21 lines · Alexandra Yates
This feature reports which IRQs cause the system to wakeup from sleep last time it was suspended.
It adds a new sysfs attribute under
/sys/power/named:pm_last_wakeup_irqswhen read, will return a list of IRQs that caused the system to wakeup. That will be useful for system wakeup diagnostics.Signed-off-by Alexandra Yates <[email protected]>--- Documentation/ABI/testing/sysfs-power | 11 +++++++++++ drivers/base/power/wakeup.c | 33 ++++++++++++++++++++++++++++++++- include/linux/suspend.h | 5 +++-- kernel/irq/pm.c | 2 +- kernel/power/main.c | 23 +++++++++++++++++++++++ 5 files changed, 70 insertions(+), 4 deletions(-)Documentation/ABI/testing/sysfs-power +0
-0Documentation/ABI/testing/sysfs-power Description: · line 260
Quoted 5 lines
Documentation/ABI/testing/sysfs-power +2
-0@@ -256,3 +256,14 @@ Description: Writing a "1" enables this printing while writing a "0" disables it. The default value is "0". Reading from this file will display the current value. + +What: /sys/power/pm_last_wakeup_irqsThere will be only one now, so I'll call it simply "
pm_wakeup_irq".Quoted 24 lines
Documentation/ABI/testing/sysfs-power +9
-0+Date: April 2015 +Contact: Alexandra Yates <[email protected]> +Description: + The /sys/power/pm_last_wakeup_irqs file allows user space + to identify and report the IRQs responsible for waking the + system up from sleep. The IRQD_WAKEUP_TRIGGERED flag is set and + reported when the given IRQ fires after it has been armed for + system wakeup. This output is useful for system wakeup + diagnostics.drivers/base/power/wakeup.c +3
-0@@ -28,6 +28,9 @@ bool events_check_enabled __read_mostly;/* If set and the system is suspending, terminate the suspend. */ static bool pm_abort_suspend__read_mostly ; +/* IRQ number which causes system wakeup */ +static unsigned int wakeup_irq; +/* * Combined counters of registered wakeup events and wakeup events in progress. * They need to be modified together atomically, so it's better to use one drivers/base/power/wakeup.c bool pm_wakeup_pending(void) · line 861
Quoted 4 lines
drivers/base/power/wakeup.c +0
-1@@ -858,8 +861,9 @@ bool pm_wakeup_pending(void)return ret || pm_abort_suspend; } -void pm_system_wakeup (void )You can't replace
pm_system_wakeup()with the new thing, because it is used beyond the IRQ subsystem. You can makepm_system_irq_wakeup()callpm_system_wakeup().Quoted 6 lines
drivers/base/power/wakeup.c bool pm_wakeup_pending(void) · line 869
Quoted 6 lines
drivers/base/power/wakeup.c +2
-0+void pm_system_irq_wakeup (unsigned int irq_number) { + wakeup_irq = irq_number; pm_abort_suspend = true;freeze_wake (); }One more point.
We need this to register the first wakeup interrupt and ignore the next ones, but this code will simply register the last wakeup interrupt during the cycle.
Quoted 8 lines
Thanks,
Rafael--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Just sent patch V7. It includes changes for the feedback received from Rafael, Alan, Thomas and Yan.
Thank you all for your review. Rafael. Please accept V7 of the patch.
Signature · 2 lines
Thank you, <Alexandra>
Quoted 7 lines · Alexandra Yates
From: ayates1 <[email protected]>
Hi Rafael,
The current patch reflects the changes requested by Thomas Gleixner.
Please accept my patch.
-ENOPATCH