releases/4.11.2/perf-x86-fix-broadwell-ep-dram-rapl-events.patch

   1 From 33b88e708e7dfa58dc896da2a98f5719d2eb315c Mon Sep 17 00:00:00 2001
   2 From: Vince Weaver <vincent.weaver@maine.edu>
   3 Date: Tue, 2 May 2017 14:08:50 -0400
   4 Subject: perf/x86: Fix Broadwell-EP DRAM RAPL events
   5
   6 From: Vince Weaver <vincent.weaver@maine.edu>
   7
   8 commit 33b88e708e7dfa58dc896da2a98f5719d2eb315c upstream.
   9
  10 It appears as though the Broadwell-EP DRAM units share the special
  11 units quirk with Haswell-EP/KNL.
  12
  13 Without this patch, you get really high results (a single DRAM using 20W
  14 of power).
  15
  16 The powercap driver in drivers/powercap/intel_rapl.c already has this
  17 change.
  18
  19 Signed-off-by: Vince Weaver <vincent.weaver@maine.edu>
  20 Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
  21 Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
  22 Cc: Jiri Olsa <jolsa@redhat.com>
  23 Cc: Kan Liang <kan.liang@intel.com>
  24 Cc: Linus Torvalds <torvalds@linux-foundation.org>
  25 Cc: Peter Zijlstra <peterz@infradead.org>
  26 Cc: Stephane Eranian <eranian@gmail.com>
  27 Cc: Stephane Eranian <eranian@google.com>
  28 Cc: Thomas Gleixner <tglx@linutronix.de>
  29 Cc: linux-kernel@vger.kernel.org
  30 Signed-off-by: Ingo Molnar <mingo@kernel.org>
  31 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  32
  33 ---
  34  arch/x86/events/intel/rapl.c |    2 +-
  35  1 file changed, 1 insertion(+), 1 deletion(-)
  36
  37 --- a/arch/x86/events/intel/rapl.c
  38 +++ b/arch/x86/events/intel/rapl.c
  39 @@ -761,7 +761,7 @@ static const struct x86_cpu_id rapl_cpu_
  40
  41         X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_CORE,   hsw_rapl_init),
  42         X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_GT3E,   hsw_rapl_init),
  43 -       X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_X,      hsw_rapl_init),
  44 +       X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_X,      hsx_rapl_init),
  45         X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_XEON_D, hsw_rapl_init),
  46
  47         X86_RAPL_MODEL_MATCH(INTEL_FAM6_XEON_PHI_KNL, knl_rapl_init),