Skip to contentSkip to conversation

powerpc/64s/idle: POWER9 restore AMOR after deep sleep

PATCH Applied Nicholas Piggin 2 participants 2 messages Apr 5, 2018 PowerPC

lore
Share & tools
lore

Nicholas Piggin

author reviewer
#0 lore raw

PATCH 1/1 powerpc/64s/idle: POWER9 restore AMOR 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.

Cc Vaidyanathan Srinivasan <[email protected]>

---

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(+)
arch/powerpc/kernel/idle_book3s.S +2 -0
index bc4e391d031e..e72e385a4973 100644
@@ -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)
Signature · 1 line
2.16.3