[lkml]   [2015]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[PATCH 3.19 51/75] cpuidle: mvebu: Fix the CPU PM notifier usage
3.19-stable review patch.  If anyone has any objections, please let me know.


From: Gregory CLEMENT <>

commit 43b68879de27b1993518687fbc6013da80cdcbfe upstream.

As stated in kernel/cpu_pm.c, "Platform is responsible for ensuring
that cpu_pm_enter is not called twice on the same CPU before
cpu_pm_exit is called.". In the current code in case of failure when
calling mvebu_v7_cpu_suspend, the function cpu_pm_exit() is never
called whereas cpu_pm_enter() was called just before.

This patch moves the cpu_pm_exit() in order to balance the
cpu_pm_enter() calls.

Reported-by: Fulvio Benini <>
Signed-off-by: Gregory CLEMENT <>
Signed-off-by: Daniel Lezcano <>
Signed-off-by: Greg Kroah-Hartman <>

drivers/cpuidle/cpuidle-mvebu-v7.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/cpuidle/cpuidle-mvebu-v7.c
+++ b/drivers/cpuidle/cpuidle-mvebu-v7.c
@@ -37,11 +37,11 @@ static int mvebu_v7_enter_idle(struct cp
deepidle = true;

ret = mvebu_v7_cpu_suspend(deepidle);
+ cpu_pm_exit();
if (ret)
return ret;

- cpu_pm_exit();
return index;

 \ /
  Last update: 2015-04-10 16:01    [W:0.247 / U:0.264 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site