From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from terminus.zytor.com ([65.50.211.136]:57079 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751666AbdECM5T (ORCPT ); Wed, 3 May 2017 08:57:19 -0400 Date: Wed, 3 May 2017 05:50:34 -0700 From: tip-bot for Vince Weaver Message-ID: Cc: eranian@gmail.com, peterz@infradead.org, alexander.shishkin@linux.intel.com, torvalds@linux-foundation.org, jolsa@redhat.com, acme@redhat.com, vincent.weaver@maine.edu, kan.liang@intel.com, eranian@google.com, hpa@zytor.com, mingo@kernel.org, stable@vger.kernel.org, tglx@linutronix.de Reply-To: stable@vger.kernel.org, tglx@linutronix.de, kan.liang@intel.com, eranian@google.com, hpa@zytor.com, mingo@kernel.org, jolsa@redhat.com, vincent.weaver@maine.edu, acme@redhat.com, eranian@gmail.com, peterz@infradead.org, alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf/x86: Fix Broadwell-EP DRAM RAPL events MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: stable-owner@vger.kernel.org List-ID: Commit-ID: 33b88e708e7dfa58dc896da2a98f5719d2eb315c Gitweb: http://git.kernel.org/tip/33b88e708e7dfa58dc896da2a98f5719d2eb315c Author: Vince Weaver AuthorDate: Tue, 2 May 2017 14:08:50 -0400 Committer: Ingo Molnar CommitDate: Wed, 3 May 2017 14:40:37 +0200 perf/x86: Fix Broadwell-EP DRAM RAPL events 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 Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Kan Liang Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Stephane Eranian Cc: Thomas Gleixner Cc: linux-kernel@vger.kernel.org Cc: Signed-off-by: Ingo Molnar --- arch/x86/events/intel/rapl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c index 9d05c7e..a45e211 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),