| Message ID | 20180405061000.30513-1-npiggin@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c1b25a17d24925b0961c319cfc3fd7e1dc778914 |
| Headers | show |
| Series | powerpc/64s/idle: POWER9 restore AMOR after deep sleep | expand |
On Thu, 2018-04-05 at 06:10:00 UTC, Nicholas Piggin wrote: > 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. > > Cc: Vaidyanathan Srinivasan <svaidy@linux.vnet.ibm.com> > Signed-off-by: Nicholas Piggin <npiggin@gmail.com> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/c1b25a17d24925b0961c319cfc3fd7 cheers
diff --git a/arch/powerpc/kernel/idle_book3s.S b/arch/powerpc/kernel/idle_book3s.S index bc4e391d031e..e72e385a4973 100644 --- a/arch/powerpc/kernel/idle_book3s.S +++ b/arch/powerpc/kernel/idle_book3s.S @@ -857,6 +857,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)
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. Cc: Vaidyanathan Srinivasan <svaidy@linux.vnet.ibm.com> Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- Do we need this guy after waking from deep sleep? This code is a little messy at the moment, it can be a bit tricky to see exactly what we've restored. I'm doing a bit of work to tidy it up and make it clearer, but that's not going to make 4.17 or backports. arch/powerpc/kernel/idle_book3s.S | 2 ++ 1 file changed, 2 insertions(+)