lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

intel_idle: Revert change of auto_demotion_disable_flags for Nehalem

Browse Source 
Commit b66b8b9a4a ('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>
This commit is contained in:
Ben Hutchings
2012-02-16 04:13:14 +00:00
committed by Greg Kroah-Hartman
parent 9f3519d2ed
commit 8bf1193845
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/idle/intel_idle.c
View File

@@ -331,10 +331,6 @@ static void auto_demotion_disable(void *dummy)
static const struct idle_cpu idle_cpu_nehalem = { static const struct idle_cpu idle_cpu_nehalem = {
.state_table = nehalem_cstates, .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, .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(0x1a, idle_cpu_nehalem),
ICPU(0x1e, idle_cpu_nehalem), ICPU(0x1e, idle_cpu_nehalem),
ICPU(0x1f, idle_cpu_nehalem), ICPU(0x1f, idle_cpu_nehalem),
ICPU(0x25, idle_cpu_westmere), ICPU(0x25, idle_cpu_nehalem),
ICPU(0x2c, idle_cpu_westmere), ICPU(0x2c, idle_cpu_nehalem),
ICPU(0x2e, idle_cpu_westmere), ICPU(0x2e, idle_cpu_nehalem),
ICPU(0x1c, idle_cpu_atom), ICPU(0x1c, idle_cpu_atom),
ICPU(0x26, idle_cpu_lincroft), ICPU(0x26, idle_cpu_lincroft),
ICPU(0x2f, idle_cpu_westmere), ICPU(0x2f, idle_cpu_nehalem),
ICPU(0x2a, idle_cpu_snb), ICPU(0x2a, idle_cpu_snb),
ICPU(0x2d, idle_cpu_snb), ICPU(0x2d, idle_cpu_snb),
{} {}