Skip to content

Commit

Permalink
tools/power/turbostat: Rename rapl probing function
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
zhang-rui committed Sep 27, 2023
1 parent 622c8f2 commit 6cb1360
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions tools/power/x86/turbostat/turbostat.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 6cb1360

Please sign in to comment.