Commit f3f12532 authored Apr 20, 2014 by Rafael J. Wysocki

PM / suspend: Make cpuidle work in the "freeze" state



The "freeze" system sleep state introduced by commit 7e73c5ae
(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 8651f97b (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 <rui.zhang@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Preeti U Murthy <preeti@linux.vnet.ibm.com>

parent a798c10f

kernel/power/suspend.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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)

Admin message