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

Commit 6265adb9 authored by Masayoshi Mizuma's avatar Masayoshi Mizuma Committed by Ingo Molnar
Browse files

perf/x86/intel/uncore: Use boot_cpu_data.phys_proc_id instead of hardcorded physical package ID 0 



Physical package id 0 doesn't always exist, we should use
boot_cpu_data.phys_proc_id here.

Signed-off-by: default avatarMasayoshi Mizuma <m.mizuma@jp.fujitsu.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Masayoshi Mizuma <msys.mizuma@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Link: http://lkml.kernel.org/r/20180910144750.6782-1-msys.mizuma@gmail.com


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

arch/x86/events/intel/uncore_snbep.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3061,7 +3061,7 @@ static struct event_constraint bdx_uncore_pcu_constraints[] = { 




void bdx_uncore_cpu_init(void)

void bdx_uncore_cpu_init(void)

{

{

	int pkg = topology_phys_to_logical_pkg(0);

	int pkg = topology_phys_to_logical_pkg(boot_cpu_data.phys_proc_id);





	if (bdx_uncore_cbox.num_boxes > boot_cpu_data.x86_max_cores)

	if (bdx_uncore_cbox.num_boxes > boot_cpu_data.x86_max_cores)

		bdx_uncore_cbox.num_boxes = boot_cpu_data.x86_max_cores;

		bdx_uncore_cbox.num_boxes = boot_cpu_data.x86_max_cores;