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

Commit b4e80478 authored by Daniel Axtens's avatar Daniel Axtens Committed by Greg Kroah-Hartman
Browse files

powerpc/64s: move some exception handlers out of line 



(backport only)

We're about to grow the exception handlers, which will make a bunch of them
no longer fit within the space available. We move them out of line.

This is a fiddly and error-prone business, so in the interests of reviewability
I haven't merged this in with the addition of the entry flush.

Signed-off-by: default avatarDaniel Axtens <dja@axtens.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2c746135

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

+8 −2
Original line number Diff line number Diff line
@@ -572,13 +572,16 @@ ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TYPE_RADIX) 
EXC_REAL_BEGIN(data_access_slb, 0x380, 0x80)

	SET_SCRATCH0(r13)

	EXCEPTION_PROLOG_0(PACA_EXSLB)

	b tramp_data_access_slb

EXC_REAL_END(data_access_slb, 0x380, 0x80)



TRAMP_REAL_BEGIN(tramp_data_access_slb)

	EXCEPTION_PROLOG_1(PACA_EXSLB, KVMTEST_PR, 0x380)

	mr	r12,r3	/* save r3 */

	mfspr	r3,SPRN_DAR

	mfspr	r11,SPRN_SRR1

	crset	4*cr6+eq

	BRANCH_TO_COMMON(r10, slb_miss_common)

EXC_REAL_END(data_access_slb, 0x380, 0x80)



EXC_VIRT_BEGIN(data_access_slb, 0x4380, 0x80)

	SET_SCRATCH0(r13)
@@ -616,13 +619,16 @@ ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TYPE_RADIX) 
EXC_REAL_BEGIN(instruction_access_slb, 0x480, 0x80)

	SET_SCRATCH0(r13)

	EXCEPTION_PROLOG_0(PACA_EXSLB)

	b tramp_instruction_access_slb

EXC_REAL_END(instruction_access_slb, 0x480, 0x80)



TRAMP_REAL_BEGIN(tramp_instruction_access_slb)

	EXCEPTION_PROLOG_1(PACA_EXSLB, KVMTEST_PR, 0x480)

	mr	r12,r3	/* save r3 */

	mfspr	r3,SPRN_SRR0		/* SRR0 is faulting address */

	mfspr	r11,SPRN_SRR1

	crclr	4*cr6+eq

	BRANCH_TO_COMMON(r10, slb_miss_common)

EXC_REAL_END(instruction_access_slb, 0x480, 0x80)



EXC_VIRT_BEGIN(instruction_access_slb, 0x4480, 0x80)

	SET_SCRATCH0(r13)