From: Like Xu <likexu@xxxxxxxxxxx>
Add a helper to get the index of a fixed counter instead of manually
calculating the index, a future patch will add more users of the fixed
counter MSRs.
No functional change intended.
Signed-off-by: Like Xu <likexu@xxxxxxxxxxx>
[sean: move to separate patch, write changelog]
Signed-off-by: Sean Christopherson <seanjc@xxxxxxxxxx>
---
lib/x86/pmu.h | 5 +++++
x86/pmu.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/lib/x86/pmu.h b/lib/x86/pmu.h
index c98c583c..091e61b3 100644
--- a/lib/x86/pmu.h
+++ b/lib/x86/pmu.h
@@ -91,4 +91,9 @@ static inline bool pmu_use_full_writes(void)
return pmu.msr_gp_counter_base == MSR_IA32_PMC0;
}
+static inline u32 MSR_PERF_FIXED_CTRx(unsigned int i)
+{
+ return MSR_CORE_PERF_FIXED_CTR0 + i;
+}
+
#endif /* _X86_PMU_H_ */
diff --git a/x86/pmu.c b/x86/pmu.c
index d66786be..eb83c407 100644
--- a/x86/pmu.c
+++ b/x86/pmu.c
@@ -390,7 +390,7 @@ static void check_rdpmc(void)
.idx = i
};
- wrmsr(MSR_CORE_PERF_FIXED_CTR0 + i, x);
+ wrmsr(MSR_PERF_FIXED_CTRx(i), x);
report(rdpmc(i | (1 << 30)) == x, "fixed cntr-%d", i);
exc = test_for_exception(GP_VECTOR, do_rdpmc_fast, &cnt);
--
2.38.1.431.g37b22c650d-goog
