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

Commit 27ce77df authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc/64s: Consolidate Instruction Storage 0x400 interrupt 



Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 2b9af6e4

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

+18 −17
Original line number Original line Diff line number Diff line
@@ -592,6 +592,24 @@ TRAMP_KVM_SKIP(PACA_EXSLB, 0x380) 








EXC_REAL(instruction_access, 0x400, 0x480)

EXC_REAL(instruction_access, 0x400, 0x480)

EXC_VIRT(instruction_access, 0x4400, 0x4480, 0x400)

TRAMP_KVM(PACA_EXGEN, 0x400)



EXC_COMMON_BEGIN(instruction_access_common)

	EXCEPTION_PROLOG_COMMON(0x400, PACA_EXGEN)

	RECONCILE_IRQ_STATE(r10, r11)

	ld	r12,_MSR(r1)

	ld	r3,_NIP(r1)

	andis.	r4,r12,0x5820

	li	r5,0x400

	std	r3,_DAR(r1)

	std	r4,_DSISR(r1)

BEGIN_MMU_FTR_SECTION

	b	do_hash_page		/* Try to handle as hpte fault */

MMU_FTR_SECTION_ELSE

	b	handle_page_fault

ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TYPE_RADIX)







EXC_REAL_BEGIN(instruction_access_slb, 0x480, 0x500)

EXC_REAL_BEGIN(instruction_access_slb, 0x480, 0x500)

	SET_SCRATCH0(r13)

	SET_SCRATCH0(r13)
@@ -772,7 +790,6 @@ EXC_REAL_NONE(0x1800, 0x1900) 
/*** Out of line interrupts support ***/

/*** Out of line interrupts support ***/





	/* moved from 0x200 */

	/* moved from 0x200 */

TRAMP_KVM(PACA_EXGEN, 0x400)

TRAMP_KVM(PACA_EXSLB, 0x480)

TRAMP_KVM(PACA_EXSLB, 0x480)

TRAMP_KVM(PACA_EXGEN, 0x900)

TRAMP_KVM(PACA_EXGEN, 0x900)

TRAMP_KVM_HV(PACA_EXGEN, 0x980)

TRAMP_KVM_HV(PACA_EXGEN, 0x980)
@@ -1040,8 +1057,6 @@ EXC_COMMON(altivec_assist_common, 0x1700, unknown_exception) 
	 * come here.

	 * come here.

	 */

	 */





EXC_VIRT(instruction_access, 0x4400, 0x4480, 0x400)



EXC_VIRT_BEGIN(instruction_access_slb, 0x4480, 0x4500)

EXC_VIRT_BEGIN(instruction_access_slb, 0x4480, 0x4500)

	SET_SCRATCH0(r13)

	SET_SCRATCH0(r13)

	EXCEPTION_PROLOG_0(PACA_EXSLB)

	EXCEPTION_PROLOG_0(PACA_EXSLB)
@@ -1152,20 +1167,6 @@ EXC_COMMON_BEGIN(h_data_storage_common) 
	bl      unknown_exception

	bl      unknown_exception

	b       ret_from_except

	b       ret_from_except





EXC_COMMON_BEGIN(instruction_access_common)

	EXCEPTION_PROLOG_COMMON(0x400, PACA_EXGEN)

	RECONCILE_IRQ_STATE(r10, r11)

	ld	r12,_MSR(r1)

	ld	r3,_NIP(r1)

	andis.	r4,r12,0x5820

	li	r5,0x400

	std	r3,_DAR(r1)

	std	r4,_DSISR(r1)

BEGIN_MMU_FTR_SECTION

	b	do_hash_page		/* Try to handle as hpte fault */

MMU_FTR_SECTION_ELSE

	b	handle_page_fault

ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TYPE_RADIX)





EXC_COMMON(h_instr_storage_common, 0xe20, unknown_exception)

EXC_COMMON(h_instr_storage_common, 0xe20, unknown_exception)