Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1658112

PM / Hibernation: Print wall time at hibernation entry and exit

Show all headers | View raw

Permits power state and battery life diagnosis.

Signed-off-by: Mark Salyzyn <salyzyn@android.com>
---
 kernel/power/hibernate.c | 2 ++
 kernel/power/power.h     | 1 +
 kernel/power/suspend.c   | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index a8b978c35a6a..0a8b7315d298 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -342,6 +342,7 @@ int hibernation_snapshot(int platform_mode)
 	pm_message_t msg;
 	int error;
 
+	pm_suspend_marker("entry hibernation");
 	pm_suspend_clear_flags();
 	error = platform_begin(platform_mode);
 	if (error)
@@ -409,6 +410,7 @@ int hibernation_snapshot(int platform_mode)
 	thaw_kernel_threads();
  Cleanup:
 	swsusp_free();
+	pm_suspend_marker("exit hibernation");
 	goto Close;
 }
 
diff --git a/kernel/power/power.h b/kernel/power/power.h
index 7fdc40d31b7d..08f63ae27a31 100644
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
@@ -194,6 +194,7 @@ extern const char *pm_states[];
 extern const char *mem_sleep_states[];
 extern suspend_state_t mem_sleep_current;
 
+extern void pm_suspend_marker(const char *annotation);
 extern int suspend_devices_and_enter(suspend_state_t state);
 #else /* !CONFIG_SUSPEND */
 #define mem_sleep_current	PM_SUSPEND_ON
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index 464175f04bc5..69da2b880bde 100644
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -564,7 +564,7 @@ static int enter_state(suspend_state_t state)
 	return error;
 }
 
-static void pm_suspend_marker(char *annotation)
+void pm_suspend_marker(const char *annotation)
 {
 	struct timespec ts;
 	struct rtc_time tm;
-- 
2.13.0.506.g27d5fe0cd-goog

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

PM / Suspend: Print wall time at suspend entry and exit Mark Salyzyn <salyzyn@android.com> - 2017-06-05 21:40 +0200
  PM / Hibernation: Print wall time at hibernation entry and exit Mark Salyzyn <salyzyn@android.com> - 2017-06-05 21:40 +0200
  Re: PM / Suspend: Print wall time at suspend entry and exit Pavel Machek <pavel@ucw.cz> - 2017-06-05 22:10 +0200
  Re: PM / Suspend: Print wall time at suspend entry and exit "Rafael J. Wysocki" <rafael@kernel.org> - 2017-06-05 23:00 +0200
    Re: PM / Suspend: Print wall time at suspend entry and exit Pavel Machek <pavel@ucw.cz> - 2017-06-05 23:20 +0200
      Re: PM / Suspend: Print wall time at suspend entry and exit Mark Salyzyn <salyzyn@android.com> - 2017-06-05 23:50 +0200
        Re: PM / Suspend: Print wall time at suspend entry and exit Mark Salyzyn <salyzyn@android.com> - 2017-06-06 00:20 +0200
          Re: PM / Suspend: Print wall time at suspend entry and exit Pavel Machek <pavel@ucw.cz> - 2017-06-06 00:50 +0200
            Re: PM / Suspend: Print wall time at suspend entry and exit Mark Salyzyn <salyzyn@android.com> - 2017-06-06 20:10 +0200

csiph-web