Commit 0bdcfa18 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman

powerpc/64s: Fix KVM interrupt using wrong save area

The CTR register reload in the KVM interrupt path used the wrong save
area for SLB (and NMI) interrupts.

Fixes: 9600f261 ("powerpc/64s/exception: Move KVM test to common code")
Cc: stable@vger.kernel.org # v5.7+
Reported-by: default avatarChristian Zigotzky <chzigotzky@xenosoft.de>
Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Tested-by: default avatarChristian Zigotzky <chzigotzky@xenosoft.de>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200615061247.1310763-1-npiggin@gmail.com
parent a6e2c226
...@@ -270,7 +270,7 @@ BEGIN_FTR_SECTION ...@@ -270,7 +270,7 @@ BEGIN_FTR_SECTION
END_FTR_SECTION_IFSET(CPU_FTR_CFAR) END_FTR_SECTION_IFSET(CPU_FTR_CFAR)
.endif .endif
ld r10,PACA_EXGEN+EX_CTR(r13) ld r10,IAREA+EX_CTR(r13)
mtctr r10 mtctr r10
BEGIN_FTR_SECTION BEGIN_FTR_SECTION
ld r10,IAREA+EX_PPR(r13) ld r10,IAREA+EX_PPR(r13)
...@@ -298,7 +298,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR) ...@@ -298,7 +298,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR)
.if IKVM_SKIP .if IKVM_SKIP
89: mtocrf 0x80,r9 89: mtocrf 0x80,r9
ld r10,PACA_EXGEN+EX_CTR(r13) ld r10,IAREA+EX_CTR(r13)
mtctr r10 mtctr r10
ld r9,IAREA+EX_R9(r13) ld r9,IAREA+EX_R9(r13)
ld r10,IAREA+EX_R10(r13) ld r10,IAREA+EX_R10(r13)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment