5 files changed, 11 insertions, 1 deletions

diff --git a/arch/powerpc/include/uapi/asm/perf_regs.h b/arch/powerpc/include/uapi/asm/perf_regs.h
index ff91192407d1..f599064dd8dc 100644
--- a/arch/powerpc/include/uapi/asm/perf_regs.h
+++ b/arch/powerpc/include/uapi/asm/perf_regs.h
@@ -47,6 +47,7 @@ enum perf_event_powerpc_regs {
         PERF_REG_POWERPC_DAR,
         PERF_REG_POWERPC_DSISR,
         PERF_REG_POWERPC_SIER,
+        PERF_REG_POWERPC_MMCRA,
         PERF_REG_POWERPC_MAX,
 };
 #endif /* _UAPI_ASM_POWERPC_PERF_REGS_H */
diff --git a/arch/powerpc/perf/perf_regs.c b/arch/powerpc/perf/perf_regs.c
index 5c36b3a8d47a..3349f3f8fe84 100644
--- a/arch/powerpc/perf/perf_regs.c
+++ b/arch/powerpc/perf/perf_regs.c
@@ -70,6 +70,7 @@ static unsigned int pt_regs_offset[PERF_REG_POWERPC_MAX] = {
         PT_REGS_OFFSET(PERF_REG_POWERPC_DAR, dar),
         PT_REGS_OFFSET(PERF_REG_POWERPC_DSISR, dsisr),
         PT_REGS_OFFSET(PERF_REG_POWERPC_SIER, dar),
+        PT_REGS_OFFSET(PERF_REG_POWERPC_MMCRA, dsisr),
 };
 
 u64 perf_reg_value(struct pt_regs *regs, int idx)
@@ -83,6 +84,11 @@ u64 perf_reg_value(struct pt_regs *regs, int idx)
             !is_sier_available()))
                 return 0;
 
+        if (idx == PERF_REG_POWERPC_MMCRA &&
+           (IS_ENABLED(CONFIG_FSL_EMB_PERF_EVENT) ||
+            IS_ENABLED(CONFIG_PPC32)))
+                return 0;
+
         return regs_get_register(regs, pt_regs_offset[idx]);
 }
 
diff --git a/tools/arch/powerpc/include/uapi/asm/perf_regs.h b/tools/arch/powerpc/include/uapi/asm/perf_regs.h
index ff91192407d1..f599064dd8dc 100644
--- a/tools/arch/powerpc/include/uapi/asm/perf_regs.h
+++ b/tools/arch/powerpc/include/uapi/asm/perf_regs.h
@@ -47,6 +47,7 @@ enum perf_event_powerpc_regs {
         PERF_REG_POWERPC_DAR,
         PERF_REG_POWERPC_DSISR,
         PERF_REG_POWERPC_SIER,
+        PERF_REG_POWERPC_MMCRA,
         PERF_REG_POWERPC_MAX,
 };
 #endif /* _UAPI_ASM_POWERPC_PERF_REGS_H */
diff --git a/tools/perf/arch/powerpc/include/perf_regs.h b/tools/perf/arch/powerpc/include/perf_regs.h
index 1076393e6f43..e18a3556f5e3 100644
--- a/tools/perf/arch/powerpc/include/perf_regs.h
+++ b/tools/perf/arch/powerpc/include/perf_regs.h
@@ -63,7 +63,8 @@ static const char *reg_names[] = {
         [PERF_REG_POWERPC_TRAP] = "trap",
         [PERF_REG_POWERPC_DAR] = "dar",
         [PERF_REG_POWERPC_DSISR] = "dsisr",
-        [PERF_REG_POWERPC_SIER] = "sier"
+        [PERF_REG_POWERPC_SIER] = "sier",
+        [PERF_REG_POWERPC_MMCRA] = "mmcra"
 };
 
 static inline const char *perf_reg_name(int id)
diff --git a/tools/perf/arch/powerpc/util/perf_regs.c b/tools/perf/arch/powerpc/util/perf_regs.c
index 07fcd977d93e..34d5134681d9 100644
--- a/tools/perf/arch/powerpc/util/perf_regs.c
+++ b/tools/perf/arch/powerpc/util/perf_regs.c
@@ -53,6 +53,7 @@ const struct sample_reg sample_reg_masks[] = {
         SMPL_REG(dar, PERF_REG_POWERPC_DAR),
         SMPL_REG(dsisr, PERF_REG_POWERPC_DSISR),
         SMPL_REG(sier, PERF_REG_POWERPC_SIER),
+        SMPL_REG(mmcra, PERF_REG_POWERPC_MMCRA),
         SMPL_REG_END
 };