76 lines
2.3 KiB
Diff
76 lines
2.3 KiB
Diff
|
From 68614752b9fd6b6bae6f9ab7b02fc28350c5a541 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
|
||
|
|
Date: Fri, 13 Sep 2024 15:47:56 +0000
|
||
|
|
Subject: perf/x86/rapl: Make rapl_model struct global
|
||
|
|
|
||
|
|
Preparation for per-core energy counter support addition for AMD CPUs.
|
||
|
|
|
||
|
|
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>
|
||
|
|
---
|
||
|
|
arch/x86/events/rapl.c | 16 ++++++++--------
|
||
|
|
1 file changed, 8 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
--- a/arch/x86/events/rapl.c
|
||
|
|
+++ b/arch/x86/events/rapl.c
|
||
|
|
@@ -138,6 +138,7 @@ static struct rapl_pmus *rapl_pmus;
|
||
|
|
static unsigned int rapl_cntr_mask;
|
||
|
|
static u64 rapl_timer_ms;
|
||
|
|
static struct perf_msr *rapl_msrs;
|
||
|
|
+static struct rapl_model *rapl_model;
|
||
|
|
|
||
|
|
/*
|
||
|
|
* RAPL Package energy counter scope:
|
||
|
|
@@ -536,18 +537,18 @@ static struct perf_msr amd_rapl_msrs[] =
|
||
|
|
[PERF_RAPL_PSYS] = { 0, &rapl_events_psys_group, NULL, false, 0 },
|
||
|
|
};
|
||
|
|
|
||
|
|
-static int rapl_check_hw_unit(struct rapl_model *rm)
|
||
|
|
+static int rapl_check_hw_unit(void)
|
||
|
|
{
|
||
|
|
u64 msr_rapl_power_unit_bits;
|
||
|
|
int i;
|
||
|
|
|
||
|
|
/* protect rdmsrl() to handle virtualization */
|
||
|
|
- if (rdmsrl_safe(rm->msr_power_unit, &msr_rapl_power_unit_bits))
|
||
|
|
+ if (rdmsrl_safe(rapl_model->msr_power_unit, &msr_rapl_power_unit_bits))
|
||
|
|
return -1;
|
||
|
|
for (i = 0; i < NR_RAPL_DOMAINS; i++)
|
||
|
|
rapl_hw_unit[i] = (msr_rapl_power_unit_bits >> 8) & 0x1FULL;
|
||
|
|
|
||
|
|
- switch (rm->unit_quirk) {
|
||
|
|
+ switch (rapl_model->unit_quirk) {
|
||
|
|
/*
|
||
|
|
* DRAM domain on HSW server and KNL has fixed energy unit which can be
|
||
|
|
* different than the unit from power unit MSR. See
|
||
|
|
@@ -798,21 +799,20 @@ MODULE_DEVICE_TABLE(x86cpu, rapl_model_m
|
||
|
|
static int __init rapl_pmu_init(void)
|
||
|
|
{
|
||
|
|
const struct x86_cpu_id *id;
|
||
|
|
- struct rapl_model *rm;
|
||
|
|
int ret;
|
||
|
|
|
||
|
|
id = x86_match_cpu(rapl_model_match);
|
||
|
|
if (!id)
|
||
|
|
return -ENODEV;
|
||
|
|
|
||
|
|
- rm = (struct rapl_model *) id->driver_data;
|
||
|
|
+ rapl_model = (struct rapl_model *) id->driver_data;
|
||
|
|
|
||
|
|
- rapl_msrs = rm->rapl_msrs;
|
||
|
|
+ rapl_msrs = rapl_model->rapl_msrs;
|
||
|
|
|
||
|
|
rapl_cntr_mask = perf_msr_probe(rapl_msrs, PERF_RAPL_MAX,
|
||
|
|
- false, (void *) &rm->events);
|
||
|
|
+ false, (void *) &rapl_model->events);
|
||
|
|
|
||
|
|
- ret = rapl_check_hw_unit(rm);
|
||
|
|
+ ret = rapl_check_hw_unit();
|
||
|
|
if (ret)
|
||
|
|
return ret;
|
||
|
|
|