From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754115AbcB2LDf (ORCPT ); Mon, 29 Feb 2016 06:03:35 -0500 Received: from torg.zytor.com ([198.137.202.12]:53156 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753628AbcB2LDc (ORCPT ); Mon, 29 Feb 2016 06:03:32 -0500 Date: Mon, 29 Feb 2016 03:02:42 -0800 From: tip-bot for Kan Liang Message-ID: Cc: hpa@zytor.com, acme@redhat.com, tonyb@cybernetics.com, kan.liang@intel.com, stable@vger.kernel.org, mingo@kernel.org, peterz@infradead.org, eranian@google.com, torvalds@linux-foundation.org, vincent.weaver@maine.edu, linux-kernel@vger.kernel.org, tglx@linutronix.de, jolsa@redhat.com Reply-To: hpa@zytor.com, acme@redhat.com, stable@vger.kernel.org, kan.liang@intel.com, tonyb@cybernetics.com, eranian@google.com, mingo@kernel.org, peterz@infradead.org, tglx@linutronix.de, jolsa@redhat.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, vincent.weaver@maine.edu In-Reply-To: <37D7C6CF3E00A74B8858931C1DB2F0770589D336@SHSMSX103.ccr.corp.intel.com> References: <37D7C6CF3E00A74B8858931C1DB2F0770589D336@SHSMSX103.ccr.corp.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86/intel/uncore: Remove SBOX support for BDX-DE Git-Commit-ID: 6cb2f1d9af5b0f0afdd4e689d969df4b5c76a4c2 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 6cb2f1d9af5b0f0afdd4e689d969df4b5c76a4c2 Gitweb: http://git.kernel.org/tip/6cb2f1d9af5b0f0afdd4e689d969df4b5c76a4c2 Author: Kan Liang AuthorDate: Wed, 24 Feb 2016 05:07:43 -0500 Committer: Ingo Molnar CommitDate: Mon, 29 Feb 2016 09:35:11 +0100 perf/x86/intel/uncore: Remove SBOX support for BDX-DE BDX-DE and BDX-EP share the same uncore code path. But there is no sbox in BDX-DE. This patch remove SBOX support for BDX-DE. Signed-off-by: Kan Liang Signed-off-by: Peter Zijlstra (Intel) Cc: Cc: Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Tony Battersby Cc: Vince Weaver Link: http://lkml.kernel.org/r/37D7C6CF3E00A74B8858931C1DB2F0770589D336@SHSMSX103.ccr.corp.intel.com Signed-off-by: Ingo Molnar --- arch/x86/events/intel/uncore_snbep.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c index 0c801f7..d967fcc 100644 --- a/arch/x86/events/intel/uncore_snbep.c +++ b/arch/x86/events/intel/uncore_snbep.c @@ -2874,11 +2874,13 @@ static struct intel_uncore_type bdx_uncore_sbox = { .format_group = &hswep_uncore_sbox_format_group, }; +#define BDX_MSR_UNCORE_SBOX 3 + static struct intel_uncore_type *bdx_msr_uncores[] = { &bdx_uncore_ubox, &bdx_uncore_cbox, - &bdx_uncore_sbox, &hswep_uncore_pcu, + &bdx_uncore_sbox, NULL, }; @@ -2887,6 +2889,10 @@ void bdx_uncore_cpu_init(void) if (bdx_uncore_cbox.num_boxes > boot_cpu_data.x86_max_cores) bdx_uncore_cbox.num_boxes = boot_cpu_data.x86_max_cores; uncore_msr_uncores = bdx_msr_uncores; + + /* BDX-DE doesn't have SBOX */ + if (boot_cpu_data.x86_model == 86) + uncore_msr_uncores[BDX_MSR_UNCORE_SBOX] = NULL; } static struct intel_uncore_type bdx_uncore_ha = {