dlan17/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools/power turbostat: Always check rapl_joules flag

Browse Source 
rapl_joules bit should always be checked even if
platform_features->rapl_msrs is not set or no_msr flag is used.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Zhang Rui
2025-06-08 14:10:16 -04:00
committed by Len Brown
parent adb49732c8
commit fdea6b883b
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/power/x86/turbostat/turbostat.c
+9 -3
View File
@@ -7302,6 +7302,9 @@ void rapl_probe_intel(void)
else
bic_enabled &= ~bic_joules_bits;
if (!platform->rapl_msrs || no_msr)
return;
if (!(platform->rapl_msrs & RAPL_PKG_PERF_STATUS))
bic_enabled &= ~BIC_PKG__;
if (!(platform->rapl_msrs & RAPL_DRAM_PERF_STATUS))
@@ -7352,6 +7355,9 @@ void rapl_probe_amd(void)
else
bic_enabled &= ~bic_joules_bits;
if (!platform->rapl_msrs || no_msr)
return;
if (get_msr(base_cpu, MSR_RAPL_PWR_UNIT, &msr))
return;
@@ -7504,9 +7510,6 @@ int print_rapl(struct thread_data *t, struct core_data *c, struct pkg_data *p)
*/
void probe_rapl(void)
{
if (!platform->rapl_msrs || no_msr)
return;
if (genuine_intel)
rapl_probe_intel();
if (authentic_amd || hygon_genuine)
@@ -7515,6 +7518,9 @@ void probe_rapl(void)
if (quiet)
return;
if (!platform->rapl_msrs || no_msr)
return;
for_all_cpus(print_rapl, ODD_COUNTERS);
}