diff options
author | Nicholas Piggin <npiggin@gmail.com> | 2018-04-05 16:10:00 +1000 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-04-05 16:48:52 +1000 |
commit | c1b25a17d24925b0961c319cfc3fd7e1dc778914 (patch) | |
tree | e4bff9e1b478af543dcf2611d2d6c152c0d469cb | |
parent | 3a52f6014d367a6c8d91b1df8a658903345908e3 (diff) | |
download | op-kernel-dev-c1b25a17d24925b0961c319cfc3fd7e1dc778914.zip op-kernel-dev-c1b25a17d24925b0961c319cfc3fd7e1dc778914.tar.gz |
powerpc/64s/idle: Fix restore of AMOR on POWER9 after deep sleep
POWER8 restores AMOR when waking from deep sleep, but POWER9 does not,
because it does not go through the subcore restore.
Have POWER9 restore it in core restore.
Fixes: ee97b6b99f42 ("powerpc/mm/radix: Setup AMOR in HV mode to allow key 0")
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r-- | arch/powerpc/kernel/idle_book3s.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/idle_book3s.S b/arch/powerpc/kernel/idle_book3s.S index e5cb3ee..79d0054 100644 --- a/arch/powerpc/kernel/idle_book3s.S +++ b/arch/powerpc/kernel/idle_book3s.S @@ -870,6 +870,8 @@ BEGIN_FTR_SECTION mtspr SPRN_PTCR,r4 ld r4,_RPR(r1) mtspr SPRN_RPR,r4 + ld r4,_AMOR(r1) + mtspr SPRN_AMOR,r4 END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300) ld r4,_TSCR(r1) |