Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1df2e55a authored by Len Brown's avatar Len Brown
Browse files

tools/power turbostat: use new name for MSR_PKG_CST_CONFIG_CONTROL 



Previously called MSR_NHM_SNB_PKG_CST_CFG_CTL

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

tools/power/x86/turbostat/turbostat.c

+5 −5
Original line number Diff line number Diff line
@@ -1761,12 +1761,12 @@ dump_nhm_cst_cfg(void) 
{

	unsigned long long msr;



	get_msr(base_cpu, MSR_NHM_SNB_PKG_CST_CFG_CTL, &msr);

	get_msr(base_cpu, MSR_PKG_CST_CONFIG_CONTROL, &msr);



#define SNB_C1_AUTO_UNDEMOTE              (1UL << 27)

#define SNB_C3_AUTO_UNDEMOTE              (1UL << 28)



	fprintf(outf, "cpu%d: MSR_NHM_SNB_PKG_CST_CFG_CTL: 0x%08llx", base_cpu, msr);

	fprintf(outf, "cpu%d: MSR_PKG_CST_CONFIG_CONTROL: 0x%08llx", base_cpu, msr);



	fprintf(outf, " (%s%s%s%s%slocked: pkg-cstate-limit=%d: %s)\n",

		(msr & SNB_C3_AUTO_UNDEMOTE) ? "UNdemote-C3, " : "",
@@ -2383,7 +2383,7 @@ void check_permissions() 
 * MSR_SMI_COUNT                   0x00000034

 *

 * MSR_PLATFORM_INFO               0x000000ce

 * MSR_NHM_SNB_PKG_CST_CFG_CTL     0x000000e2

 * MSR_PKG_CST_CONFIG_CONTROL     0x000000e2

 *

 * MSR_MISC_PWR_MGMT               0x000001aa

 *
@@ -2393,7 +2393,7 @@ void check_permissions() 
 * MSR_CORE_C6_RESIDENCY           0x000003fd

 *

 * Side effect:

 * sets global pkg_cstate_limit to decode MSR_NHM_SNB_PKG_CST_CFG_CTL

 * sets global pkg_cstate_limit to decode MSR_PKG_CST_CONFIG_CONTROL

 */

int probe_nhm_msrs(unsigned int family, unsigned int model)

{
@@ -2462,7 +2462,7 @@ int probe_nhm_msrs(unsigned int family, unsigned int model) 
	default:

		return 0;

	}

	get_msr(base_cpu, MSR_NHM_SNB_PKG_CST_CFG_CTL, &msr);

	get_msr(base_cpu, MSR_PKG_CST_CONFIG_CONTROL, &msr);

	pkg_cstate_limit = pkg_cstate_limits[msr & 0xF];



	get_msr(base_cpu, MSR_PLATFORM_INFO, &msr);