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

Commit 087aa036 authored by Chen Gang's avatar Chen Gang Committed by Stephen Rothwell
Browse files

powerpc: make additional room in exception vector area 



The FWNMI region is fixed at 0x7000 and the vector are now overflowing
that with allmodconfig. Fix that by moving slb_miss_realmode code out
of that region as it doesn't need to be that close to the call sites
(it is a _GLOBAL function)

Fixes this build error:

arch/powerpc/kernel/exceptions-64s.S: Assembler messages:
arch/powerpc/kernel/exceptions-64s.S:1304: Error: attempt to move .org backwards

Signed-off-by: default avatarChen Gang <gang.chen@asianux.com>
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent 3912a677

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

+72 −72
Original line number Diff line number Diff line
@@ -1066,78 +1066,6 @@ unrecov_user_slb: 
#endif /* __DISABLED__ */





/*

 * r13 points to the PACA, r9 contains the saved CR,

 * r12 contain the saved SRR1, SRR0 is still ready for return

 * r3 has the faulting address

 * r9 - r13 are saved in paca->exslb.

 * r3 is saved in paca->slb_r3

 * We assume we aren't going to take any exceptions during this procedure.

 */

_GLOBAL(slb_miss_realmode)

	mflr	r10

#ifdef CONFIG_RELOCATABLE

	mtctr	r11

#endif



	stw	r9,PACA_EXSLB+EX_CCR(r13)	/* save CR in exc. frame */

	std	r10,PACA_EXSLB+EX_LR(r13)	/* save LR */



	bl	.slb_allocate_realmode



	/* All done -- return from exception. */



	ld	r10,PACA_EXSLB+EX_LR(r13)

	ld	r3,PACA_EXSLB+EX_R3(r13)

	lwz	r9,PACA_EXSLB+EX_CCR(r13)	/* get saved CR */



	mtlr	r10



	andi.	r10,r12,MSR_RI	/* check for unrecoverable exception */

	beq-	2f



.machine	push

.machine	"power4"

	mtcrf	0x80,r9

	mtcrf	0x01,r9		/* slb_allocate uses cr0 and cr7 */

.machine	pop



	RESTORE_PPR_PACA(PACA_EXSLB, r9)

	ld	r9,PACA_EXSLB+EX_R9(r13)

	ld	r10,PACA_EXSLB+EX_R10(r13)

	ld	r11,PACA_EXSLB+EX_R11(r13)

	ld	r12,PACA_EXSLB+EX_R12(r13)

	ld	r13,PACA_EXSLB+EX_R13(r13)

	rfid

	b	.	/* prevent speculative execution */



2:	mfspr	r11,SPRN_SRR0

	ld	r10,PACAKBASE(r13)

	LOAD_HANDLER(r10,unrecov_slb)

	mtspr	SPRN_SRR0,r10

	ld	r10,PACAKMSR(r13)

	mtspr	SPRN_SRR1,r10

	rfid

	b	.



unrecov_slb:

	EXCEPTION_PROLOG_COMMON(0x4100, PACA_EXSLB)

	DISABLE_INTS

	bl	.save_nvgprs

1:	addi	r3,r1,STACK_FRAME_OVERHEAD

	bl	.unrecoverable_exception

	b	1b





#ifdef CONFIG_PPC_970_NAP

power4_fixup_nap:

	andc	r9,r9,r10

	std	r9,TI_LOCAL_FLAGS(r11)

	ld	r10,_LINK(r1)		/* make idle task do the */

	std	r10,_NIP(r1)		/* equivalent of a blr */

	blr

#endif



	.align	7

	.globl alignment_common

alignment_common:
@@ -1335,6 +1263,78 @@ _GLOBAL(opal_mc_secondary_handler) 
#endif /* CONFIG_PPC_POWERNV */





/*

 * r13 points to the PACA, r9 contains the saved CR,

 * r12 contain the saved SRR1, SRR0 is still ready for return

 * r3 has the faulting address

 * r9 - r13 are saved in paca->exslb.

 * r3 is saved in paca->slb_r3

 * We assume we aren't going to take any exceptions during this procedure.

 */

_GLOBAL(slb_miss_realmode)

	mflr	r10

#ifdef CONFIG_RELOCATABLE

	mtctr	r11

#endif



	stw	r9,PACA_EXSLB+EX_CCR(r13)	/* save CR in exc. frame */

	std	r10,PACA_EXSLB+EX_LR(r13)	/* save LR */



	bl	.slb_allocate_realmode



	/* All done -- return from exception. */



	ld	r10,PACA_EXSLB+EX_LR(r13)

	ld	r3,PACA_EXSLB+EX_R3(r13)

	lwz	r9,PACA_EXSLB+EX_CCR(r13)	/* get saved CR */



	mtlr	r10



	andi.	r10,r12,MSR_RI	/* check for unrecoverable exception */

	beq-	2f



.machine	push

.machine	"power4"

	mtcrf	0x80,r9

	mtcrf	0x01,r9		/* slb_allocate uses cr0 and cr7 */

.machine	pop



	RESTORE_PPR_PACA(PACA_EXSLB, r9)

	ld	r9,PACA_EXSLB+EX_R9(r13)

	ld	r10,PACA_EXSLB+EX_R10(r13)

	ld	r11,PACA_EXSLB+EX_R11(r13)

	ld	r12,PACA_EXSLB+EX_R12(r13)

	ld	r13,PACA_EXSLB+EX_R13(r13)

	rfid

	b	.	/* prevent speculative execution */



2:	mfspr	r11,SPRN_SRR0

	ld	r10,PACAKBASE(r13)

	LOAD_HANDLER(r10,unrecov_slb)

	mtspr	SPRN_SRR0,r10

	ld	r10,PACAKMSR(r13)

	mtspr	SPRN_SRR1,r10

	rfid

	b	.



unrecov_slb:

	EXCEPTION_PROLOG_COMMON(0x4100, PACA_EXSLB)

	DISABLE_INTS

	bl	.save_nvgprs

1:	addi	r3,r1,STACK_FRAME_OVERHEAD

	bl	.unrecoverable_exception

	b	1b





#ifdef CONFIG_PPC_970_NAP

power4_fixup_nap:

	andc	r9,r9,r10

	std	r9,TI_LOCAL_FLAGS(r11)

	ld	r10,_LINK(r1)		/* make idle task do the */

	std	r10,_NIP(r1)		/* equivalent of a blr */

	blr

#endif



/*

 * Hash table stuff

 */