Skip to content

Commit 0bdcfa1

Browse files
npigginmpe
authored andcommitted
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: 9600f26 ("powerpc/64s/exception: Move KVM test to common code") Cc: [email protected] # v5.7+ Reported-by: Christian Zigotzky <[email protected]> Signed-off-by: Nicholas Piggin <[email protected]> Tested-by: Christian Zigotzky <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent a6e2c22 commit 0bdcfa1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/powerpc/kernel/exceptions-64s.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ BEGIN_FTR_SECTION
270270
END_FTR_SECTION_IFSET(CPU_FTR_CFAR)
271271
.endif
272272

273-
ld r10,PACA_EXGEN+EX_CTR(r13)
273+
ld r10,IAREA+EX_CTR(r13)
274274
mtctr r10
275275
BEGIN_FTR_SECTION
276276
ld r10,IAREA+EX_PPR(r13)
@@ -298,7 +298,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR)
298298

299299
.if IKVM_SKIP
300300
89: mtocrf 0x80,r9
301-
ld r10,PACA_EXGEN+EX_CTR(r13)
301+
ld r10,IAREA+EX_CTR(r13)
302302
mtctr r10
303303
ld r9,IAREA+EX_R9(r13)
304304
ld r10,IAREA+EX_R10(r13)

0 commit comments

Comments
 (0)