projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3a52f60)
powerpc/64s/idle: Fix restore of AMOR on POWER9 after deep sleep
authorNicholas Piggin <npiggin@gmail.com>
Thu, 5 Apr 2018 06:10:00 +0000 (16:10 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 5 Apr 2018 06:48:52 +0000 (16:48 +1000)
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>
arch/powerpc/kernel/idle_book3s.S patch | blob | history

diff --git a/arch/powerpc/kernel/idle_book3s.S b/arch/powerpc/kernel/idle_book3s.S
index e5cb3ee..79d0054 100644 (file)
--- 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)
Domain: System / Kernel;