Commit 562855ee authored by Len Brown's avatar Len Brown
Browse files

tools/power turbostat: Cleanup CC3-skip code 



no functional change

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent df2f677d

tools/power/x86/turbostat/turbostat.c

+6 −3
Original line number Diff line number Diff line
@@ -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 @@ int get_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p) 
	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();