OSDN Git Service

powerpc/perf: factor out power8 pmu macros and defines
authorMadhavan Srinivasan <maddy@linux.vnet.ibm.com>
Sun, 26 Jun 2016 17:37:04 +0000 (23:07 +0530)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 5 Jul 2016 13:49:46 +0000 (23:49 +1000)
Factor out some of the power8 pmu macros to
new a header file to share with power9 pmu code.
Just code movement and no logic change.

Signed-off-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/perf/isa207-common.h [new file with mode: 0644]
arch/powerpc/perf/power8-pmu.c

diff --git a/arch/powerpc/perf/isa207-common.h b/arch/powerpc/perf/isa207-common.h
new file mode 100644 (file)
index 0000000..03205f5
--- /dev/null
@@ -0,0 +1,230 @@
+/*
+ * Copyright 2009 Paul Mackerras, IBM Corporation.
+ * Copyright 2013 Michael Ellerman, IBM Corporation.
+ * Copyright 2016 Madhavan Srinivasan, IBM Corporation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or any later version.
+ */
+
+#ifndef _LINUX_POWERPC_PERF_ISA207_COMMON_H_
+#define _LINUX_POWERPC_PERF_ISA207_COMMON_H_
+
+#include <linux/kernel.h>
+#include <linux/perf_event.h>
+#include <asm/firmware.h>
+#include <asm/cputable.h>
+
+/*
+ * Raw event encoding for PowerISA v2.07:
+ *
+ *        60        56        52        48        44        40        36        32
+ * | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - |
+ *   | | [ ]                           [      thresh_cmp     ]   [  thresh_ctl   ]
+ *   | |  |                                                              |
+ *   | |  *- IFM (Linux)                 thresh start/stop OR FAB match -*
+ *   | *- BHRB (Linux)
+ *   *- EBB (Linux)
+ *
+ *        28        24        20        16        12         8         4         0
+ * | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - |
+ *   [   ] [  sample ]   [cache]   [ pmc ]   [unit ]   c     m   [    pmcxsel    ]
+ *     |        |           |                          |     |
+ *     |        |           |                          |     *- mark
+ *     |        |           *- L1/L2/L3 cache_sel      |
+ *     |        |                                      |
+ *     |        *- sampling mode for marked events     *- combine
+ *     |
+ *     *- thresh_sel
+ *
+ * Below uses IBM bit numbering.
+ *
+ * MMCR1[x:y] = unit    (PMCxUNIT)
+ * MMCR1[x]   = combine (PMCxCOMB)
+ *
+ * if pmc == 3 and unit == 0 and pmcxsel[0:6] == 0b0101011
+ *     # PM_MRK_FAB_RSP_MATCH
+ *     MMCR1[20:27] = thresh_ctl   (FAB_CRESP_MATCH / FAB_TYPE_MATCH)
+ * else if pmc == 4 and unit == 0xf and pmcxsel[0:6] == 0b0101001
+ *     # PM_MRK_FAB_RSP_MATCH_CYC
+ *     MMCR1[20:27] = thresh_ctl   (FAB_CRESP_MATCH / FAB_TYPE_MATCH)
+ * else
+ *     MMCRA[48:55] = thresh_ctl   (THRESH START/END)
+ *
+ * if thresh_sel:
+ *     MMCRA[45:47] = thresh_sel
+ *
+ * if thresh_cmp:
+ *     MMCRA[22:24] = thresh_cmp[0:2]
+ *     MMCRA[25:31] = thresh_cmp[3:9]
+ *
+ * if unit == 6 or unit == 7
+ *     MMCRC[53:55] = cache_sel[1:3]      (L2EVENT_SEL)
+ * else if unit == 8 or unit == 9:
+ *     if cache_sel[0] == 0: # L3 bank
+ *             MMCRC[47:49] = cache_sel[1:3]  (L3EVENT_SEL0)
+ *     else if cache_sel[0] == 1:
+ *             MMCRC[50:51] = cache_sel[2:3]  (L3EVENT_SEL1)
+ * else if cache_sel[1]: # L1 event
+ *     MMCR1[16] = cache_sel[2]
+ *    MMCR1[17] = cache_sel[3]
+ *
+ * if mark:
+ *     MMCRA[63]    = 1                (SAMPLE_ENABLE)
+ *     MMCRA[57:59] = sample[0:2]      (RAND_SAMP_ELIG)
+ *    MMCRA[61:62] = sample[3:4]      (RAND_SAMP_MODE)
+ *
+ * if EBB and BHRB:
+ *     MMCRA[32:33] = IFM
+ *
+ */
+
+#define EVENT_EBB_MASK         1ull
+#define EVENT_EBB_SHIFT                PERF_EVENT_CONFIG_EBB_SHIFT
+#define EVENT_BHRB_MASK                1ull
+#define EVENT_BHRB_SHIFT       62
+#define EVENT_WANTS_BHRB       (EVENT_BHRB_MASK << EVENT_BHRB_SHIFT)
+#define EVENT_IFM_MASK         3ull
+#define EVENT_IFM_SHIFT                60
+#define EVENT_THR_CMP_SHIFT    40      /* Threshold CMP value */
+#define EVENT_THR_CMP_MASK     0x3ff
+#define EVENT_THR_CTL_SHIFT    32      /* Threshold control value (start/stop) */
+#define EVENT_THR_CTL_MASK     0xffull
+#define EVENT_THR_SEL_SHIFT    29      /* Threshold select value */
+#define EVENT_THR_SEL_MASK     0x7
+#define EVENT_THRESH_SHIFT     29      /* All threshold bits */
+#define EVENT_THRESH_MASK      0x1fffffull
+#define EVENT_SAMPLE_SHIFT     24      /* Sampling mode & eligibility */
+#define EVENT_SAMPLE_MASK      0x1f
+#define EVENT_CACHE_SEL_SHIFT  20      /* L2/L3 cache select */
+#define EVENT_CACHE_SEL_MASK   0xf
+#define EVENT_IS_L1            (4 << EVENT_CACHE_SEL_SHIFT)
+#define EVENT_PMC_SHIFT                16      /* PMC number (1-based) */
+#define EVENT_PMC_MASK         0xf
+#define EVENT_UNIT_SHIFT       12      /* Unit */
+#define EVENT_UNIT_MASK                0xf
+#define EVENT_COMBINE_SHIFT    11      /* Combine bit */
+#define EVENT_COMBINE_MASK     0x1
+#define EVENT_MARKED_SHIFT     8       /* Marked bit */
+#define EVENT_MARKED_MASK      0x1
+#define EVENT_IS_MARKED                (EVENT_MARKED_MASK << EVENT_MARKED_SHIFT)
+#define EVENT_PSEL_MASK                0xff    /* PMCxSEL value */
+
+/* Bits defined by Linux */
+#define EVENT_LINUX_MASK       \
+       ((EVENT_EBB_MASK  << EVENT_EBB_SHIFT)                   |       \
+        (EVENT_BHRB_MASK << EVENT_BHRB_SHIFT)                  |       \
+        (EVENT_IFM_MASK  << EVENT_IFM_SHIFT))
+
+#define EVENT_VALID_MASK       \
+       ((EVENT_THRESH_MASK    << EVENT_THRESH_SHIFT)           |       \
+        (EVENT_SAMPLE_MASK    << EVENT_SAMPLE_SHIFT)           |       \
+        (EVENT_CACHE_SEL_MASK << EVENT_CACHE_SEL_SHIFT)        |       \
+        (EVENT_PMC_MASK       << EVENT_PMC_SHIFT)              |       \
+        (EVENT_UNIT_MASK      << EVENT_UNIT_SHIFT)             |       \
+        (EVENT_COMBINE_MASK   << EVENT_COMBINE_SHIFT)          |       \
+        (EVENT_MARKED_MASK    << EVENT_MARKED_SHIFT)           |       \
+         EVENT_LINUX_MASK                                      |       \
+         EVENT_PSEL_MASK)
+
+#define ONLY_PLM \
+       (PERF_SAMPLE_BRANCH_USER        |\
+        PERF_SAMPLE_BRANCH_KERNEL      |\
+        PERF_SAMPLE_BRANCH_HV)
+
+/*
+ * Layout of constraint bits:
+ *
+ *        60        56        52        48        44        40        36        32
+ * | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - |
+ *   [   fab_match   ]         [       thresh_cmp      ] [   thresh_ctl    ] [   ]
+ *                                                                             |
+ *                                                                 thresh_sel -*
+ *
+ *        28        24        20        16        12         8         4         0
+ * | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - |
+ *               [ ] |   [ ]   [  sample ]   [     ]   [6] [5]   [4] [3]   [2] [1]
+ *                |  |    |                     |
+ *      BHRB IFM -*  |    |                     |      Count of events for each PMC.
+ *              EBB -*    |                     |        p1, p2, p3, p4, p5, p6.
+ *      L1 I/D qualifier -*                     |
+ *                     nc - number of counters -*
+ *
+ * The PMC fields P1..P6, and NC, are adder fields. As we accumulate constraints
+ * we want the low bit of each field to be added to any existing value.
+ *
+ * Everything else is a value field.
+ */
+
+#define CNST_FAB_MATCH_VAL(v)  (((v) & EVENT_THR_CTL_MASK) << 56)
+#define CNST_FAB_MATCH_MASK    CNST_FAB_MATCH_VAL(EVENT_THR_CTL_MASK)
+
+/* We just throw all the threshold bits into the constraint */
+#define CNST_THRESH_VAL(v)     (((v) & EVENT_THRESH_MASK) << 32)
+#define CNST_THRESH_MASK       CNST_THRESH_VAL(EVENT_THRESH_MASK)
+
+#define CNST_EBB_VAL(v)                (((v) & EVENT_EBB_MASK) << 24)
+#define CNST_EBB_MASK          CNST_EBB_VAL(EVENT_EBB_MASK)
+
+#define CNST_IFM_VAL(v)                (((v) & EVENT_IFM_MASK) << 25)
+#define CNST_IFM_MASK          CNST_IFM_VAL(EVENT_IFM_MASK)
+
+#define CNST_L1_QUAL_VAL(v)    (((v) & 3) << 22)
+#define CNST_L1_QUAL_MASK      CNST_L1_QUAL_VAL(3)
+
+#define CNST_SAMPLE_VAL(v)     (((v) & EVENT_SAMPLE_MASK) << 16)
+#define CNST_SAMPLE_MASK       CNST_SAMPLE_VAL(EVENT_SAMPLE_MASK)
+
+/*
+ * For NC we are counting up to 4 events. This requires three bits, and we need
+ * the fifth event to overflow and set the 4th bit. To achieve that we bias the
+ * fields by 3 in test_adder.
+ */
+#define CNST_NC_SHIFT          12
+#define CNST_NC_VAL            (1 << CNST_NC_SHIFT)
+#define CNST_NC_MASK           (8 << CNST_NC_SHIFT)
+#define ISA207_TEST_ADDER      (3 << CNST_NC_SHIFT)
+
+/*
+ * For the per-PMC fields we have two bits. The low bit is added, so if two
+ * events ask for the same PMC the sum will overflow, setting the high bit,
+ * indicating an error. So our mask sets the high bit.
+ */
+#define CNST_PMC_SHIFT(pmc)    ((pmc - 1) * 2)
+#define CNST_PMC_VAL(pmc)      (1 << CNST_PMC_SHIFT(pmc))
+#define CNST_PMC_MASK(pmc)     (2 << CNST_PMC_SHIFT(pmc))
+
+/* Our add_fields is defined as: */
+#define ISA207_ADD_FIELDS      \
+       CNST_PMC_VAL(1) | CNST_PMC_VAL(2) | CNST_PMC_VAL(3) | \
+       CNST_PMC_VAL(4) | CNST_PMC_VAL(5) | CNST_PMC_VAL(6) | CNST_NC_VAL
+
+
+/* Bits in MMCR1 for PowerISA v2.07 */
+#define MMCR1_UNIT_SHIFT(pmc)          (60 - (4 * ((pmc) - 1)))
+#define MMCR1_COMBINE_SHIFT(pmc)       (35 - ((pmc) - 1))
+#define MMCR1_PMCSEL_SHIFT(pmc)                (24 - (((pmc) - 1)) * 8)
+#define MMCR1_FAB_SHIFT                        36
+#define MMCR1_DC_QUAL_SHIFT            47
+#define MMCR1_IC_QUAL_SHIFT            46
+
+/* Bits in MMCRA for PowerISA v2.07 */
+#define MMCRA_SAMP_MODE_SHIFT          1
+#define MMCRA_SAMP_ELIG_SHIFT          4
+#define MMCRA_THR_CTL_SHIFT            8
+#define MMCRA_THR_SEL_SHIFT            16
+#define MMCRA_THR_CMP_SHIFT            32
+#define MMCRA_SDAR_MODE_TLB            (1ull << 42)
+#define MMCRA_IFM_SHIFT                        30
+
+/* Bits in MMCR2 for PowerISA v2.07 */
+#define MMCR2_FCS(pmc)                 (1ull << (63 - (((pmc) - 1) * 9)))
+#define MMCR2_FCP(pmc)                 (1ull << (62 - (((pmc) - 1) * 9)))
+#define MMCR2_FCH(pmc)                 (1ull << (57 - (((pmc) - 1) * 9)))
+
+#define MAX_ALT                                2
+#define MAX_PMU_COUNTERS               6
+
+#endif
index 7cf3b43..4303e9b 100644 (file)
 
 #define pr_fmt(fmt)    "power8-pmu: " fmt
 
-#include <linux/kernel.h>
-#include <linux/perf_event.h>
-#include <asm/firmware.h>
-#include <asm/cputable.h>
+#include "isa207-common.h"
 
 /*
  * Some power8 event codes.
@@ -28,219 +25,11 @@ enum {
 
 #undef EVENT
 
-/*
- * Raw event encoding for POWER8:
- *
- *        60        56        52        48        44        40        36        32
- * | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - |
- *   | | [ ]                           [      thresh_cmp     ]   [  thresh_ctl   ]
- *   | |  |                                                              |
- *   | |  *- IFM (Linux)                 thresh start/stop OR FAB match -*
- *   | *- BHRB (Linux)
- *   *- EBB (Linux)
- *
- *        28        24        20        16        12         8         4         0
- * | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - |
- *   [   ] [  sample ]   [cache]   [ pmc ]   [unit ]   c     m   [    pmcxsel    ]
- *     |        |           |                          |     |
- *     |        |           |                          |     *- mark
- *     |        |           *- L1/L2/L3 cache_sel      |
- *     |        |                                      |
- *     |        *- sampling mode for marked events     *- combine
- *     |
- *     *- thresh_sel
- *
- * Below uses IBM bit numbering.
- *
- * MMCR1[x:y] = unit    (PMCxUNIT)
- * MMCR1[x]   = combine (PMCxCOMB)
- *
- * if pmc == 3 and unit == 0 and pmcxsel[0:6] == 0b0101011
- *     # PM_MRK_FAB_RSP_MATCH
- *     MMCR1[20:27] = thresh_ctl   (FAB_CRESP_MATCH / FAB_TYPE_MATCH)
- * else if pmc == 4 and unit == 0xf and pmcxsel[0:6] == 0b0101001
- *     # PM_MRK_FAB_RSP_MATCH_CYC
- *     MMCR1[20:27] = thresh_ctl   (FAB_CRESP_MATCH / FAB_TYPE_MATCH)
- * else
- *     MMCRA[48:55] = thresh_ctl   (THRESH START/END)
- *
- * if thresh_sel:
- *     MMCRA[45:47] = thresh_sel
- *
- * if thresh_cmp:
- *     MMCRA[22:24] = thresh_cmp[0:2]
- *     MMCRA[25:31] = thresh_cmp[3:9]
- *
- * if unit == 6 or unit == 7
- *     MMCRC[53:55] = cache_sel[1:3]      (L2EVENT_SEL)
- * else if unit == 8 or unit == 9:
- *     if cache_sel[0] == 0: # L3 bank
- *             MMCRC[47:49] = cache_sel[1:3]  (L3EVENT_SEL0)
- *     else if cache_sel[0] == 1:
- *             MMCRC[50:51] = cache_sel[2:3]  (L3EVENT_SEL1)
- * else if cache_sel[1]: # L1 event
- *     MMCR1[16] = cache_sel[2]
- *    MMCR1[17] = cache_sel[3]
- *
- * if mark:
- *     MMCRA[63]    = 1                (SAMPLE_ENABLE)
- *     MMCRA[57:59] = sample[0:2]      (RAND_SAMP_ELIG)
- *    MMCRA[61:62] = sample[3:4]      (RAND_SAMP_MODE)
- *
- * if EBB and BHRB:
- *     MMCRA[32:33] = IFM
- *
- */
-
-#define EVENT_EBB_MASK         1ull
-#define EVENT_EBB_SHIFT                PERF_EVENT_CONFIG_EBB_SHIFT
-#define EVENT_BHRB_MASK                1ull
-#define EVENT_BHRB_SHIFT       62
-#define EVENT_WANTS_BHRB       (EVENT_BHRB_MASK << EVENT_BHRB_SHIFT)
-#define EVENT_IFM_MASK         3ull
-#define EVENT_IFM_SHIFT                60
-#define EVENT_THR_CMP_SHIFT    40      /* Threshold CMP value */
-#define EVENT_THR_CMP_MASK     0x3ff
-#define EVENT_THR_CTL_SHIFT    32      /* Threshold control value (start/stop) */
-#define EVENT_THR_CTL_MASK     0xffull
-#define EVENT_THR_SEL_SHIFT    29      /* Threshold select value */
-#define EVENT_THR_SEL_MASK     0x7
-#define EVENT_THRESH_SHIFT     29      /* All threshold bits */
-#define EVENT_THRESH_MASK      0x1fffffull
-#define EVENT_SAMPLE_SHIFT     24      /* Sampling mode & eligibility */
-#define EVENT_SAMPLE_MASK      0x1f
-#define EVENT_CACHE_SEL_SHIFT  20      /* L2/L3 cache select */
-#define EVENT_CACHE_SEL_MASK   0xf
-#define EVENT_IS_L1            (4 << EVENT_CACHE_SEL_SHIFT)
-#define EVENT_PMC_SHIFT                16      /* PMC number (1-based) */
-#define EVENT_PMC_MASK         0xf
-#define EVENT_UNIT_SHIFT       12      /* Unit */
-#define EVENT_UNIT_MASK                0xf
-#define EVENT_COMBINE_SHIFT    11      /* Combine bit */
-#define EVENT_COMBINE_MASK     0x1
-#define EVENT_MARKED_SHIFT     8       /* Marked bit */
-#define EVENT_MARKED_MASK      0x1
-#define EVENT_IS_MARKED                (EVENT_MARKED_MASK << EVENT_MARKED_SHIFT)
-#define EVENT_PSEL_MASK                0xff    /* PMCxSEL value */
-
-/* Bits defined by Linux */
-#define EVENT_LINUX_MASK       \
-       ((EVENT_EBB_MASK  << EVENT_EBB_SHIFT)                   |       \
-        (EVENT_BHRB_MASK << EVENT_BHRB_SHIFT)                  |       \
-        (EVENT_IFM_MASK  << EVENT_IFM_SHIFT))
-
-#define EVENT_VALID_MASK       \
-       ((EVENT_THRESH_MASK    << EVENT_THRESH_SHIFT)           |       \
-        (EVENT_SAMPLE_MASK    << EVENT_SAMPLE_SHIFT)           |       \
-        (EVENT_CACHE_SEL_MASK << EVENT_CACHE_SEL_SHIFT)        |       \
-        (EVENT_PMC_MASK       << EVENT_PMC_SHIFT)              |       \
-        (EVENT_UNIT_MASK      << EVENT_UNIT_SHIFT)             |       \
-        (EVENT_COMBINE_MASK   << EVENT_COMBINE_SHIFT)          |       \
-        (EVENT_MARKED_MASK    << EVENT_MARKED_SHIFT)           |       \
-         EVENT_LINUX_MASK                                      |       \
-         EVENT_PSEL_MASK)
-
 /* MMCRA IFM bits - POWER8 */
 #define        POWER8_MMCRA_IFM1               0x0000000040000000UL
 #define        POWER8_MMCRA_IFM2               0x0000000080000000UL
 #define        POWER8_MMCRA_IFM3               0x00000000C0000000UL
 
-#define ONLY_PLM \
-       (PERF_SAMPLE_BRANCH_USER        |\
-        PERF_SAMPLE_BRANCH_KERNEL      |\
-        PERF_SAMPLE_BRANCH_HV)
-
-/*
- * Layout of constraint bits:
- *
- *        60        56        52        48        44        40        36        32
- * | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - |
- *   [   fab_match   ]         [       thresh_cmp      ] [   thresh_ctl    ] [   ]
- *                                                                             |
- *                                                                 thresh_sel -*
- *
- *        28        24        20        16        12         8         4         0
- * | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - |
- *               [ ] |   [ ]   [  sample ]   [     ]   [6] [5]   [4] [3]   [2] [1]
- *                |  |    |                     |
- *      BHRB IFM -*  |    |                     |      Count of events for each PMC.
- *              EBB -*    |                     |        p1, p2, p3, p4, p5, p6.
- *      L1 I/D qualifier -*                     |
- *                     nc - number of counters -*
- *
- * The PMC fields P1..P6, and NC, are adder fields. As we accumulate constraints
- * we want the low bit of each field to be added to any existing value.
- *
- * Everything else is a value field.
- */
-
-#define CNST_FAB_MATCH_VAL(v)  (((v) & EVENT_THR_CTL_MASK) << 56)
-#define CNST_FAB_MATCH_MASK    CNST_FAB_MATCH_VAL(EVENT_THR_CTL_MASK)
-
-/* We just throw all the threshold bits into the constraint */
-#define CNST_THRESH_VAL(v)     (((v) & EVENT_THRESH_MASK) << 32)
-#define CNST_THRESH_MASK       CNST_THRESH_VAL(EVENT_THRESH_MASK)
-
-#define CNST_EBB_VAL(v)                (((v) & EVENT_EBB_MASK) << 24)
-#define CNST_EBB_MASK          CNST_EBB_VAL(EVENT_EBB_MASK)
-
-#define CNST_IFM_VAL(v)                (((v) & EVENT_IFM_MASK) << 25)
-#define CNST_IFM_MASK          CNST_IFM_VAL(EVENT_IFM_MASK)
-
-#define CNST_L1_QUAL_VAL(v)    (((v) & 3) << 22)
-#define CNST_L1_QUAL_MASK      CNST_L1_QUAL_VAL(3)
-
-#define CNST_SAMPLE_VAL(v)     (((v) & EVENT_SAMPLE_MASK) << 16)
-#define CNST_SAMPLE_MASK       CNST_SAMPLE_VAL(EVENT_SAMPLE_MASK)
-
-/*
- * For NC we are counting up to 4 events. This requires three bits, and we need
- * the fifth event to overflow and set the 4th bit. To achieve that we bias the
- * fields by 3 in test_adder.
- */
-#define CNST_NC_SHIFT          12
-#define CNST_NC_VAL            (1 << CNST_NC_SHIFT)
-#define CNST_NC_MASK           (8 << CNST_NC_SHIFT)
-#define POWER8_TEST_ADDER      (3 << CNST_NC_SHIFT)
-
-/*
- * For the per-PMC fields we have two bits. The low bit is added, so if two
- * events ask for the same PMC the sum will overflow, setting the high bit,
- * indicating an error. So our mask sets the high bit.
- */
-#define CNST_PMC_SHIFT(pmc)    ((pmc - 1) * 2)
-#define CNST_PMC_VAL(pmc)      (1 << CNST_PMC_SHIFT(pmc))
-#define CNST_PMC_MASK(pmc)     (2 << CNST_PMC_SHIFT(pmc))
-
-/* Our add_fields is defined as: */
-#define POWER8_ADD_FIELDS      \
-       CNST_PMC_VAL(1) | CNST_PMC_VAL(2) | CNST_PMC_VAL(3) | \
-       CNST_PMC_VAL(4) | CNST_PMC_VAL(5) | CNST_PMC_VAL(6) | CNST_NC_VAL
-
-
-/* Bits in MMCR1 for POWER8 */
-#define MMCR1_UNIT_SHIFT(pmc)          (60 - (4 * ((pmc) - 1)))
-#define MMCR1_COMBINE_SHIFT(pmc)       (35 - ((pmc) - 1))
-#define MMCR1_PMCSEL_SHIFT(pmc)                (24 - (((pmc) - 1)) * 8)
-#define MMCR1_FAB_SHIFT                        36
-#define MMCR1_DC_QUAL_SHIFT            47
-#define MMCR1_IC_QUAL_SHIFT            46
-
-/* Bits in MMCRA for POWER8 */
-#define MMCRA_SAMP_MODE_SHIFT          1
-#define MMCRA_SAMP_ELIG_SHIFT          4
-#define MMCRA_THR_CTL_SHIFT            8
-#define MMCRA_THR_SEL_SHIFT            16
-#define MMCRA_THR_CMP_SHIFT            32
-#define MMCRA_SDAR_MODE_TLB            (1ull << 42)
-#define MMCRA_IFM_SHIFT                        30
-
-/* Bits in MMCR2 for POWER8 */
-#define MMCR2_FCS(pmc)                 (1ull << (63 - (((pmc) - 1) * 9)))
-#define MMCR2_FCP(pmc)                 (1ull << (62 - (((pmc) - 1) * 9)))
-#define MMCR2_FCH(pmc)                 (1ull << (57 - (((pmc) - 1) * 9)))
-
-
 static inline bool event_is_fab_match(u64 event)
 {
        /* Only check pmc, unit and pmcxsel, ignore the edge bit (0) */
@@ -485,8 +274,6 @@ static int power8_compute_mmcr(u64 event[], int n_ev,
        return 0;
 }
 
-#define MAX_ALT        2
-
 /* Table of alternatives, sorted by column 0 */
 static const unsigned int event_alternatives[][MAX_ALT] = {
        { PM_MRK_ST_CMPL,               PM_MRK_ST_CMPL_ALT },
@@ -841,10 +628,10 @@ static int power8_cache_events[C(MAX)][C(OP_MAX)][C(RESULT_MAX)] = {
 
 static struct power_pmu power8_pmu = {
        .name                   = "POWER8",
-       .n_counter              = 6,
+       .n_counter              = MAX_PMU_COUNTERS,
        .max_alternatives       = MAX_ALT + 1,
-       .add_fields             = POWER8_ADD_FIELDS,
-       .test_adder             = POWER8_TEST_ADDER,
+       .add_fields             = ISA207_ADD_FIELDS,
+       .test_adder             = ISA207_TEST_ADDER,
        .compute_mmcr           = power8_compute_mmcr,
        .config_bhrb            = power8_config_bhrb,
        .bhrb_filter_map        = power8_bhrb_filter_map,