Commit 67920418 authored by Len Brown's avatar Len Brown
Browse files

tools/power turbostat: decode MSR_IA32_POWER_CTL 



When verbose is enabled, print the C1E-Enable
bit in MSR_IA32_POWER_CTL.

also delete some redundant tests on the verbose variable.

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

arch/x86/include/uapi/asm/msr-index.h

+2 −0
Original line number Diff line number Diff line
@@ -103,6 +103,8 @@ 
#define DEBUGCTLMSR_BTS_OFF_USR		(1UL << 10)

#define DEBUGCTLMSR_FREEZE_LBRS_ON_PMI	(1UL << 11)



#define MSR_IA32_POWER_CTL		0x000001fc



#define MSR_IA32_MC0_CTL		0x00000400

#define MSR_IA32_MC0_STATUS		0x00000401

#define MSR_IA32_MC0_ADDR		0x00000402

tools/power/x86/turbostat/turbostat.c

+7 −6
Original line number Diff line number Diff line
@@ -908,7 +908,6 @@ void print_verbose_header(void) 


	get_msr(0, MSR_NHM_PLATFORM_INFO, &msr);



	if (verbose)

	fprintf(stderr, "cpu0: MSR_NHM_PLATFORM_INFO: 0x%08llx\n", msr);



	ratio = (msr >> 40) & 0xFF;
@@ -919,12 +918,15 @@ void print_verbose_header(void) 
	fprintf(stderr, "%d * %.0f = %.0f MHz TSC frequency\n",

		ratio, bclk, ratio * bclk);



	get_msr(0, MSR_IA32_POWER_CTL, &msr);

	fprintf(stderr, "cpu0: MSR_IA32_POWER_CTL: 0x%08llx (C1E: %sabled)\n",

		msr, msr & 0x2 ? "EN" : "DIS");



	if (!do_ivt_turbo_ratio_limit)

		goto print_nhm_turbo_ratio_limits;



	get_msr(0, MSR_IVT_TURBO_RATIO_LIMIT, &msr);



	if (verbose)

	fprintf(stderr, "cpu0: MSR_IVT_TURBO_RATIO_LIMIT: 0x%08llx\n", msr);



	ratio = (msr >> 56) & 0xFF;
@@ -1016,7 +1018,6 @@ print_nhm_turbo_ratio_limits: 


	get_msr(0, MSR_NHM_TURBO_RATIO_LIMIT, &msr);



	if (verbose)

	fprintf(stderr, "cpu0: MSR_NHM_TURBO_RATIO_LIMIT: 0x%08llx\n", msr);



	ratio = (msr >> 56) & 0xFF;

CRA Git | Maintained and supported by SUSTech CRA and CCSE