summaryrefslogtreecommitdiffstats
path: root/tools/power
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2019-03-19 17:52:32 -0400
committerLen Brown <len.brown@intel.com>2019-03-20 22:55:43 -0400
commit562855eeb1136009bc9d597116ac5829bf82dd06 (patch)
tree9ebe351c64ae2514b4002708a98b23c5d119447d /tools/power
parentdf2f677dee3ce4afda7ee561dd4f321c40320afd (diff)
downloadlinux-stable-562855eeb1136009bc9d597116ac5829bf82dd06.tar.gz
linux-stable-562855eeb1136009bc9d597116ac5829bf82dd06.tar.bz2
linux-stable-562855eeb1136009bc9d597116ac5829bf82dd06.zip
tools/power turbostat: Cleanup CC3-skip code
no functional change Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'tools/power')
-rw-r--r--tools/power/x86/turbostat/turbostat.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 78d88b7d4e98..861cb795679b 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -666,7 +666,7 @@ void print_header(char *delim)
if (DO_BIC(BIC_CPU_c1))
outp += sprintf(outp, "%sCPU%%c1", (printed++ ? delim : ""));
- if (DO_BIC(BIC_CPU_c3) && !do_slm_cstates && !do_knl_cstates && !do_cnl_cstates)
+ if (DO_BIC(BIC_CPU_c3))
outp += sprintf(outp, "%sCPU%%c3", (printed++ ? delim : ""));
if (DO_BIC(BIC_CPU_c6))
outp += sprintf(outp, "%sCPU%%c6", (printed++ ? delim : ""));
@@ -1002,7 +1002,7 @@ int format_counters(struct thread_data *t, struct core_data *c,
if (!(t->flags & CPU_IS_FIRST_THREAD_IN_CORE))
goto done;
- if (DO_BIC(BIC_CPU_c3) && !do_slm_cstates && !do_knl_cstates && !do_cnl_cstates)
+ if (DO_BIC(BIC_CPU_c3))
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), 100.0 * c->c3/tsc);
if (DO_BIC(BIC_CPU_c6))
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), 100.0 * c->c6/tsc);
@@ -1817,7 +1817,7 @@ retry:
if (!(t->flags & CPU_IS_FIRST_THREAD_IN_CORE))
goto done;
- if (DO_BIC(BIC_CPU_c3) && !do_slm_cstates && !do_knl_cstates && !do_cnl_cstates) {
+ if (DO_BIC(BIC_CPU_c3)) {
if (get_msr(cpu, MSR_CORE_C3_RESIDENCY, &c->c3))
return -6;
}
@@ -4703,6 +4703,9 @@ void process_cpuid()
do_knl_cstates = is_knl(family, model);
do_cnl_cstates = is_cnl(family, model);
+ if (do_slm_cstates || do_knl_cstates || do_cnl_cstates)
+ BIC_NOT_PRESENT(BIC_CPU_c3);
+
if (!quiet)
decode_misc_pwr_mgmt_msr();