Skip to content

Commit cd29d83

Browse files
dhananjay-AMDPeter Zijlstra
authored andcommitted
perf/x86/rapl: Make rapl_model struct global
Prepare for the addition of RAPL core energy counter support. As there will always be just one rapl_model variable on a system, make it global, to make it easier to access it from any function. No functional change. Signed-off-by: Dhananjay Ugwekar <Dhananjay.Ugwekar@amd.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Zhang Rui <rui.zhang@intel.com> Reviewed-by: "Gautham R. Shenoy" <gautham.shenoy@amd.com> Tested-by: Zhang Rui <rui.zhang@intel.com> Link: https://lore.kernel.org/r/20241115060805.447565-6-Dhananjay.Ugwekar@amd.com
1 parent 8bf1c86 commit cd29d83

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

arch/x86/events/rapl.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ static struct rapl_pmus *rapl_pmus;
151151
static unsigned int rapl_cntr_mask;
152152
static u64 rapl_timer_ms;
153153
static struct perf_msr *rapl_msrs;
154+
static struct rapl_model *rapl_model;
154155

155156
/*
156157
* Helper function to get the correct topology id according to the
@@ -542,18 +543,18 @@ static struct perf_msr amd_rapl_msrs[] = {
542543
[PERF_RAPL_PSYS] = { 0, &rapl_events_psys_group, NULL, false, 0 },
543544
};
544545

545-
static int rapl_check_hw_unit(struct rapl_model *rm)
546+
static int rapl_check_hw_unit(void)
546547
{
547548
u64 msr_rapl_power_unit_bits;
548549
int i;
549550

550551
/* protect rdmsrl() to handle virtualization */
551-
if (rdmsrl_safe(rm->msr_power_unit, &msr_rapl_power_unit_bits))
552+
if (rdmsrl_safe(rapl_model->msr_power_unit, &msr_rapl_power_unit_bits))
552553
return -1;
553554
for (i = 0; i < NR_RAPL_DOMAINS; i++)
554555
rapl_hw_unit[i] = (msr_rapl_power_unit_bits >> 8) & 0x1FULL;
555556

556-
switch (rm->unit_quirk) {
557+
switch (rapl_model->unit_quirk) {
557558
/*
558559
* DRAM domain on HSW server and KNL has fixed energy unit which can be
559560
* different than the unit from power unit MSR. See
@@ -798,21 +799,20 @@ MODULE_DEVICE_TABLE(x86cpu, rapl_model_match);
798799
static int __init rapl_pmu_init(void)
799800
{
800801
const struct x86_cpu_id *id;
801-
struct rapl_model *rm;
802802
int ret;
803803

804804
id = x86_match_cpu(rapl_model_match);
805805
if (!id)
806806
return -ENODEV;
807807

808-
rm = (struct rapl_model *) id->driver_data;
808+
rapl_model = (struct rapl_model *) id->driver_data;
809809

810-
rapl_msrs = rm->rapl_msrs;
810+
rapl_msrs = rapl_model->rapl_msrs;
811811

812812
rapl_cntr_mask = perf_msr_probe(rapl_msrs, PERF_RAPL_MAX,
813-
false, (void *) &rm->events);
813+
false, (void *) &rapl_model->events);
814814

815-
ret = rapl_check_hw_unit(rm);
815+
ret = rapl_check_hw_unit();
816816
if (ret)
817817
return ret;
818818

0 commit comments

Comments
 (0)