diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-11-17 14:25:38 -0500 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-11-17 14:25:38 -0500 |
| commit | 98b8bb7d3cdd7515e7381b7cb1ff28d739323118 (patch) | |
| tree | f6ffd697df8f1086cc56cfd09615aed1ee7658d8 /arch/powerpc | |
| parent | 17f20526b684528ca4dd7bc61c95f7689e4a0d66 (diff) | |
| parent | 4d4a6a3f8a12602ce8dc800123715fe7b5c1c3a1 (diff) | |
Merge tag 'v4.9.58' into v4.9-rt
This is the 4.9.58 stable release
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/perf/isa207-common.h | 4 | ||||
| -rw-r--r-- | arch/powerpc/perf/power9-pmu.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/perf/isa207-common.h b/arch/powerpc/perf/isa207-common.h index 4d0a4e5017c2..8e6dd17fe603 100644 --- a/arch/powerpc/perf/isa207-common.h +++ b/arch/powerpc/perf/isa207-common.h @@ -201,6 +201,10 @@ 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 +/* + * Lets restrict use of PMC5 for instruction counting. + */ +#define P9_DD1_TEST_ADDER (ISA207_TEST_ADDER | CNST_PMC_VAL(5)) /* Bits in MMCR1 for PowerISA v2.07 */ #define MMCR1_UNIT_SHIFT(pmc) (60 - (4 * ((pmc) - 1))) diff --git a/arch/powerpc/perf/power9-pmu.c b/arch/powerpc/perf/power9-pmu.c index 8e9a81967ff8..9abcd8f65504 100644 --- a/arch/powerpc/perf/power9-pmu.c +++ b/arch/powerpc/perf/power9-pmu.c @@ -295,7 +295,7 @@ static struct power_pmu power9_pmu = { .name = "POWER9", .n_counter = MAX_PMU_COUNTERS, .add_fields = ISA207_ADD_FIELDS, - .test_adder = ISA207_TEST_ADDER, + .test_adder = P9_DD1_TEST_ADDER, .compute_mmcr = isa207_compute_mmcr, .config_bhrb = power9_config_bhrb, .bhrb_filter_map = power9_bhrb_filter_map, |