Commit c7b01d3d authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6

* 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
  intel_idle: disable Atom/Lincroft HW C-state auto-demotion
  intel_idle: disable NHM/WSM HW C-state auto-demotion
parents ad4bfcb1 bfb53ccf
...@@ -36,6 +36,11 @@ ...@@ -36,6 +36,11 @@
#define MSR_IA32_PERFCTR1 0x000000c2 #define MSR_IA32_PERFCTR1 0x000000c2
#define MSR_FSB_FREQ 0x000000cd #define MSR_FSB_FREQ 0x000000cd
#define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2
#define NHM_C3_AUTO_DEMOTE (1UL << 25)
#define NHM_C1_AUTO_DEMOTE (1UL << 26)
#define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25)
#define MSR_MTRRcap 0x000000fe #define MSR_MTRRcap 0x000000fe
#define MSR_IA32_BBL_CR_CTL 0x00000119 #define MSR_IA32_BBL_CR_CTL 0x00000119
......
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/cpu.h> #include <linux/cpu.h>
#include <asm/mwait.h> #include <asm/mwait.h>
#include <asm/msr.h>
#define INTEL_IDLE_VERSION "0.4" #define INTEL_IDLE_VERSION "0.4"
#define PREFIX "intel_idle: " #define PREFIX "intel_idle: "
...@@ -84,6 +85,12 @@ static int intel_idle(struct cpuidle_device *dev, struct cpuidle_state *state); ...@@ -84,6 +85,12 @@ static int intel_idle(struct cpuidle_device *dev, struct cpuidle_state *state);
static struct cpuidle_state *cpuidle_state_table; static struct cpuidle_state *cpuidle_state_table;
/*
* Hardware C-state auto-demotion may not always be optimal.
* Indicate which enable bits to clear here.
*/
static unsigned long long auto_demotion_disable_flags;
/* /*
* Set this flag for states where the HW flushes the TLB for us * Set this flag for states where the HW flushes the TLB for us
* and so we don't need cross-calls to keep it consistent. * and so we don't need cross-calls to keep it consistent.
...@@ -281,6 +288,15 @@ static struct notifier_block setup_broadcast_notifier = { ...@@ -281,6 +288,15 @@ static struct notifier_block setup_broadcast_notifier = {
.notifier_call = setup_broadcast_cpuhp_notify, .notifier_call = setup_broadcast_cpuhp_notify,
}; };
static void auto_demotion_disable(void *dummy)
{
unsigned long long msr_bits;
rdmsrl(MSR_NHM_SNB_PKG_CST_CFG_CTL, msr_bits);
msr_bits &= ~auto_demotion_disable_flags;
wrmsrl(MSR_NHM_SNB_PKG_CST_CFG_CTL, msr_bits);
}
/* /*
* intel_idle_probe() * intel_idle_probe()
*/ */
...@@ -324,11 +340,17 @@ static int intel_idle_probe(void) ...@@ -324,11 +340,17 @@ static int intel_idle_probe(void)
case 0x25: /* Westmere */ case 0x25: /* Westmere */
case 0x2C: /* Westmere */ case 0x2C: /* Westmere */
cpuidle_state_table = nehalem_cstates; cpuidle_state_table = nehalem_cstates;
auto_demotion_disable_flags =
(NHM_C1_AUTO_DEMOTE | NHM_C3_AUTO_DEMOTE);
break; break;
case 0x1C: /* 28 - Atom Processor */ case 0x1C: /* 28 - Atom Processor */
cpuidle_state_table = atom_cstates;
break;
case 0x26: /* 38 - Lincroft Atom Processor */ case 0x26: /* 38 - Lincroft Atom Processor */
cpuidle_state_table = atom_cstates; cpuidle_state_table = atom_cstates;
auto_demotion_disable_flags = ATM_LNC_C6_AUTO_DEMOTE;
break; break;
case 0x2A: /* SNB */ case 0x2A: /* SNB */
...@@ -436,6 +458,8 @@ static int intel_idle_cpuidle_devices_init(void) ...@@ -436,6 +458,8 @@ static int intel_idle_cpuidle_devices_init(void)
return -EIO; return -EIO;
} }
} }
if (auto_demotion_disable_flags)
smp_call_function(auto_demotion_disable, NULL, 1);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment