diff options
author | Zhang Rui <rui.zhang@intel.com> | 2013-03-26 23:36:10 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-05 08:18:25 -0400 |
commit | 08605acc7e3b7974e309d73ddf39ee9464d95e51 (patch) | |
tree | e187c794901d5a477a31bb632d74c63774cac88a /kernel/power/suspend.c | |
parent | d08d528dc1848fb369a0b27cdb0749d8f6f38063 (diff) |
PM / sleep: add TEST_PLATFORM support for freeze state
Invoke freeze_enter() after suspend_test(TEST_PLATFORM) being invoked.
So when setting /sys/power/pm_test to "platform", it can be used to
check if freeze state is working well after all devices are suspended
and before processors are blocked,
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'kernel/power/suspend.c')
-rw-r--r-- | kernel/power/suspend.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index d4feda084a3a..5eb30aab9b99 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c | |||
@@ -184,6 +184,9 @@ static int suspend_enter(suspend_state_t state, bool *wakeup) | |||
184 | goto Platform_wake; | 184 | goto Platform_wake; |
185 | } | 185 | } |
186 | 186 | ||
187 | if (suspend_test(TEST_PLATFORM)) | ||
188 | goto Platform_wake; | ||
189 | |||
187 | /* | 190 | /* |
188 | * PM_SUSPEND_FREEZE equals | 191 | * PM_SUSPEND_FREEZE equals |
189 | * frozen processes + suspended devices + idle processors. | 192 | * frozen processes + suspended devices + idle processors. |
@@ -195,9 +198,6 @@ static int suspend_enter(suspend_state_t state, bool *wakeup) | |||
195 | goto Platform_wake; | 198 | goto Platform_wake; |
196 | } | 199 | } |
197 | 200 | ||
198 | if (suspend_test(TEST_PLATFORM)) | ||
199 | goto Platform_wake; | ||
200 | |||
201 | error = disable_nonboot_cpus(); | 201 | error = disable_nonboot_cpus(); |
202 | if (error || suspend_test(TEST_CPUS)) | 202 | if (error || suspend_test(TEST_CPUS)) |
203 | goto Enable_cpus; | 203 | goto Enable_cpus; |