PM / sleep: invalidate TEST_CPUS and TEST_CORE support for freeze state

freeze state is a software suspend state that does not run into
low-level platform callbacks which may interact with BIOS.
And freeze state does not need to disable the processors.

But the current pm_test support misleads users because users
can enter freeze state with pm_test set to TEST_CPUS/TEST_CORE,
while this pm_test setting never takes actions.

So, invalidate TEST_CPUS/TEST_CORE for freeze state in this patch.
Then users will get an error instead, when trying to
enter freeze state with pm_test mode set to TEST_CPUS/TEST_CORE.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index 5eb30aab9b99d2d4ef5327e2b65b8c7f28fd40c7..bef86d121eb2ca5bcba2001a447f38e90476c5b5 100644 (file)
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -76,8 +76,20 @@ EXPORT_SYMBOL_GPL(suspend_set_ops);
 
 bool valid_state(suspend_state_t state)
 {
-       if (state == PM_SUSPEND_FREEZE)
-               return true;
+       if (state == PM_SUSPEND_FREEZE) {
+#ifdef CONFIG_PM_DEBUG
+               if (pm_test_level != TEST_NONE &&
+                   pm_test_level != TEST_FREEZER &&
+                   pm_test_level != TEST_DEVICES &&
+                   pm_test_level != TEST_PLATFORM) {
+                       printk(KERN_WARNING "Unsupported pm_test mode for "
+                                       "freeze state, please choose "
+                                       "none/freezer/devices/platform.\n");
+                       return false;
+               }
+#endif
+                       return true;
+       }
        /*
         * PM_SUSPEND_STANDBY and PM_SUSPEND_MEMORY states need lowlevel
         * support and need to be valid to the lowlevel