Commit e7291556 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/32: Set regs parameter in r3 in transfer_to_handler 



All exception handlers take regs as first parameter.

Instead of setting r3 just before each call to a handler, set
it in transfer_to_handler.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/f994a379bb895a2cbd518cb82460ad3f3d3ccdf5.1615552867.git.christophe.leroy@csgroup.eu
parent db297c3b

arch/powerpc/kernel/entry_32.S

+1 −2
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ _ASM_NOKPROBE_SYMBOL(transfer_to_handler_full) 
	.globl	transfer_to_handler

transfer_to_handler:

	SAVE_NVGPRS(r11)

	addi	r3,r1,STACK_FRAME_OVERHEAD

	stw	r2,GPR2(r11)

	stw	r12,_NIP(r11)

	stw	r9,_MSR(r11)
@@ -227,7 +228,6 @@ ret_from_kernel_thread: 
 */

	.globl	handle_page_fault

handle_page_fault:

	addi	r3,r1,STACK_FRAME_OVERHEAD

	bl	do_page_fault

	cmpwi	r3,0

	beq+	ret_from_except
@@ -365,7 +365,6 @@ _ASM_NOKPROBE_SYMBOL(fast_exception_return) 
3:

	li	r10,-1

	stw	r10,_TRAP(r11)

	addi	r3,r1,STACK_FRAME_OVERHEAD

	bl	transfer_to_handler_full

	bl	unrecoverable_exception

	trap	/* should not get here */

arch/powerpc/kernel/head_32.h

+0 −2
Original line number Diff line number Diff line
@@ -183,7 +183,6 @@ _ASM_NOKPROBE_SYMBOL(\name\()_virt) 
#define EXCEPTION(n, label, hdlr, xfer)		\

	START_EXCEPTION(n, label)		\

	EXCEPTION_PROLOG label;			\

	addi	r3,r1,STACK_FRAME_OVERHEAD;	\

	xfer(n, hdlr)



#define EXC_XFER_TEMPLATE(hdlr, trap, msr, tfer, ret)		\
@@ -215,7 +214,6 @@ _ASM_NOKPROBE_SYMBOL(\name\()_virt) 
	lwz	r1, emergency_ctx@l(r1)

	addi	r1, r1, THREAD_SIZE - INT_FRAME_SIZE

	EXCEPTION_PROLOG_2 vmap_stack_overflow

	addi	r3, r1, STACK_FRAME_OVERHEAD

	EXC_XFER_STD(0, stack_overflow_exception)

.endm

arch/powerpc/kernel/head_40x.S

+0 −7
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ _ASM_NOKPROBE_SYMBOL(\name\()_virt) 
#define CRITICAL_EXCEPTION(n, label, hdlr)			\

	START_EXCEPTION(n, label);				\

	CRITICAL_EXCEPTION_PROLOG label;				\

	addi	r3,r1,STACK_FRAME_OVERHEAD;			\

	EXC_XFER_TEMPLATE(hdlr, n+2, (MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE)), \

			  crit_transfer_to_handler, ret_from_crit_exc)
@@ -227,13 +226,11 @@ _ASM_NOKPROBE_SYMBOL(\name\()_virt) 
/* 0x0600 - Alignment Exception */

	START_EXCEPTION(0x0600, Alignment)

	EXCEPTION_PROLOG Alignment handle_dar_dsisr=1

	addi	r3,r1,STACK_FRAME_OVERHEAD

	EXC_XFER_STD(0x600, alignment_exception)



/* 0x0700 - Program Exception */

	START_EXCEPTION(0x0700, ProgramCheck)

	EXCEPTION_PROLOG ProgramCheck handle_dar_dsisr=1

	addi	r3,r1,STACK_FRAME_OVERHEAD

	EXC_XFER_STD(0x700, program_check_exception)



	EXCEPTION(0x0800, Trap_08, unknown_exception, EXC_XFER_STD)
@@ -494,7 +491,6 @@ _ASM_NOKPROBE_SYMBOL(\name\()_virt) 
	/* continue normal handling for a critical exception... */

2:	mfspr	r4,SPRN_DBSR

	stw	r4,_ESR(r11)		/* DebugException takes DBSR in _ESR */

	addi	r3,r1,STACK_FRAME_OVERHEAD

	EXC_XFER_TEMPLATE(DebugException, 0x2002, \

		(MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE)), \

		crit_transfer_to_handler, ret_from_crit_exc)
@@ -505,21 +501,18 @@ Decrementer: 
	EXCEPTION_PROLOG Decrementer

	lis	r0,TSR_PIS@h

	mtspr	SPRN_TSR,r0		/* Clear the PIT exception */

	addi	r3,r1,STACK_FRAME_OVERHEAD

	EXC_XFER_LITE(0x1000, timer_interrupt)



	/* Fixed Interval Timer (FIT) Exception. (from 0x1010) */

	__HEAD

FITException:

	EXCEPTION_PROLOG FITException

	addi	r3,r1,STACK_FRAME_OVERHEAD;

	EXC_XFER_STD(0x1010, unknown_exception)



	/* Watchdog Timer (WDT) Exception. (from 0x1020) */

	__HEAD

WDTException:

	CRITICAL_EXCEPTION_PROLOG WDTException

	addi	r3,r1,STACK_FRAME_OVERHEAD;

	EXC_XFER_TEMPLATE(WatchdogException, 0x1020+2,

	                  (MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE)),

			  crit_transfer_to_handler, ret_from_crit_exc)

arch/powerpc/kernel/head_8xx.S

+0 −3
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ instruction_counter: 
/* Machine check */

	START_EXCEPTION(0x200, MachineCheck)

	EXCEPTION_PROLOG MachineCheck handle_dar_dsisr=1

	addi r3,r1,STACK_FRAME_OVERHEAD

	EXC_XFER_STD(0x200, machine_check_exception)



/* External interrupt */
@@ -132,7 +131,6 @@ instruction_counter: 
/* Alignment exception */

	START_EXCEPTION(0x600, Alignment)

	EXCEPTION_PROLOG Alignment handle_dar_dsisr=1

	addi	r3,r1,STACK_FRAME_OVERHEAD

	EXC_XFER_STD(0x600, alignment_exception)



/* Program check exception */
@@ -348,7 +346,6 @@ DARFixed:/* Return from dcbx instruction bug workaround */ 


1:	EXCEPTION_PROLOG_1

	EXCEPTION_PROLOG_2 DataBreakpoint handle_dar_dsisr=1

	addi	r3,r1,STACK_FRAME_OVERHEAD

	mfspr	r4,SPRN_BAR

	stw	r4,_DAR(r11)

	EXC_XFER_STD(0x1c00, do_break)

arch/powerpc/kernel/head_book3s_32.S

+2 −7
Original line number Diff line number Diff line
@@ -267,7 +267,6 @@ __secondary_hold_acknowledge: 
#endif /* CONFIG_PPC_CHRP */

	EXCEPTION_PROLOG_1

7:	EXCEPTION_PROLOG_2 MachineCheck

	addi	r3,r1,STACK_FRAME_OVERHEAD

#ifdef CONFIG_PPC_CHRP

	beq	cr1, 1f

	twi	31, 0, 0
@@ -337,7 +336,6 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_HPTE_TABLE) 
/* Alignment exception */

	START_EXCEPTION(0x600, Alignment)

	EXCEPTION_PROLOG Alignment handle_dar_dsisr=1

	addi	r3,r1,STACK_FRAME_OVERHEAD

	EXC_XFER_STD(0x600, alignment_exception)



/* Program check exception */
@@ -357,8 +355,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_FPU_UNAVAILABLE) 
	beq	1f

	bl	load_up_fpu		/* if from user, just load it up */

	b	fast_exception_return

1:	addi	r3,r1,STACK_FRAME_OVERHEAD

	EXC_XFER_LITE(0x800, kernel_fp_unavailable_exception)

1:	EXC_XFER_LITE(0x800, kernel_fp_unavailable_exception)

#else

	b 	ProgramCheck

#endif
@@ -722,13 +719,11 @@ AltiVecUnavailable: 
	bl	load_up_altivec		/* if from user, just load it up */

	b	fast_exception_return

#endif /* CONFIG_ALTIVEC */

1:	addi	r3,r1,STACK_FRAME_OVERHEAD

	EXC_XFER_LITE(0xf20, altivec_unavailable_exception)

1:	EXC_XFER_LITE(0xf20, altivec_unavailable_exception)



	__HEAD

PerformanceMonitor:

	EXCEPTION_PROLOG PerformanceMonitor

	addi	r3,r1,STACK_FRAME_OVERHEAD

	EXC_XFER_STD(0xf00, performance_monitor_exception)