| From 33b88e708e7dfa58dc896da2a98f5719d2eb315c Mon Sep 17 00:00:00 2001 |
| From: Vince Weaver <vincent.weaver@maine.edu> |
| Date: Tue, 2 May 2017 14:08:50 -0400 |
| Subject: [PATCH] perf/x86: Fix Broadwell-EP DRAM RAPL events |
| |
| commit 33b88e708e7dfa58dc896da2a98f5719d2eb315c upstream. |
| |
| It appears as though the Broadwell-EP DRAM units share the special |
| units quirk with Haswell-EP/KNL. |
| |
| Without this patch, you get really high results (a single DRAM using 20W |
| of power). |
| |
| The powercap driver in drivers/powercap/intel_rapl.c already has this |
| change. |
| |
| Signed-off-by: Vince Weaver <vincent.weaver@maine.edu> |
| Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> |
| Cc: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Cc: Jiri Olsa <jolsa@redhat.com> |
| Cc: Kan Liang <kan.liang@intel.com> |
| Cc: Linus Torvalds <torvalds@linux-foundation.org> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Cc: Stephane Eranian <eranian@gmail.com> |
| Cc: Stephane Eranian <eranian@google.com> |
| Cc: Thomas Gleixner <tglx@linutronix.de> |
| Cc: linux-kernel@vger.kernel.org |
| Cc: <stable@vger.kernel.org> |
| Signed-off-by: Ingo Molnar <mingo@kernel.org> |
| |
| diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c |
| index 9d05c7e67f60..a45e2114a846 100644 |
| --- a/arch/x86/events/intel/rapl.c |
| +++ b/arch/x86/events/intel/rapl.c |
| @@ -761,7 +761,7 @@ static const struct x86_cpu_id rapl_cpu_match[] __initconst = { |
| |
| X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_CORE, hsw_rapl_init), |
| X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_GT3E, hsw_rapl_init), |
| - X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_X, hsw_rapl_init), |
| + X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_X, hsx_rapl_init), |
| X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_XEON_D, hsw_rapl_init), |
| |
| X86_RAPL_MODEL_MATCH(INTEL_FAM6_XEON_PHI_KNL, knl_rapl_init), |
| -- |
| 2.12.0 |
| |