powerpc: Add esr as a synonym for pt_regs.dsisr

Create an anonymous union for dsisr and esr regsiters, we can reference
esr to get the exception detail when CONFIG_4xx=y or CONFIG_BOOKE=y.
Otherwise, reference dsisr. This makes code more clear.

Signed-off-by: Xiongwei Song <sxwjean@gmail.com>
[mpe: Reword commit title]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210807010239.416055-2-sxwjean@me.com

diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h
index 333979cf5d1e46889caf825556333247ec16e6ac..ab58939653db67897a2804cfcd6172d78a323df1 100644 (file)
--- a/arch/powerpc/include/asm/ptrace.h
+++ b/arch/powerpc/include/asm/ptrace.h
@@ -44,7 +44,10 @@ struct pt_regs
 #endif
                        unsigned long trap;
                        unsigned long dar;
-                       unsigned long dsisr;
+                       union {
+                               unsigned long dsisr;
+                               unsigned long esr;
+                       };
                        unsigned long result;
                };
        };

diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 185beb29058011d91b389a7490cba98d0f57d04e..f74af8f9133ca4168e3c2b681b68b6b5599cd1b7 100644 (file)
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -1499,7 +1499,7 @@ static void __show_regs(struct pt_regs *regs)
            trap == INTERRUPT_DATA_STORAGE ||
            trap == INTERRUPT_ALIGNMENT) {
                if (IS_ENABLED(CONFIG_4xx) || IS_ENABLED(CONFIG_BOOKE))
-                       pr_cont("DEAR: "REG" ESR: "REG" ", regs->dar, regs->dsisr);
+                       pr_cont("DEAR: "REG" ESR: "REG" ", regs->dar, regs->esr);
                else
                        pr_cont("DAR: "REG" DSISR: %08lx ", regs->dar, regs->dsisr);
        }

diff --git a/arch/powerpc/kernel/ptrace/ptrace.c b/arch/powerpc/kernel/ptrace/ptrace.c
index 0a0a33eb0d282505ddd5ecd68585683dfa907901..a222fd4d6334bafdcd196a65329e42acfeb2e908 100644 (file)
--- a/arch/powerpc/kernel/ptrace/ptrace.c
+++ b/arch/powerpc/kernel/ptrace/ptrace.c
@@ -375,6 +375,8 @@ void __init pt_regs_check(void)
                     offsetof(struct user_pt_regs, dar));
        BUILD_BUG_ON(offsetof(struct pt_regs, dsisr) !=
                     offsetof(struct user_pt_regs, dsisr));
+       BUILD_BUG_ON(offsetof(struct pt_regs, esr) !=
+                    offsetof(struct user_pt_regs, dsisr));
        BUILD_BUG_ON(offsetof(struct pt_regs, result) !=
                     offsetof(struct user_pt_regs, result));
 

diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 51d4f5faf42571578d694a6b2404a22f631edb40..5463d201d46576a70ecae141f442c90bff5b6cd8 100644 (file)
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -562,7 +562,7 @@ static inline int check_io_access(struct pt_regs *regs)
 #ifdef CONFIG_PPC_ADV_DEBUG_REGS
 /* On 4xx, the reason for the machine check or program exception
    is in the ESR. */
-#define get_reason(regs)       ((regs)->dsisr)
+#define get_reason(regs)       ((regs)->esr)
 #define REASON_FP              ESR_FP
 #define REASON_ILLEGAL         (ESR_PIL | ESR_PUO)
 #define REASON_PRIVILEGED      ESR_PPR

diff --git a/arch/powerpc/platforms/44x/machine_check.c b/arch/powerpc/platforms/44x/machine_check.c
index a5c898bb9bab7d5ddce0051d40e5600f2c10880a..5d19daacd78ad11997677969f3d29f2c4970bd72 100644 (file)
--- a/arch/powerpc/platforms/44x/machine_check.c
+++ b/arch/powerpc/platforms/44x/machine_check.c
@@ -11,7 +11,7 @@
 
 int machine_check_440A(struct pt_regs *regs)
 {
-       unsigned long reason = regs->dsisr;
+       unsigned long reason = regs->esr;
 
        printk("Machine check in kernel mode.\n");
        if (reason & ESR_IMCP){
@@ -48,7 +48,7 @@ int machine_check_440A(struct pt_regs *regs)
 #ifdef CONFIG_PPC_47x
 int machine_check_47x(struct pt_regs *regs)
 {
-       unsigned long reason = regs->dsisr;
+       unsigned long reason = regs->esr;
        u32 mcsr;
 
        printk(KERN_ERR "Machine check in kernel mode.\n");

diff --git a/arch/powerpc/platforms/4xx/machine_check.c b/arch/powerpc/platforms/4xx/machine_check.c
index a71c29892a911f61ba1515252882de21c5a7f4e4..a905da1d6f4156a44b8990fde0e9b8f4cebc77b6 100644 (file)
--- a/arch/powerpc/platforms/4xx/machine_check.c
+++ b/arch/powerpc/platforms/4xx/machine_check.c
@@ -10,7 +10,7 @@
 
 int machine_check_4xx(struct pt_regs *regs)
 {
-       unsigned long reason = regs->dsisr;
+       unsigned long reason = regs->esr;
 
        if (reason & ESR_IMCP) {
                printk("Instruction");