Skip to content

Commit

Permalink
PM / Sleep: Print last wakeup source on failed wakeup_count write
Browse files Browse the repository at this point in the history
Commit a938da0 introduced a useful little log message to tell
users/debuggers which wakeup source aborted a suspend.  However,
this message is only printed if the abort happens during the
in-kernel suspend path (after writing /sys/power/state).

The full specification of the /sys/power/wakeup_count facility
allows user-space power managers to double-check if wakeups have
already happened before it actually tries to suspend (e.g. while it
was running user-space pre-suspend hooks), by writing the last known
wakeup_count value to /sys/power/wakeup_count.  This patch changes
the sysfs handler for that node to also print said log message if
that write fails, so that we can figure out the offending wakeup
source for both kinds of suspend aborts.

Signed-off-by: Julius Werner <[email protected]>
Signed-off-by: Rafael J. Wysocki <[email protected]>
  • Loading branch information
jwerner-chromium authored and rafaeljw committed Jun 20, 2013
1 parent d24c2a4 commit bb177fe
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/base/power/wakeup.c
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ void pm_wakeup_event(struct device *dev, unsigned int msec)
}
EXPORT_SYMBOL_GPL(pm_wakeup_event);

static void print_active_wakeup_sources(void)
void pm_print_active_wakeup_sources(void)
{
struct wakeup_source *ws;
int active = 0;
Expand All @@ -683,6 +683,7 @@ static void print_active_wakeup_sources(void)
last_activity_ws->name);
rcu_read_unlock();
}
EXPORT_SYMBOL_GPL(pm_print_active_wakeup_sources);

/**
* pm_wakeup_pending - Check if power transition in progress should be aborted.
Expand All @@ -709,7 +710,7 @@ bool pm_wakeup_pending(void)

if (ret) {
pr_info("PM: Wakeup pending, aborting suspend\n");
print_active_wakeup_sources();
pm_print_active_wakeup_sources();
}

return ret;
Expand Down
1 change: 1 addition & 0 deletions include/linux/suspend.h
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@ extern bool pm_wakeup_pending(void);
extern bool pm_get_wakeup_count(unsigned int *count, bool block);
extern bool pm_save_wakeup_count(unsigned int count);
extern void pm_wakep_autosleep_enabled(bool set);
extern void pm_print_active_wakeup_sources(void);

static inline void lock_system_sleep(void)
{
Expand Down
2 changes: 2 additions & 0 deletions kernel/power/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,8 @@ static ssize_t wakeup_count_store(struct kobject *kobj,
if (sscanf(buf, "%u", &val) == 1) {
if (pm_save_wakeup_count(val))
error = n;
else
pm_print_active_wakeup_sources();
}

out:
Expand Down

0 comments on commit bb177fe

Please sign in to comment.