diff options
| author | Andreas Herrmann <andreas.herrmann3@amd.com> | 2011-03-15 15:31:37 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-21 12:45:39 -0700 |
| commit | 3516421d665e1542c8058b633c7fc1449b5cba97 (patch) | |
| tree | 69ee29d8069904b72299741327f27a8c4d30b08f /arch | |
| parent | 1ca398974b6c489d6737f52b69e05a9d49e1f295 (diff) | |
| download | kernel-common-3516421d665e1542c8058b633c7fc1449b5cba97.tar.gz kernel-common-3516421d665e1542c8058b633c7fc1449b5cba97.tar.bz2 kernel-common-3516421d665e1542c8058b633c7fc1449b5cba97.zip | |
x86, quirk: Fix SB600 revision check
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@gmail.com>
Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <20110315143137.GD29499@alberich.amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/early-quirks.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index ef01d3d6a5a9..f67a33c7f415 100644 --- 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 num, int slot, int func) 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) |