Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f3b5dc1 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Benjamin Herrenschmidt
Browse files

powerpc/pseries: PACA save area fix for general exception vs MCE 



MCE must not use PACA_EXGEN. When a general exception enables MSR_RI,
that means SPRN_SRR[01] and SPRN_SPRG are no longer used. However the
PACA save area is still in use.
Acked-by: default avatarMahesh Salgaonkar <mahesh@linux.vnet.ibm.com>

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 66443efa

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

+4 −4
Original line number Diff line number Diff line
@@ -969,14 +969,14 @@ ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TYPE_RADIX) 
machine_check_common:



	mfspr	r10,SPRN_DAR

	std	r10,PACA_EXGEN+EX_DAR(r13)

	std	r10,PACA_EXMC+EX_DAR(r13)

	mfspr	r10,SPRN_DSISR

	stw	r10,PACA_EXGEN+EX_DSISR(r13)

	stw	r10,PACA_EXMC+EX_DSISR(r13)

	EXCEPTION_PROLOG_COMMON(0x200, PACA_EXMC)

	FINISH_NAP

	RECONCILE_IRQ_STATE(r10, r11)

	ld	r3,PACA_EXGEN+EX_DAR(r13)

	lwz	r4,PACA_EXGEN+EX_DSISR(r13)

	ld	r3,PACA_EXMC+EX_DAR(r13)

	lwz	r4,PACA_EXMC+EX_DSISR(r13)

	std	r3,_DAR(r1)

	std	r4,_DSISR(r1)

	bl	save_nvgprs