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

powerpc: remove arguments from fault handler functions 



Make mm fault handlers all just take the pt_regs * argument and load
DAR/DSISR from that. Make those that return a value return long.

This is done to make the function signatures match other handlers, which
will help with a future patch to add wrappers. Explicit arguments could
be added for performance but that would require more wrapper macro
variants.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210130130852.2952424-7-npiggin@gmail.com
parent a4922f54

arch/powerpc/include/asm/asm-prototypes.h

+2 −2
Original line number Diff line number Diff line
@@ -82,8 +82,8 @@ void kernel_bad_stack(struct pt_regs *regs); 
void system_reset_exception(struct pt_regs *regs);

void machine_check_exception(struct pt_regs *regs);

void emulation_assist_interrupt(struct pt_regs *regs);

long do_slb_fault(struct pt_regs *regs, unsigned long ea);

void do_bad_slb_fault(struct pt_regs *regs, unsigned long ea, long err);

long do_slb_fault(struct pt_regs *regs);

void do_bad_slb_fault(struct pt_regs *regs);



/* signals, syscalls and interrupts */

long sys_swapcontext(struct ucontext __user *old_ctx,

arch/powerpc/include/asm/book3s/64/mmu-hash.h

+1 −1
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ static inline unsigned long hpt_hash(unsigned long vpn, 


long hpte_insert_repeating(unsigned long hash, unsigned long vpn, unsigned long pa,

			   unsigned long rlags, unsigned long vflags, int psize, int ssize);

int do_hash_fault(struct pt_regs *regs, unsigned long ea, unsigned long dsisr);

long do_hash_fault(struct pt_regs *regs);

extern int __hash_page_4K(unsigned long ea, unsigned long access,

			  unsigned long vsid, pte_t *ptep, unsigned long trap,

			  unsigned long flags, int ssize, int subpage_prot);

arch/powerpc/include/asm/bug.h

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ 
#ifndef __ASSEMBLY__



struct pt_regs;

extern int do_page_fault(struct pt_regs *, unsigned long, unsigned long);

long do_page_fault(struct pt_regs *);

extern void bad_page_fault(struct pt_regs *, unsigned long, int);

void __bad_page_fault(struct pt_regs *regs, unsigned long address, int sig);

extern void _exception(int, struct pt_regs *, int, unsigned long);

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

+0 −2
Original line number Diff line number Diff line
@@ -1011,8 +1011,6 @@ storage_fault_common: 
	std	r14,_DAR(r1)

	std	r15,_DSISR(r1)

	addi	r3,r1,STACK_FRAME_OVERHEAD

	mr	r4,r14

	mr	r5,r15

	ld	r14,PACA_EXGEN+EX_R14(r13)

	ld	r15,PACA_EXGEN+EX_R15(r13)

	bl	do_page_fault

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

+4 −13
Original line number Diff line number Diff line
@@ -1438,10 +1438,9 @@ EXC_VIRT_BEGIN(data_access, 0x4300, 0x80) 
EXC_VIRT_END(data_access, 0x4300, 0x80)

EXC_COMMON_BEGIN(data_access_common)

	GEN_COMMON data_access

	ld	r4,_DAR(r1)

	ld	r5,_DSISR(r1)

	ld	r4,_DSISR(r1)

	addi	r3,r1,STACK_FRAME_OVERHEAD

	andis.	r0,r5,DSISR_DABRMATCH@h

	andis.	r0,r4,DSISR_DABRMATCH@h

	bne-	1f

BEGIN_MMU_FTR_SECTION

	bl	do_hash_fault
@@ -1504,10 +1503,9 @@ EXC_VIRT_BEGIN(data_access_slb, 0x4380, 0x80) 
EXC_VIRT_END(data_access_slb, 0x4380, 0x80)

EXC_COMMON_BEGIN(data_access_slb_common)

	GEN_COMMON data_access_slb

	ld	r4,_DAR(r1)

	addi	r3,r1,STACK_FRAME_OVERHEAD

BEGIN_MMU_FTR_SECTION

	/* HPT case, do SLB fault */

	addi	r3,r1,STACK_FRAME_OVERHEAD

	bl	do_slb_fault

	cmpdi	r3,0

	bne-	1f
@@ -1519,8 +1517,6 @@ MMU_FTR_SECTION_ELSE 
ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TYPE_RADIX)

	std	r3,RESULT(r1)

	RECONCILE_IRQ_STATE(r10, r11)

	ld	r4,_DAR(r1)

	ld	r5,RESULT(r1)

	addi	r3,r1,STACK_FRAME_OVERHEAD

	bl	do_bad_slb_fault

	b	interrupt_return
@@ -1555,8 +1551,6 @@ EXC_VIRT_BEGIN(instruction_access, 0x4400, 0x80) 
EXC_VIRT_END(instruction_access, 0x4400, 0x80)

EXC_COMMON_BEGIN(instruction_access_common)

	GEN_COMMON instruction_access

	ld	r4,_DAR(r1)

	ld	r5,_DSISR(r1)

	addi	r3,r1,STACK_FRAME_OVERHEAD

BEGIN_MMU_FTR_SECTION

	bl	do_hash_fault
@@ -1602,10 +1596,9 @@ EXC_VIRT_BEGIN(instruction_access_slb, 0x4480, 0x80) 
EXC_VIRT_END(instruction_access_slb, 0x4480, 0x80)

EXC_COMMON_BEGIN(instruction_access_slb_common)

	GEN_COMMON instruction_access_slb

	ld	r4,_DAR(r1)

	addi	r3,r1,STACK_FRAME_OVERHEAD

BEGIN_MMU_FTR_SECTION

	/* HPT case, do SLB fault */

	addi	r3,r1,STACK_FRAME_OVERHEAD

	bl	do_slb_fault

	cmpdi	r3,0

	bne-	1f
@@ -1617,8 +1610,6 @@ MMU_FTR_SECTION_ELSE 
ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TYPE_RADIX)

	std	r3,RESULT(r1)

	RECONCILE_IRQ_STATE(r10, r11)

	ld	r4,_DAR(r1)

	ld	r5,RESULT(r1)

	addi	r3,r1,STACK_FRAME_OVERHEAD

	bl	do_bad_slb_fault

	b	interrupt_return