From: Andi Kleen <ak@suse.de>
Date: Fri, 3 Feb 2006 20:50:53 +0000 (+0100)
Subject: [PATCH] x86_64: Automatically enable apicmaintimer on ATI boards
X-Git-Tag: v2.6.16.28-rc1~887
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=6f3814cd2fb5ea4d53a7fa5b0635d68fa4036c1b;p=sfrench%2Fcifs-2.6.git

[PATCH] x86_64: Automatically enable apicmaintimer on ATI boards

They all have problems with IRQ 0 routing, so just use the APIC on them.

Can be overwritten with "noapicmaintimer"

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c
index 1a5060b434b8..4282d72b2a26 100644
--- a/arch/x86_64/kernel/io_apic.c
+++ b/arch/x86_64/kernel/io_apic.c
@@ -304,6 +304,14 @@ void __init check_ioapic(void)
 #endif
 					/* RED-PEN skip them on mptables too? */
 					return;
+				case PCI_VENDOR_ID_ATI:
+					if (apic_runs_main_timer != 0)
+						break;
+					printk(KERN_INFO
+	     "ATI board detected. Using APIC/PM timer.\n");
+					apic_runs_main_timer = 1;
+					nohpet = 1;
+					return;
 				} 
 
 				/* No multi-function device? */