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

[Ben Hutchings]

Author: benh
Date: Wed Mar 23 03:45:00 2011
New Revision: 17102

Log:
[x86] quirk: Fix SB600 revision check (regression in 2.6.32.30)

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/x86/x86-quirk-fix-sb600-revision-check.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/32

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Tue Mar 22 06:12:50 2011	(r17101)
+++ dists/squeeze/linux-2.6/debian/changelog	Wed Mar 23 03:45:00 2011	(r17102)
@@ -19,6 +19,7 @@
     (Closes: #618665; reopens: #608148)
   * scsi: Re-enable SCSI_PROC_FS (/proc/scsi directory) (Closes: #618258)
   * [vserver] Complete fix for CVE-2010-4243 (Closes: #618485)
+  * [x86] quirk: Fix SB600 revision check (regression in 2.6.32.30)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 12 Mar 2011 20:20:58 +0000
 

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/x86/x86-quirk-fix-sb600-revision-check.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/x86/x86-quirk-fix-sb600-revision-check.patch	Wed Mar 23 03:45:00 2011	(r17102)
@@ -0,0 +1,49 @@
+From 1d3e09a304e6c4e004ca06356578b171e8735d3c Mon Sep 17 00:00:00 2001
+From: Andreas Herrmann <andreas.herrmann3 at amd.com>
+Date: Tue, 15 Mar 2011 15:31:37 +0100
+Subject: x86, quirk: Fix SB600 revision check
+
+From: Andreas Herrmann <andreas.herrmann3 at amd.com>
+
+commit 1d3e09a304e6c4e004ca06356578b171e8735d3c upstream.
+
+Commit 7f74f8f28a2bd9db9404f7d364e2097a0c42cc12
+(x86 quirk: Fix polarity for IRQ0 pin2 override on SB800
+systems) introduced a regression. It removed some SB600 specific
+code to determine the revision ID without adapting a
+corresponding revision ID check for SB600.
+
+See this mail thread:
+
+  http://marc.info/?l=linux-kernel&m=129980296006380&w=2
+
+This patch adapts the corresponding check to cover all SB600
+revisions.
+
+Tested-by: Wang Lei <f3d27b at gmail.com>
+Signed-off-by: Andreas Herrmann <andreas.herrmann3 at amd.com>
+Cc: Andrew Morton <akpm at linux-foundation.org>
+LKML-Reference: <20110315143137.GD29499 at alberich.amd.com>
+Signed-off-by: Ingo Molnar <mingo at elte.hu>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ arch/x86/kernel/early-quirks.c |    7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+--- a/arch/x86/kernel/early-quirks.c
++++ b/arch/x86/kernel/early-quirks.c
+@@ -161,7 +161,12 @@ static void __init ati_bugs_contd(int nu
+ 	if (rev >= 0x40)
+ 		acpi_fix_pin2_polarity = 1;
+ 
+-	if (rev > 0x13)
++	/*
++	 * SB600: revisions 0x11, 0x12, 0x13, 0x14, ...
++	 * SB700: revisions 0x39, 0x3a, ...
++	 * SB800: revisions 0x40, 0x41, ...
++	 */
++	if (rev >= 0x39)
+ 		return;
+ 
+ 	if (acpi_use_timer_override)

Modified: dists/squeeze/linux-2.6/debian/patches/series/32
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/32	Tue Mar 22 06:12:50 2011	(r17101)
+++ dists/squeeze/linux-2.6/debian/patches/series/32	Wed Mar 23 03:45:00 2011	(r17102)
@@ -3,3 +3,4 @@
 + features/x86/vmw_pvscsi-fix-signedness-warning-with-newer-compile.patch
 + bugfix/all/stable/2.6.32.33.patch
 - bugfix/x86/drm-i915-add-pipe-A-force-quirks-to-i915-driver.patch
++ bugfix/x86/x86-quirk-fix-sb600-revision-check.patch