Skip to content

Commit

Permalink
tools/power turbostat: Do not dump TRL if turbo is not supported
Browse files Browse the repository at this point in the history
Do not dump turbo ratio limits if platform does not support turbo, because it
is confusing and the TRL MSRs may even include misleading information. And they
are not supposed to be relied on if turbo is not supported.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Artem Bityutskiy authored and Len Brown committed Oct 4, 2022
1 parent 8e45a9b commit 3ea8e52
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions tools/power/x86/turbostat/turbostat.c
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ unsigned int do_slm_cstates;
unsigned int use_c1_residency_msr;
unsigned int has_aperf;
unsigned int has_epb;
unsigned int has_turbo;
unsigned int is_hybrid;
unsigned int do_irtl_snb;
unsigned int do_irtl_hsw;
Expand Down Expand Up @@ -4080,13 +4081,11 @@ static void remove_underbar(char *s)
*to = 0;
}

static void dump_cstate_pstate_config_info(unsigned int family, unsigned int model)
static void dump_turbo_ratio_info(unsigned int family, unsigned int model)
{
if (!do_nhm_platform_info)
if (!has_turbo)
return;

dump_nhm_platform_info();

if (has_hsw_turbo_ratio_limit(family, model))
dump_hsw_turbo_ratio_limits();

Expand All @@ -4108,7 +4107,15 @@ static void dump_cstate_pstate_config_info(unsigned int family, unsigned int mod

if (has_config_tdp(family, model))
dump_config_tdp();
}

static void dump_cstate_pstate_config_info(unsigned int family, unsigned int model)
{
if (!do_nhm_platform_info)
return;

dump_nhm_platform_info();
dump_turbo_ratio_info(family, model);
dump_nhm_cst_cfg();
}

Expand Down Expand Up @@ -5508,7 +5515,6 @@ void process_cpuid()
{
unsigned int eax, ebx, ecx, edx;
unsigned int fms, family, model, stepping, ecx_flags, edx_flags;
unsigned int has_turbo;
unsigned long long ucode_patch = 0;

eax = ebx = ecx = edx = 0;
Expand Down

0 comments on commit 3ea8e52

Please sign in to comment.