[kernel] r17587 - in dists/squeeze/linux-2.6/debian: . patches/bugfix/x86 patches/series

[Ben Hutchings]

Author: benh
Date: Fri Jun  3 04:21:35 2011
New Revision: 17587

Log:
[x86] Do not enable ARAT feature on AMD processors below family 0x12

Cherry-picked from linux-2.6.32-queue; probably avoids a regression.

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/x86/x86-amd-do-not-enable-arat-feature-on-amd-processors-below.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/35

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Fri Jun  3 04:08:47 2011	(r17586)
+++ dists/squeeze/linux-2.6/debian/changelog	Fri Jun  3 04:21:35 2011	(r17587)
@@ -29,6 +29,7 @@
     - cifs: check for bytes_remaining going to zero in CIFS_SessSetup
     For the complete list of changes, see:
      http://www.kernel.org/pub/linux/kernel/v2.6/longterm/v2.6.32/ChangeLog-2.6.32.41
+  * [x86] Do not enable ARAT feature on AMD processors below family 0x12
 
   [ Ian Campbell ]
   * Remove lazy vunmap for non-Xen flavours too. (Closes: #613634)

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/x86/x86-amd-do-not-enable-arat-feature-on-amd-processors-below.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/x86/x86-amd-do-not-enable-arat-feature-on-amd-processors-below.patch	Fri Jun  3 04:21:35 2011	(r17587)
@@ -0,0 +1,51 @@
+From e9cdd343a5e42c43bcda01e609fa23089e026470 Mon Sep 17 00:00:00 2001
+From: Boris Ostrovsky <ostr at amd64.org>
+Date: Thu, 26 May 2011 11:19:52 -0400
+Subject: x86, amd: Do not enable ARAT feature on AMD processors below
+ family 0x12
+
+From: Boris Ostrovsky <ostr at amd64.org>
+
+commit e9cdd343a5e42c43bcda01e609fa23089e026470 upstream.
+
+Commit b87cf80af3ba4b4c008b4face3c68d604e1715c6 added support for
+ARAT (Always Running APIC timer) on AMD processors that are not
+affected by erratum 400. This erratum is present on certain processor
+families and prevents APIC timer from waking up the CPU when it
+is in a deep C state, including C1E state.
+
+Determining whether a processor is affected by this erratum may
+have some corner cases and handling these cases is somewhat
+complicated. In the interest of simplicity we won't claim ARAT
+support on processor families below 0x12 and will go back to
+broadcasting timer when going idle.
+
+Signed-off-by: Boris Ostrovsky <ostr at amd64.org>
+Link: http://lkml.kernel.org/r/1306423192-19774-1-git-send-email-ostr@amd64.org
+Tested-by: Boris Petkov <borislav.petkov at amd.com>
+Cc: Hans Rosenfeld <Hans.Rosenfeld at amd.com>
+Cc: Andreas Herrmann <Andreas.Herrmann3 at amd.com>
+Cc: Chuck Ebbert <cebbert at redhat.com>
+Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ arch/x86/kernel/cpu/amd.c |    7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+--- a/arch/x86/kernel/cpu/amd.c
++++ b/arch/x86/kernel/cpu/amd.c
+@@ -567,8 +567,11 @@ static void __cpuinit init_amd(struct cp
+ 	}
+ #endif
+ 
+-	/* As a rule processors have APIC timer running in deep C states */
+-	if (c->x86 > 0xf && !cpu_has_amd_erratum(amd_erratum_400))
++	/*
++	 * Family 0x12 and above processors have APIC timer
++	 * running in deep C states.
++	 */
++	if (c->x86 > 0x11)
+ 		set_cpu_cap(c, X86_FEATURE_ARAT);
+ 
+ 	/*

Modified: dists/squeeze/linux-2.6/debian/patches/series/35
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/35	Fri Jun  3 04:08:47 2011	(r17586)
+++ dists/squeeze/linux-2.6/debian/patches/series/35	Fri Jun  3 04:21:35 2011	(r17587)
@@ -262,3 +262,4 @@
 + features/all/netxen-unified-fw-image.patch
 
 + bugfix/all/slub-Revert-PARISC-slub-fix-panic-with-DISCONTIGMEM.patch
++ bugfix/x86/x86-amd-do-not-enable-arat-feature-on-amd-processors-below.patch