Commit bdc57ec7 authored by Dhananjay Ugwekar's avatar Dhananjay Ugwekar Committed by Peter Zijlstra
Browse files

perf/x86/rapl: Remove the global variable rapl_msrs 



Prepare for the addition of RAPL core energy counter support.

After making the rapl_model struct global, the rapl_msrs global
variable isn't needed, so remove it.

Signed-off-by: default avatarDhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatar"Gautham R. Shenoy" <gautham.shenoy@amd.com>
Reviewed-by: default avatarZhang Rui <rui.zhang@intel.com>
Tested-by: default avatarZhang Rui <rui.zhang@intel.com>
Link: https://lore.kernel.org/r/20241115060805.447565-9-Dhananjay.Ugwekar@amd.com
parent abf03d9b

arch/x86/events/rapl.c

+2 −5
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ static int rapl_pkg_hw_unit[NR_RAPL_PKG_DOMAINS] __read_mostly; 
static struct rapl_pmus *rapl_pmus_pkg;

static unsigned int rapl_pkg_cntr_mask;

static u64 rapl_timer_ms;

static struct perf_msr *rapl_msrs;

static struct rapl_model *rapl_model;



/*
@@ -382,7 +381,7 @@ static int rapl_pmu_event_init(struct perf_event *event) 
		return -EINVAL;



	event->pmu_private = rapl_pmu;

	event->hw.event_base = rapl_msrs[bit].msr;

	event->hw.event_base = rapl_model->rapl_pkg_msrs[bit].msr;

	event->hw.config = cfg;

	event->hw.idx = bit;
@@ -811,9 +810,7 @@ static int __init rapl_pmu_init(void) 


	rapl_model = (struct rapl_model *) id->driver_data;



	rapl_msrs = rapl_model->rapl_pkg_msrs;



	rapl_pkg_cntr_mask = perf_msr_probe(rapl_msrs, PERF_RAPL_PKG_EVENTS_MAX,

	rapl_pkg_cntr_mask = perf_msr_probe(rapl_model->rapl_pkg_msrs, PERF_RAPL_PKG_EVENTS_MAX,

					false, (void *) &rapl_model->pkg_events);



	ret = rapl_check_hw_unit();