Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cb2f1d9 authored by Kan Liang's avatar Kan Liang Committed by Ingo Molnar
Browse files

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: default avatarKan Liang <kan.liang@intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: <stable@vger.kernel.org>
Cc: <tonyb@cybernetics.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Battersby <tonyb@cybernetics.com>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Link: http://lkml.kernel.org/r/37D7C6CF3E00A74B8858931C1DB2F0770589D336@SHSMSX103.ccr.corp.intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 0a734892

arch/x86/events/intel/uncore_snbep.c

+7 −1
Original line number Diff line number Diff line
@@ -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 = {