path: root/kernel
diff options
authorRafael J. Wysocki <>2014-04-20 23:43:01 +0200
committerRafael J. Wysocki <>2014-04-21 23:39:59 +0200
commitf3f125324fc1b8500cd20a2907628f7e5d88a708 (patch)
tree7ce0e8e3fd0b7cbd151540a5c87e44a37e3a54b4 /kernel
parenta798c10faf62a505d24e5f6213fbaf904a39623f (diff)
PM / suspend: Make cpuidle work in the "freeze" state
The "freeze" system sleep state introduced by commit 7e73c5ae6e79 (PM: Introduce suspend state PM_SUSPEND_FREEZE) requires cpuidle to be functional when freeze_enter() is executed to work correctly (that is, to be able to save any more energy than runtime idle), but that is impossible after commit 8651f97bd951d (PM / cpuidle: System resume hang fix with cpuidle) which caused cpuidle to be paused in dpm_suspend_noirq() and resumed in dpm_resume_noirq(). To avoid that problem, add cpuidle_resume() and cpuidle_pause() to the beginning and the end of freeze_enter(), respectively. Reported-by: Zhang Rui <> Signed-off-by: Rafael J. Wysocki <> Reviewed-by: Preeti U Murthy <>
Diffstat (limited to 'kernel')
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index c3ad9ca..8233cd4 100644
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -14,6 +14,7 @@
#include <linux/init.h>
#include <linux/console.h>
#include <linux/cpu.h>
+#include <linux/cpuidle.h>
#include <linux/syscalls.h>
#include <linux/gfp.h>
#include <linux/io.h>
@@ -53,7 +54,9 @@ static void freeze_begin(void)
static void freeze_enter(void)
+ cpuidle_resume();
wait_event(suspend_freeze_wait_head, suspend_freeze_wake);
+ cpuidle_pause();
void freeze_wake(void)