powerpc: bad_page_fault 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-12-npiggin@gmail.com

diff --git a/arch/powerpc/include/asm/bug.h b/arch/powerpc/include/asm/bug.h
index f7827e993196511d8cb88af98b250a1e703d2dea..4220789b9a978b58464bea91ffe9ddf0ea537f48 100644 (file)
--- a/arch/powerpc/include/asm/bug.h
+++ b/arch/powerpc/include/asm/bug.h
@@ -112,8 +112,8 @@
 
 struct pt_regs;
 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);
+void bad_page_fault(struct pt_regs *, int);
+void __bad_page_fault(struct pt_regs *regs, int sig);
 extern void _exception(int, struct pt_regs *, int, unsigned long);
 extern void _exception_pkey(struct pt_regs *, unsigned long, int);
 extern void die(const char *, struct pt_regs *, long);

diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index d6ea3f2d6cc083fd9a6bc4a9cbff2f98fdc7c49e..b102b40c4988b94022634242a937f84e65ec1b8a 100644 (file)
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -672,9 +672,8 @@ handle_page_fault:
        lwz     r0,_TRAP(r1)
        clrrwi  r0,r0,1
        stw     r0,_TRAP(r1)
-       mr      r5,r3
+       mr      r4,r3           /* err arg for bad_page_fault */
        addi    r3,r1,STACK_FRAME_OVERHEAD
-       lwz     r4,_DAR(r1)
        bl      __bad_page_fault
        b       ret_from_except_full
 

diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
index 1a7291daadfd92f2e737b06c1a6bcfd3d6d074a3..003999c7836c6fec12db58fcda9509ef3a725099 100644 (file)
--- a/arch/powerpc/kernel/exceptions-64e.S
+++ b/arch/powerpc/kernel/exceptions-64e.S
@@ -1016,9 +1016,8 @@ storage_fault_common:
        bne-    1f
        b       ret_from_except_lite
 1:     bl      save_nvgprs
-       mr      r5,r3
+       mr      r4,r3
        addi    r3,r1,STACK_FRAME_OVERHEAD
-       ld      r4,_DAR(r1)
        bl      __bad_page_fault
        b       ret_from_except
 

diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index dfb0d3325f4b73ae62154178392bf4854516f283..f7370145be193e695811476a7565f30fe5e9593d 100644 (file)
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -1612,7 +1612,7 @@ bad:
        if (user_mode(regs))
                _exception(sig, regs, code, regs->dar);
        else
-               bad_page_fault(regs, regs->dar, sig);
+               bad_page_fault(regs, sig);
 
 bail:
        exception_exit(prev_state);

diff --git a/arch/powerpc/mm/book3s64/hash_utils.c b/arch/powerpc/mm/book3s64/hash_utils.c
index 9a499af3eebf0e3cc57cc6f6cbb4203d3b5d0f0b..1a270cc37d974e8b3c57aa356e6e6b044b14ff31 100644 (file)
--- a/arch/powerpc/mm/book3s64/hash_utils.c
+++ b/arch/powerpc/mm/book3s64/hash_utils.c
@@ -1539,7 +1539,7 @@ long do_hash_fault(struct pt_regs *regs)
         * the access, or panic if there isn't a handler.
         */
        if (unlikely(in_nmi())) {
-               bad_page_fault(regs, ea, SIGSEGV);
+               bad_page_fault(regs, SIGSEGV);
                return 0;
        }
 
@@ -1578,7 +1578,7 @@ long do_hash_fault(struct pt_regs *regs)
                        else
                                _exception(SIGBUS, regs, BUS_ADRERR, ea);
                } else {
-                       bad_page_fault(regs, ea, SIGBUS);
+                       bad_page_fault(regs, SIGBUS);
                }
                err = 0;
 

diff --git a/arch/powerpc/mm/book3s64/slb.c b/arch/powerpc/mm/book3s64/slb.c
index 985902ce02725f4edf1d5dc62d6a95fbe5b33a28..c581548b533fc42b16ae4d702220afff65fc63c5 100644 (file)
--- a/arch/powerpc/mm/book3s64/slb.c
+++ b/arch/powerpc/mm/book3s64/slb.c
@@ -874,7 +874,7 @@ void do_bad_slb_fault(struct pt_regs *regs)
                if (user_mode(regs))
                        _exception(SIGSEGV, regs, SEGV_BNDERR, regs->dar);
                else
-                       bad_page_fault(regs, regs->dar, SIGSEGV);
+                       bad_page_fault(regs, SIGSEGV);
        } else if (err == -EINVAL) {
                unrecoverable_exception(regs);
        } else {

diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index 273ff845eccf6a0928000b78588b33d79a4933f0..5dd3248b47c73f4e479c3830155c29628b984721 100644 (file)
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -566,7 +566,7 @@ NOKPROBE_SYMBOL(do_page_fault);
  * It is called from the DSI and ISI handlers in head.S and from some
  * of the procedures in traps.c.
  */
-void __bad_page_fault(struct pt_regs *regs, unsigned long address, int sig)
+void __bad_page_fault(struct pt_regs *regs, int sig)
 {
        int is_write = page_fault_is_write(regs->dsisr);
 
@@ -604,7 +604,7 @@ void __bad_page_fault(struct pt_regs *regs, unsigned long address, int sig)
        die("Kernel access of bad area", regs, sig);
 }
 
-void bad_page_fault(struct pt_regs *regs, unsigned long address, int sig)
+void bad_page_fault(struct pt_regs *regs, int sig)
 {
        const struct exception_table_entry *entry;
 
@@ -613,5 +613,5 @@ void bad_page_fault(struct pt_regs *regs, unsigned long address, int sig)
        if (entry)
                instruction_pointer_set(regs, extable_fixup(entry));
        else
-               __bad_page_fault(regs, address, sig);
+               __bad_page_fault(regs, sig);
 }

diff --git a/arch/powerpc/platforms/8xx/machine_check.c b/arch/powerpc/platforms/8xx/machine_check.c
index 88dedf38eccd175c5a821a7f720faa572f4e7ab4..65636597589519f6a8d16061fa3283f5758d08f1 100644 (file)
--- a/arch/powerpc/platforms/8xx/machine_check.c
+++ b/arch/powerpc/platforms/8xx/machine_check.c
@@ -26,7 +26,7 @@ int machine_check_8xx(struct pt_regs *regs)
         * to deal with that than having a wart in the mcheck handler.
         * -- BenH
         */
-       bad_page_fault(regs, regs->dar, SIGBUS);
+       bad_page_fault(regs, SIGBUS);
        return 1;
 #else
        return 0;