Commit-ID: 6cb2f1d9af5b0f0afdd4e689d969df4b5c76a4c2 Gitweb: http://git.kernel.org/tip/6cb2f1d9af5b0f0afdd4e689d969df4b5c76a4c2 Author: Kan Liang <kan.li...@intel.com> AuthorDate: Wed, 24 Feb 2016 05:07:43 -0500 Committer: Ingo Molnar <mi...@kernel.org> 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 <kan.li...@intel.com> Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org> Cc: <sta...@vger.kernel.org> Cc: <to...@cybernetics.com> Cc: Arnaldo Carvalho de Melo <a...@redhat.com> Cc: Jiri Olsa <jo...@redhat.com> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Stephane Eranian <eran...@google.com> Cc: Thomas Gleixner <t...@linutronix.de> Cc: Tony Battersby <to...@cybernetics.com> Cc: Vince Weaver <vincent.wea...@maine.edu> Link: http://lkml.kernel.org/r/37d7c6cf3e00a74b8858931c1db2f0770589d...@shsmsx103.ccr.corp.intel.com Signed-off-by: Ingo Molnar <mi...@kernel.org> --- 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 = {
