[PATCH] cpuidle/powernv: Fix return value of idle index in fastsleep

Preeti U Murthy preeti at linux.vnet.ibm.com
Tue Oct 28 00:26:18 AEDT 2014

Commit dcb18694 : Fix ipi on Palmeto added a workaround to disable
going into fastsleep on Palmeto boards which was reported to fail
to boot when fastsleep was enabled. However it missed returning
an idle index. Fix this.

There is probably no harm in returning the index of fastsleep
although the cpu did not enter this state. The governor will notice
the difference in the residency time in the idle state and the
target residency of the idle state and prevent cpus from entering
fastsleep from that point on. Hence the usage and time statistics
logged for fastsleep will not be out of sync with reality except
for the first entry.

Signed-off-by: Preeti U Murthy <preeti at linux.vnet.ibm.com>
Do we still need this workaround? Or can we get rid of the check
on powersave_nap altogether?

 drivers/cpuidle/cpuidle-powernv.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/cpuidle/cpuidle-powernv.c b/drivers/cpuidle/cpuidle-powernv.c
index fa79392..c18da24 100644
--- a/drivers/cpuidle/cpuidle-powernv.c
+++ b/drivers/cpuidle/cpuidle-powernv.c
@@ -70,7 +70,7 @@ static int fastsleep_loop(struct cpuidle_device *dev,
 	unsigned long new_lpcr;
 	if (powersave_nap < 2)
-		return;
+		return index;
 	if (unlikely(system_state < SYSTEM_RUNNING))
 		return index;

More information about the Linuxppc-dev mailing list