53 lines
1.8 KiB
Diff
53 lines
1.8 KiB
Diff
From: Ben Hutchings <ben@decadent.org.uk>
|
|
Date: Thu, 16 Feb 2012 04:13:14 +0000
|
|
Subject: intel_idle: Revert change of auto_demotion_disable_flags for Nehalem
|
|
|
|
commit 8bf11938459ff8ceb8643258d0a35e0f2bc9be17 upstream.
|
|
|
|
Commit b66b8b9a4a79087dde1b358a016e5c8739ccf186 ('intel-idle: convert
|
|
to x86_cpu_id auto probing') added a distinction between Nehalem and
|
|
Westemere processors and changed auto_demotion_disable_flags for the
|
|
former to 0. This was not explained in the commit message, so change
|
|
it back.
|
|
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
Acked-by: Thomas Renninger <trenn@suse.de>
|
|
Acked-by: H. Peter Anvin <hpa@zytor.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/idle/intel_idle.c | 12 ++++--------
|
|
1 file changed, 4 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
|
|
index a238649..1c15e9b 100644
|
|
--- a/drivers/idle/intel_idle.c
|
|
+++ b/drivers/idle/intel_idle.c
|
|
@@ -331,10 +331,6 @@ static void auto_demotion_disable(void *dummy)
|
|
|
|
static const struct idle_cpu idle_cpu_nehalem = {
|
|
.state_table = nehalem_cstates,
|
|
-};
|
|
-
|
|
-static const struct idle_cpu idle_cpu_westmere = {
|
|
- .state_table = nehalem_cstates,
|
|
.auto_demotion_disable_flags = NHM_C1_AUTO_DEMOTE | NHM_C3_AUTO_DEMOTE,
|
|
};
|
|
|
|
@@ -358,12 +354,12 @@ static const struct x86_cpu_id intel_idle_ids[] = {
|
|
ICPU(0x1a, idle_cpu_nehalem),
|
|
ICPU(0x1e, idle_cpu_nehalem),
|
|
ICPU(0x1f, idle_cpu_nehalem),
|
|
- ICPU(0x25, idle_cpu_westmere),
|
|
- ICPU(0x2c, idle_cpu_westmere),
|
|
- ICPU(0x2e, idle_cpu_westmere),
|
|
+ ICPU(0x25, idle_cpu_nehalem),
|
|
+ ICPU(0x2c, idle_cpu_nehalem),
|
|
+ ICPU(0x2e, idle_cpu_nehalem),
|
|
ICPU(0x1c, idle_cpu_atom),
|
|
ICPU(0x26, idle_cpu_lincroft),
|
|
- ICPU(0x2f, idle_cpu_westmere),
|
|
+ ICPU(0x2f, idle_cpu_nehalem),
|
|
ICPU(0x2a, idle_cpu_snb),
|
|
ICPU(0x2d, idle_cpu_snb),
|
|
{}
|