| From 1d3e09a304e6c4e004ca06356578b171e8735d3c Mon Sep 17 00:00:00 2001 |
| From: Andreas Herrmann <andreas.herrmann3@amd.com> |
| Date: Tue, 15 Mar 2011 15:31:37 +0100 |
| Subject: x86, quirk: Fix SB600 revision check |
| |
| From: Andreas Herrmann <andreas.herrmann3@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@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> |
| |
| --- |
| 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) |
