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

Commit d7717587 authored by Stephane Eranian's avatar Stephane Eranian Committed by Thomas Gleixner
Browse files

perf/x86/intel/uncore: Revert "Remove SBOX support for Broadwell server" 



This reverts commit 3b94a891 ("perf/x86/intel/uncore: Remove
SBOX support for Broadwell server")

Revert because there exists a proper workaround for Broadwell-EP servers
without SBOX now. Note that BDX-DE does not have a SBOX.

Signed-off-by: default avatarStephane Eranian <eranian@google.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarKan Liang <kan.liang@intel.com>
Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
Cc: ak@linux.intel.com
Cc: osk@google.com
Cc: mark@voidzero.net
Link: https://lkml.kernel.org/r/1521810690-2576-1-git-send-email-kan.liang@linux.intel.com
parent 5c8dad48

arch/x86/events/intel/uncore_snbep.c

+21 −0
Original line number Diff line number Diff line
@@ -3028,10 +3028,27 @@ static struct intel_uncore_type bdx_uncore_cbox = { 
	.format_group		= &hswep_uncore_cbox_format_group,

};



static struct intel_uncore_type bdx_uncore_sbox = {

	.name			= "sbox",

	.num_counters		= 4,

	.num_boxes		= 4,

	.perf_ctr_bits		= 48,

	.event_ctl		= HSWEP_S0_MSR_PMON_CTL0,

	.perf_ctr		= HSWEP_S0_MSR_PMON_CTR0,

	.event_mask		= HSWEP_S_MSR_PMON_RAW_EVENT_MASK,

	.box_ctl		= HSWEP_S0_MSR_PMON_BOX_CTL,

	.msr_offset		= HSWEP_SBOX_MSR_OFFSET,

	.ops			= &hswep_uncore_sbox_msr_ops,

	.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,

	&hswep_uncore_pcu,

	&bdx_uncore_sbox,

	NULL,

};
@@ -3047,6 +3064,10 @@ void bdx_uncore_cpu_init(void) 
		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;



	hswep_uncore_pcu.constraints = bdx_uncore_pcu_constraints;

}