Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 14:43:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tools/power/turbostat: Relocate more probing related code

Browse Source 
Relocate more feature probing code outside of process_cpuids() into the
corresponding probing functions.

This improves the readability of code and the turbostat output.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Reviewed-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Zhang Rui 2023-08-30 16:54:51 +08:00
parent ce7a32c2a4
commit 5612b2c89b
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tools/power/x86/turbostat/turbostat.c
View File

@ -5023,6 +5023,11 @@ void probe_rapl(void)
rapl_probe_intel(); rapl_probe_intel();
if (authentic_amd || hygon_genuine) if (authentic_amd || hygon_genuine)
rapl_probe_amd(); rapl_probe_amd();
if (quiet)
return;
for_all_cpus(print_rapl, ODD_COUNTERS);
} }
/* /*
@ -5173,6 +5178,13 @@ void probe_thermal(void)
BIC_PRESENT(BIC_CORE_THROT_CNT); BIC_PRESENT(BIC_CORE_THROT_CNT);
else else
BIC_NOT_PRESENT(BIC_CORE_THROT_CNT); BIC_NOT_PRESENT(BIC_CORE_THROT_CNT);
for_all_cpus(set_temperature_target, ODD_COUNTERS);
if (quiet)
return;
for_all_cpus(print_thermal, ODD_COUNTERS);
} }
int get_cpu_type(struct thread_data *t, struct core_data *c, struct pkg_data *p) int get_cpu_type(struct thread_data *t, struct core_data *c, struct pkg_data *p)
@ -5380,6 +5392,7 @@ void probe_cstates(void)
decode_c6_demotion_policy_msr(); decode_c6_demotion_policy_msr();
print_dev_latency(); print_dev_latency();
dump_sysfs_cstate_config(); dump_sysfs_cstate_config();
print_irtl();
} }
void probe_lpi(void) void probe_lpi(void)
@ -5413,6 +5426,10 @@ void probe_pstates(void)
dump_turbo_ratio_info(); dump_turbo_ratio_info();
dump_sysfs_pstate_config(); dump_sysfs_pstate_config();
decode_misc_pwr_mgmt_msr(); decode_misc_pwr_mgmt_msr();
for_all_cpus(print_hwp, ODD_COUNTERS);
for_all_cpus(print_epb, ODD_COUNTERS);
for_all_cpus(print_perf_limit, ODD_COUNTERS);
} }
void process_cpuid() void process_cpuid()
@ -5897,29 +5914,9 @@ void turbostat_init()
process_cpuid(); process_cpuid();
linux_perf_init(); linux_perf_init();
if (!quiet)
for_all_cpus(print_hwp, ODD_COUNTERS);
if (!quiet)
for_all_cpus(print_epb, ODD_COUNTERS);
if (!quiet)
for_all_cpus(print_perf_limit, ODD_COUNTERS);
if (!quiet)
for_all_cpus(print_rapl, ODD_COUNTERS);
for_all_cpus(set_temperature_target, ODD_COUNTERS);
for_all_cpus(get_cpu_type, ODD_COUNTERS); for_all_cpus(get_cpu_type, ODD_COUNTERS);
for_all_cpus(get_cpu_type, EVEN_COUNTERS); for_all_cpus(get_cpu_type, EVEN_COUNTERS);
if (!quiet)
for_all_cpus(print_thermal, ODD_COUNTERS);
if (!quiet)
print_irtl();
if (DO_BIC(BIC_IPC)) if (DO_BIC(BIC_IPC))
(void)get_instr_count_fd(base_cpu); (void)get_instr_count_fd(base_cpu);
} }