[PATCH 2/2] x86, AMD: Fix ARAT feature setting again

From: Borislav Petkov
Date: Tue May 17 2011 - 08:56:17 EST

From: Borislav Petkov <borislav.petkov@xxxxxxx>

Trying to enable the local APIC timer on early K8 revisions uncovers
a number of other issues with it, in conjunction with the C1E enter
path on AMD. Fixing those causes much more churn and troubles than the
benefit of using that timer brings so don't enable it on K8 at all,
falling back to the original functionality the kernel had wrt to that.

Reported-and-bisected-by: Nick Bowler <nbowler@xxxxxxxxxxxxxxxx>
Cc: Boris Ostrovsky <Boris.Ostrovsky@xxxxxxx>
Link: http://lkml.kernel.org/r/20110514195741.GA10757@xxxxxxxxxxxxxxxx
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
arch/x86/kernel/cpu/amd.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 3532d3b..6f9d1f6 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -613,7 +613,7 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)

/* As a rule processors have APIC timer running in deep C states */
- if (c->x86 >= 0xf && !cpu_has_amd_erratum(amd_erratum_400))
+ if (c->x86 > 0xf && !cpu_has_amd_erratum(amd_erratum_400))
set_cpu_cap(c, X86_FEATURE_ARAT);


To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/