From 88fa693f5ffd0415ff946e684facb4cbb95deb6f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 14 Jul 2014 16:43:11 -0700 Subject: [PATCH] 3.10-stable patches added patches: powerpc-perf-add-ppmu_arch_207s-define.patch --- ...werpc-perf-add-ppmu_arch_207s-define.patch | 58 +++++++++++++++++++ queue-3.10/series | 1 + 2 files changed, 59 insertions(+) create mode 100644 queue-3.10/powerpc-perf-add-ppmu_arch_207s-define.patch diff --git a/queue-3.10/powerpc-perf-add-ppmu_arch_207s-define.patch b/queue-3.10/powerpc-perf-add-ppmu_arch_207s-define.patch new file mode 100644 index 00000000000..c0a13275b7d --- /dev/null +++ b/queue-3.10/powerpc-perf-add-ppmu_arch_207s-define.patch @@ -0,0 +1,58 @@ +From 4d9690dd56b0d18f2af8a9d4a279cb205aae3345 Mon Sep 17 00:00:00 2001 +From: Joel Stanley +Date: Tue, 8 Jul 2014 16:08:21 +0930 +Subject: powerpc/perf: Add PPMU_ARCH_207S define + +From: Joel Stanley + +commit 4d9690dd56b0d18f2af8a9d4a279cb205aae3345 upstream. + +Instead of separate bits for every POWER8 PMU feature, have a single one +for v2.07 of the architecture. + +This saves us adding a MMCR2 define for a future patch. + +Signed-off-by: Joel Stanley +Acked-by: Michael Ellerman +Signed-off-by: Benjamin Herrenschmidt +Signed-off-by: Greg Kroah-Hartman + +--- + arch/powerpc/include/asm/perf_event_server.h | 2 +- + arch/powerpc/perf/core-book3s.c | 2 +- + arch/powerpc/perf/power8-pmu.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +--- a/arch/powerpc/include/asm/perf_event_server.h ++++ b/arch/powerpc/include/asm/perf_event_server.h +@@ -59,7 +59,7 @@ struct power_pmu { + #define PPMU_SIAR_VALID 0x00000010 /* Processor has SIAR Valid bit */ + #define PPMU_HAS_SSLOT 0x00000020 /* Has sampled slot in MMCRA */ + #define PPMU_HAS_SIER 0x00000040 /* Has SIER */ +-#define PPMU_BHRB 0x00000080 /* has BHRB feature enabled */ ++#define PPMU_ARCH_207S 0x00000080 /* PMC is architecture v2.07S */ + + /* + * Values for flags to get_alternatives() +--- a/arch/powerpc/perf/core-book3s.c ++++ b/arch/powerpc/perf/core-book3s.c +@@ -1436,7 +1436,7 @@ static int power_pmu_event_init(struct p + + if (has_branch_stack(event)) { + /* PMU has BHRB enabled */ +- if (!(ppmu->flags & PPMU_BHRB)) ++ if (!(ppmu->flags & PPMU_ARCH_207S)) + return -EOPNOTSUPP; + } + +--- a/arch/powerpc/perf/power8-pmu.c ++++ b/arch/powerpc/perf/power8-pmu.c +@@ -592,7 +592,7 @@ static struct power_pmu power8_pmu = { + .get_constraint = power8_get_constraint, + .get_alternatives = power8_get_alternatives, + .disable_pmc = power8_disable_pmc, +- .flags = PPMU_HAS_SSLOT | PPMU_HAS_SIER | PPMU_BHRB, ++ .flags = PPMU_HAS_SSLOT | PPMU_HAS_SIER | PPMU_ARCH_207S, + .n_generic = ARRAY_SIZE(power8_generic_events), + .generic_events = power8_generic_events, + .attr_groups = power8_pmu_attr_groups, diff --git a/queue-3.10/series b/queue-3.10/series index d299c4827fe..04fb23eb8fc 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -12,6 +12,7 @@ hwmon-adm1029-ensure-the-fan_div-cache-is-updated-in-set_fan_div.patch hwmon-adm1021-fix-cache-problem-when-writing-temperature-limits.patch acpi-resources-only-reject-zero-length-resources-based-at-address-zero.patch powerpc-perf-never-program-book3s-pmcs-with-values-0x80000000.patch +powerpc-perf-add-ppmu_arch_207s-define.patch powerpc-perf-clear-mmcr2-when-enabling-pmu.patch cpufreq-makefile-fix-compilation-for-davinci-platform.patch crypto-sha512_ssse3-fix-byte-count-to-bit-count-conversion.patch -- 2.47.3