1 files changed, 20 insertions, 0 deletions

diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c
index f208f560aecd..70274b7b4773 100644
--- a/arch/powerpc/lib/sstep.c
+++ b/arch/powerpc/lib/sstep.c
@@ -31,6 +31,8 @@ extern char system_call_common[];
 #define XER_SO          0x80000000U
 #define XER_OV          0x40000000U
 #define XER_CA          0x20000000U
+#define XER_OV32        0x00080000U
+#define XER_CA32        0x00040000U
 
 #ifdef CONFIG_PPC_FPU
 /*
@@ -962,6 +964,16 @@ static nokprobe_inline void set_cr0(const struct pt_regs *regs,
                 op->ccval |= 0x20000000;
 }
 
+static nokprobe_inline void set_ca32(struct instruction_op *op, bool val)
+{
+        if (cpu_has_feature(CPU_FTR_ARCH_300)) {
+                if (val)
+                        op->xerval |= XER_CA32;
+                else
+                        op->xerval &= ~XER_CA32;
+        }
+}
+
 static nokprobe_inline void add_with_carry(const struct pt_regs *regs,
                                      struct instruction_op *op, int rd,
                                      unsigned long val1, unsigned long val2,
@@ -985,6 +997,9 @@ static nokprobe_inline void add_with_carry(const struct pt_regs *regs,
                 op->xerval |= XER_CA;
         else
                 op->xerval &= ~XER_CA;
+
+        set_ca32(op, (unsigned int)val < (unsigned int)val1 ||
+                        (carry_in && (unsigned int)val == (unsigned int)val1));
 }
 
 static nokprobe_inline void do_cmp_signed(const struct pt_regs *regs,
@@ -1791,6 +1806,7 @@ int analyse_instr(struct instruction_op *op, const struct pt_regs *regs,
                                 op->xerval |= XER_CA;
                         else
                                 op->xerval &= ~XER_CA;
+                        set_ca32(op, op->xerval & XER_CA);
                         goto logical_done;
 
                 case 824:       /* srawi */
@@ -1803,6 +1819,7 @@ int analyse_instr(struct instruction_op *op, const struct pt_regs *regs,
                                 op->xerval |= XER_CA;
                         else
                                 op->xerval &= ~XER_CA;
+                        set_ca32(op, op->xerval & XER_CA);
                         goto logical_done;
 
 #ifdef __powerpc64__
@@ -1832,6 +1849,7 @@ int analyse_instr(struct instruction_op *op, const struct pt_regs *regs,
                                 op->xerval |= XER_CA;
                         else
                                 op->xerval &= ~XER_CA;
+                        set_ca32(op, op->xerval & XER_CA);
                         goto logical_done;
 
                 case 826:       /* sradi with sh_5 = 0 */
@@ -1845,6 +1863,7 @@ int analyse_instr(struct instruction_op *op, const struct pt_regs *regs,
                                 op->xerval |= XER_CA;
                         else
                                 op->xerval &= ~XER_CA;
+                        set_ca32(op, op->xerval & XER_CA);
                         goto logical_done;
 #endif /* __powerpc64__ */
 
@@ -2698,6 +2717,7 @@ void emulate_update_regs(struct pt_regs *regs, struct instruction_op *op)
         }
         regs->nip = next_pc;
 }
+NOKPROBE_SYMBOL(emulate_update_regs);
 
 /*
  * Emulate a previously-analysed load or store instruction.