OSDN Git Service

powerpc/powernv: Fix restore of SPRs upon wake up from hypervisor state loss
authorGautham R. Shenoy <ego@linux.vnet.ibm.com>
Wed, 7 Sep 2016 05:16:30 +0000 (10:46 +0530)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 12 Sep 2016 02:45:50 +0000 (12:45 +1000)
commitbd00a240dc52e28706fbbe3aceda63e6c291b433
tree0d231a972425c1c380739b652af0e96930a234be
parentf077aaf0754bcba0fffdbd925bc12f09cd1e38aa
powerpc/powernv: Fix restore of SPRs upon wake up from hypervisor state loss

pnv_wakeup_tb_loss() currently expects cr4 to be "eq" if the CPU is
waking up from a complete hypervisor state loss. Hence, it currently
restores the SPR contents only if cr4 is "eq".

However, after commit bcef83a00dc4 ("powerpc/powernv: Add platform
support for stop instruction"), on ISA v3.0 CPUs, the function
pnv_restore_hyp_resource() sets cr4 to contain the result of the
comparison between the state the CPU has woken up from and the first
deep stop state before calling pnv_wakeup_tb_loss().

Thus if the CPU woke up from a state that is deeper than the first
deep stop state, cr4 will have "gt" set and hence, pnv_wakeup_tb_loss()
will fail to restore the SPRs on waking up from such a state.

Fix the code in pnv_wakeup_tb_loss() to restore the SPR states when cr4
is "eq" or "gt".

Fixes: bcef83a00dc4 ("powerpc/powernv: Add platform support for stop instruction")
Signed-off-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com>
Reviewed-by: Shreyas B. Prabhu <shreyasbp@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/kernel/idle_book3s.S