PM / wakeup: Adjust messaging for wake events during suspend

This adds in a new message to the wakeup code which adds an
indication to the log that suspend was cancelled due to a wake event
occouring during the suspend sequence. It also adjusts the message
printed in suspend.c to reflect the potential that a suspend was
aborted, as opposed to a device failing to suspend.

Without these message adjustments one can end up with a kernel log
that says that a device failed to suspend with no actual device
suspend failures, which can be confusing to the log examiner.

Signed-off-by: Bernie Thompson <bhthompson@chromium.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
index 79715e7fa43e34c9cbf9a4521a657d7bb952f9c6..407a2efa10bb1d7f50c89b4dc532878289b2e856 100644 (file)
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
@@ -707,8 +707,10 @@ bool pm_wakeup_pending(void)
        }
        spin_unlock_irqrestore(&events_lock, flags);
 
-       if (ret)
+       if (ret) {
+               pr_info("PM: Wakeup pending, aborting suspend\n");
                print_active_wakeup_sources();
+       }
 
        return ret;
 }

diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index bef86d121eb2ca5bcba2001a447f38e90476c5b5..ece04223bb1ebf99d08a1aa0aab99e14d0fbf994 100644 (file)
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -269,7 +269,7 @@ int suspend_devices_and_enter(suspend_state_t state)
        suspend_test_start();
        error = dpm_suspend_start(PMSG_SUSPEND);
        if (error) {
-               printk(KERN_ERR "PM: Some devices failed to suspend\n");
+               pr_err("PM: Some devices failed to suspend, or early wake event detected\n");
                goto Recover_platform;
        }
        suspend_test_finish("suspend devices");