lkml.org 
[lkml]   [2018]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.16 076/272] powerpc/64s/idle: Fix restore of AMOR on POWER9 after deep sleep
    Date
    4.16-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Nicholas Piggin <npiggin@gmail.com>

    [ Upstream commit c1b25a17d24925b0961c319cfc3fd7e1dc778914 ]

    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>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/powerpc/kernel/idle_book3s.S | 2 ++
    1 file changed, 2 insertions(+)

    --- a/arch/powerpc/kernel/idle_book3s.S
    +++ b/arch/powerpc/kernel/idle_book3s.S
    @@ -834,6 +834,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)

    \
     
     \ /
      Last update: 2018-05-28 14:00    [W:4.024 / U:0.652 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site