From: Paul Mackerras Date: Thu, 19 Mar 2015 23:10:18 +0000 (+1100) Subject: powerpc/powernv: Fix return value from power7_nap() et al. X-Git-Tag: omap-for-v4.1/fixes-rc1~126^2~77 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f57333a7677750f1264341d57bf1771000330458;p=pandora-kernel.git powerpc/powernv: Fix return value from power7_nap() et al. The power7_nap(), power7_sleep() and power7_winkle() functions are called from pnv_smp_cpu_kill_self(), which expects them to return the SRR1 value set by the hardware on wakeup, or 0 if no nap/sleep/winkle occurred. However, in the case where an interrupt needs to be replayed, the logic in power7_powersave_common (the common code for power7_nap et al.) doesn't set r3 to 0 in this case. Instead what we get as the return value is the selector for the type of power-saving mode requested (1, 2 or 3). In fact this should not affect the operation of pnv_smp_cpu_kill_self(), but it is better to get this correct, so this adds an instruction to set r3 to 0 in this case. Signed-off-by: Paul Mackerras Signed-off-by: Michael Ellerman --- Reading git-diff-tree failed