diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2023-08-31 10:00:33 +0200 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2023-09-27 16:14:20 +0200 |
| commit | 6cb13609a07ba466b4613fdce7da8c98508069b7 (patch) | |
| tree | 267418301e2035a543e098699346af37bd92d247 /tools | |
| parent | tools/power/turbostat: Rename uncore probing function (diff) | |
| download | linux-6cb13609a07ba466b4613fdce7da8c98508069b7.tar.xz linux-6cb13609a07ba466b4613fdce7da8c98508069b7.zip | |
tools/power/turbostat: Rename rapl probing function
Rename rapl_probe() to probe_rapl() to be consistent with other probing
function names.
Probe rapl after probing uncore frequency.
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Reviewed-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/power/x86/turbostat/turbostat.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index a956a30d81de..bf2b1d1b2627 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -4865,11 +4865,11 @@ void rapl_probe_amd(void) } /* - * rapl_probe() + * probe_rapl() * * sets rapl_power_units, rapl_energy_units, rapl_time_units */ -void rapl_probe(void) +void probe_rapl(void) { if (!platform->rapl_msrs) return; @@ -5558,11 +5558,11 @@ void process_cpuid() probe_intel_uncore_frequency(); + probe_rapl(); + if (platform->has_nhm_msrs) BIC_PRESENT(BIC_SMI); - rapl_probe(); - if (!access("/sys/class/drm/card0/power/rc6_residency_ms", R_OK)) BIC_PRESENT(BIC_GFX_rc6); |