1 files changed, 72 insertions, 8 deletions

diff --git a/arch/powerpc/perf/power7-pmu.c b/arch/powerpc/perf/power7-pmu.c
index 2ee01e38d5e2..b554879bd31e 100644
--- a/arch/powerpc/perf/power7-pmu.c
+++ b/arch/powerpc/perf/power7-pmu.c
@@ -51,6 +51,18 @@
 #define MMCR1_PMCSEL_MSK        0xff
 
 /*
+ * Power7 event codes.
+ */
+#define PME_PM_CYC                      0x1e
+#define PME_PM_GCT_NOSLOT_CYC           0x100f8
+#define PME_PM_CMPLU_STALL              0x4000a
+#define PME_PM_INST_CMPL                0x2
+#define PME_PM_LD_REF_L1                0xc880
+#define PME_PM_LD_MISS_L1               0x400f0
+#define PME_PM_BRU_FIN                  0x10068
+#define PME_PM_BRU_MPRED                0x400f6
+
+/*
  * Layout of constraint bits:
  * 6666555555555544444444443333333333222222222211111111110000000000
  * 3210987654321098765432109876543210987654321098765432109876543210
@@ -307,14 +319,14 @@ static void power7_disable_pmc(unsigned int pmc, unsigned long mmcr[])
 }
 
 static int power7_generic_events[] = {
-        [PERF_COUNT_HW_CPU_CYCLES] = 0x1e,
-        [PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = 0x100f8, /* GCT_NOSLOT_CYC */
-        [PERF_COUNT_HW_STALLED_CYCLES_BACKEND] = 0x4000a,  /* CMPLU_STALL */
-        [PERF_COUNT_HW_INSTRUCTIONS] = 2,
-        [PERF_COUNT_HW_CACHE_REFERENCES] = 0xc880,      /* LD_REF_L1_LSU*/
-        [PERF_COUNT_HW_CACHE_MISSES] = 0x400f0,         /* LD_MISS_L1   */
-        [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = 0x10068,  /* BRU_FIN      */
-        [PERF_COUNT_HW_BRANCH_MISSES] = 0x400f6,        /* BR_MPRED     */
+        [PERF_COUNT_HW_CPU_CYCLES] =                    PME_PM_CYC,
+        [PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] =       PME_PM_GCT_NOSLOT_CYC,
+        [PERF_COUNT_HW_STALLED_CYCLES_BACKEND] =        PME_PM_CMPLU_STALL,
+        [PERF_COUNT_HW_INSTRUCTIONS] =                  PME_PM_INST_CMPL,
+        [PERF_COUNT_HW_CACHE_REFERENCES] =              PME_PM_LD_REF_L1,
+        [PERF_COUNT_HW_CACHE_MISSES] =                  PME_PM_LD_MISS_L1,
+        [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] =           PME_PM_BRU_FIN,
+        [PERF_COUNT_HW_BRANCH_MISSES] =                 PME_PM_BRU_MPRED,
 };
 
 #define C(x)    PERF_COUNT_HW_CACHE_##x
@@ -362,6 +374,57 @@ static int power7_cache_events[C(MAX)][C(OP_MAX)][C(RESULT_MAX)] = {
         },
 };
 
+
+GENERIC_EVENT_ATTR(cpu-cycles,                  CYC);
+GENERIC_EVENT_ATTR(stalled-cycles-frontend,     GCT_NOSLOT_CYC);
+GENERIC_EVENT_ATTR(stalled-cycles-backend,      CMPLU_STALL);
+GENERIC_EVENT_ATTR(instructions,                INST_CMPL);
+GENERIC_EVENT_ATTR(cache-references,            LD_REF_L1);
+GENERIC_EVENT_ATTR(cache-misses,                LD_MISS_L1);
+GENERIC_EVENT_ATTR(branch-instructions,         BRU_FIN);
+GENERIC_EVENT_ATTR(branch-misses,               BRU_MPRED);
+
+POWER_EVENT_ATTR(CYC,                           CYC);
+POWER_EVENT_ATTR(GCT_NOSLOT_CYC,                GCT_NOSLOT_CYC);
+POWER_EVENT_ATTR(CMPLU_STALL,                   CMPLU_STALL);
+POWER_EVENT_ATTR(INST_CMPL,                     INST_CMPL);
+POWER_EVENT_ATTR(LD_REF_L1,                     LD_REF_L1);
+POWER_EVENT_ATTR(LD_MISS_L1,                    LD_MISS_L1);
+POWER_EVENT_ATTR(BRU_FIN,                       BRU_FIN)
+POWER_EVENT_ATTR(BRU_MPRED,                     BRU_MPRED);
+
+static struct attribute *power7_events_attr[] = {
+        GENERIC_EVENT_PTR(CYC),
+        GENERIC_EVENT_PTR(GCT_NOSLOT_CYC),
+        GENERIC_EVENT_PTR(CMPLU_STALL),
+        GENERIC_EVENT_PTR(INST_CMPL),
+        GENERIC_EVENT_PTR(LD_REF_L1),
+        GENERIC_EVENT_PTR(LD_MISS_L1),
+        GENERIC_EVENT_PTR(BRU_FIN),
+        GENERIC_EVENT_PTR(BRU_MPRED),
+
+        POWER_EVENT_PTR(CYC),
+        POWER_EVENT_PTR(GCT_NOSLOT_CYC),
+        POWER_EVENT_PTR(CMPLU_STALL),
+        POWER_EVENT_PTR(INST_CMPL),
+        POWER_EVENT_PTR(LD_REF_L1),
+        POWER_EVENT_PTR(LD_MISS_L1),
+        POWER_EVENT_PTR(BRU_FIN),
+        POWER_EVENT_PTR(BRU_MPRED),
+        NULL
+};
+
+
+static struct attribute_group power7_pmu_events_group = {
+        .name = "events",
+        .attrs = power7_events_attr,
+};
+
+static const struct attribute_group *power7_pmu_attr_groups[] = {
+        &power7_pmu_events_group,
+        NULL,
+};
+
 static struct power_pmu power7_pmu = {
         .name                   = "POWER7",
         .n_counter              = 6,
@@ -373,6 +436,7 @@ static struct power_pmu power7_pmu = {
         .get_alternatives       = power7_get_alternatives,
         .disable_pmc            = power7_disable_pmc,
         .flags                  = PPMU_ALT_SIPR,
+        .attr_groups            = power7_pmu_attr_groups,
         .n_generic              = ARRAY_SIZE(power7_generic_events),
         .generic_events         = power7_generic_events,
         .cache_events           = &power7_cache_events,