powerpc: do_break get registers from regs

Similar to the previous patch this makes interrupt handler function
types more regular so they can be wrapped with the next patch.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210130130852.2952424-9-npiggin@gmail.com

diff --git a/arch/powerpc/include/asm/debug.h b/arch/powerpc/include/asm/debug.h
index ec57daf87f409639376ab3fa16d8f8a381162514..0550eceab3ca7da2943446d0f4fb929e6ca4fab5 100644 (file)
--- a/arch/powerpc/include/asm/debug.h
+++ b/arch/powerpc/include/asm/debug.h
@@ -52,8 +52,7 @@ extern void do_send_trap(struct pt_regs *regs, unsigned long address,
                         unsigned long error_code, int brkpt);
 #else
 
-extern void do_break(struct pt_regs *regs, unsigned long address,
-                    unsigned long error_code);
+void do_break(struct pt_regs *regs);
 #endif
 
 #endif /* _ASM_POWERPC_DEBUG_H */

diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S
index 0b2c247cfdff92908dfb8aef39f7de01c4c83376..7869db9741853664753082e65f3207832ad023d1 100644 (file)
--- a/arch/powerpc/kernel/head_8xx.S
+++ b/arch/powerpc/kernel/head_8xx.S
@@ -364,10 +364,9 @@ do_databreakpoint:
        addi    r3,r1,STACK_FRAME_OVERHEAD
        mfspr   r4,SPRN_BAR
        stw     r4,_DAR(r11)
-#ifdef CONFIG_VMAP_STACK
-       lwz     r5,_DSISR(r11)
-#else
+#ifndef CONFIG_VMAP_STACK
        mfspr   r5,SPRN_DSISR
+       stw     r5,_DSISR(r11)
 #endif
        EXC_XFER_STD(0x1c00, do_break)
 

diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index a66f435dabbfe93f58bfa5d3eabee06ff04bec06..4f0f81e9420bf44e35f75aa42083526d2a094f3b 100644 (file)
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -659,11 +659,10 @@ static void do_break_handler(struct pt_regs *regs)
        }
 }
 
-void do_break (struct pt_regs *regs, unsigned long address,
-                   unsigned long error_code)
+void do_break(struct pt_regs *regs)
 {
        current->thread.trap_nr = TRAP_HWBKPT;
-       if (notify_die(DIE_DABR_MATCH, "dabr_match", regs, error_code,
+       if (notify_die(DIE_DABR_MATCH, "dabr_match", regs, regs->dsisr,
                        11, SIGSEGV) == NOTIFY_STOP)
                return;
 
@@ -681,7 +680,7 @@ void do_break (struct pt_regs *regs, unsigned long address,
                do_break_handler(regs);
 
        /* Deliver the signal to userspace */
-       force_sig_fault(SIGTRAP, TRAP_HWBKPT, (void __user *)address);
+       force_sig_fault(SIGTRAP, TRAP_HWBKPT, (void __user *)regs->dar);
 }
 #endif /* CONFIG_PPC_ADV_DEBUG_REGS */