lkml.org 
[lkml]   [2012]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH 4/5] intel_idle: Revert change of auto_demotion_flags for Nehalem
From
Date
Commit b66b8b9a4a79087dde1b358a016e5c8739ccf186 ('intel-idle: convert
to x86_cpu_id auto probing') added a distinction between Nehalem and
Westemere processors and changed auto_demotion_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>
---
I have very little idea what I'm doing here...

Ben.

drivers/idle/intel_idle.c | 12 ++++--------
1 files 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),
{}
--
1.7.9




\
 
 \ /
  Last update: 2012-02-11 23:57    [W:0.103 / U:1.488 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site