summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2017-01-07 23:23:25 -0500
committerLen Brown <len.brown@intel.com>2017-03-01 00:13:17 -0500
commit6cfb2374f83bc70b8acb0ddb989988ba3f140b61 (patch)
tree7cd1f6ef54a259ff115610b2bace5ad42765e2bd
parent40496c8ee73a5ca4fa581badf2247418980586b1 (diff)
downloadlinux-stable-6cfb2374f83bc70b8acb0ddb989988ba3f140b61.tar.gz
linux-stable-6cfb2374f83bc70b8acb0ddb989988ba3f140b61.tar.bz2
linux-stable-6cfb2374f83bc70b8acb0ddb989988ba3f140b61.zip
intel_idle: use new name for MSR_PKG_CST_CONFIG_CONTROL
previously known as MSR_NHM_SNB_PKG_CST_CFG_CTL Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/idle/intel_idle.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 7d8ea3d5fda6..930537da76d4 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -961,9 +961,9 @@ static void auto_demotion_disable(void)
{
unsigned long long msr_bits;
- rdmsrl(MSR_NHM_SNB_PKG_CST_CFG_CTL, msr_bits);
+ rdmsrl(MSR_PKG_CST_CONFIG_CONTROL, msr_bits);
msr_bits &= ~(icpu->auto_demotion_disable_flags);
- wrmsrl(MSR_NHM_SNB_PKG_CST_CFG_CTL, msr_bits);
+ wrmsrl(MSR_PKG_CST_CONFIG_CONTROL, msr_bits);
}
static void c1e_promotion_disable(void)
{
@@ -1273,7 +1273,7 @@ static void sklh_idle_state_table_update(void)
if ((mwait_substates & (0xF << 28)) == 0)
return;
- rdmsrl(MSR_NHM_SNB_PKG_CST_CFG_CTL, msr);
+ rdmsrl(MSR_PKG_CST_CONFIG_CONTROL, msr);
/* PC10 is not enabled in PKG C-state limit */
if ((msr & 0xF) != 8)