x86: Unify i386 and x86-64 early quirks

They were already very similar; just use the same file now.

[ tglx: arch/x86 adaptation ]

Cc: lenb@kernel.org
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

9 files changed, 20 insertions, 103 deletions

diff --git a/arch/x86/kernel/Makefile_32 b/arch/x86/kernel/Makefile_32
index 69990f0ba86e..ccea590bbb92 100644
--- a/arch/x86/kernel/Makefile_32
+++ b/arch/x86/kernel/Makefile_32
@@ -17,6 +17,7 @@ obj-$(CONFIG_MCA)		+= mca_32.o
 obj-$(CONFIG_X86_MSR)           += msr.o
 obj-$(CONFIG_X86_CPUID)         += cpuid.o
 obj-$(CONFIG_MICROCODE)         += microcode.o
+obj-$(CONFIG_PCI)               += early-quirks.o
 obj-$(CONFIG_APM)               += apm_32.o
 obj-$(CONFIG_X86_SMP)           += smp_32.o smpboot_32.o tsc_sync.o
 obj-$(CONFIG_SMP)               += smpcommon_32.o
diff --git a/arch/x86/kernel/Makefile_64 b/arch/x86/kernel/Makefile_64
index 2fc3d3f2c27e..dec06e769281 100644
--- a/arch/x86/kernel/Makefile_64
+++ b/arch/x86/kernel/Makefile_64
@@ -39,7 +39,7 @@ obj-$(CONFIG_K8_NB)		+= k8.o
 obj-$(CONFIG_AUDIT)             += audit_64.o
 
 obj-$(CONFIG_MODULES)           += module_64.o
-obj-$(CONFIG_PCI)               += early-quirks_64.o
+obj-$(CONFIG_PCI)               += early-quirks.o
 
 obj-y                           += topology.o
 obj-y                           += intel_cacheinfo.o
diff --git a/arch/x86/kernel/acpi/Makefile_32 b/arch/x86/kernel/acpi/Makefile_32
index a4852a2e9190..045dd54b33e0 100644
--- a/arch/x86/kernel/acpi/Makefile_32
+++ b/arch/x86/kernel/acpi/Makefile_32
@@ -1,7 +1,4 @@
 obj-$(CONFIG_ACPI)              += boot.o
-ifneq ($(CONFIG_PCI),)
-obj-$(CONFIG_X86_IO_APIC)       += earlyquirk_32.o
-endif
 obj-$(CONFIG_ACPI_SLEEP)        += sleep_32.o wakeup_32.o
 
 ifneq ($(CONFIG_ACPI_PROCESSOR),)
diff --git a/arch/x86/kernel/acpi/earlyquirk_32.c b/arch/x86/kernel/acpi/earlyquirk_32.c
deleted file mode 100644
index 23f78efc577d..000000000000
--- a/arch/x86/kernel/acpi/earlyquirk_32.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* 
- * Do early PCI probing for bug detection when the main PCI subsystem is 
- * not up yet.
- */
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/pci.h>
-#include <linux/acpi.h>
-
-#include <asm/pci-direct.h>
-#include <asm/acpi.h>
-#include <asm/apic.h>
-
-#ifdef CONFIG_ACPI
-
-static int __init nvidia_hpet_check(struct acpi_table_header *header)
-{
-        return 0;
-}
-#endif
-
-static int __init check_bridge(int vendor, int device)
-{
-#ifdef CONFIG_ACPI
-        static int warned;
-        /* According to Nvidia all timer overrides are bogus unless HPET
-           is enabled. */
-        if (!acpi_use_timer_override && vendor == PCI_VENDOR_ID_NVIDIA) {
-                if (!warned && acpi_table_parse(ACPI_SIG_HPET,
-                                                nvidia_hpet_check)) {
-                        warned = 1;
-                        acpi_skip_timer_override = 1;
-                          printk(KERN_INFO "Nvidia board "
-                       "detected. Ignoring ACPI "
-                       "timer override.\n");
-                printk(KERN_INFO "If you got timer trouble "
-                                 "try acpi_use_timer_override\n");
-
-                }
-        }
-#endif
-        if (vendor == PCI_VENDOR_ID_ATI && timer_over_8254 == 1) {
-                timer_over_8254 = 0;
-                printk(KERN_INFO "ATI board detected. Disabling timer routing "
-                                "over 8254.\n");
-        }
-        return 0;
-}
-
-void __init check_acpi_pci(void)
-{
-        int num, slot, func;
-
-        /* Assume the machine supports type 1. If not it will 
-           always read ffffffff and should not have any side effect.
-           Actually a few buggy systems can machine check. Allow the user
-           to disable it by command line option at least -AK */
-        if (!early_pci_allowed())
-                return;
-
-        /* Poor man's PCI discovery */
-        for (num = 0; num < 32; num++) {
-                for (slot = 0; slot < 32; slot++) {
-                        for (func = 0; func < 8; func++) {
-                                u32 class;
-                                u32 vendor;
-                                class = read_pci_config(num, slot, func,
-                                                        PCI_CLASS_REVISION);
-                                if (class == 0xffffffff)
-                                        break;
-
-                                if ((class >> 16) != PCI_CLASS_BRIDGE_PCI)
-                                        continue;
-
-                                vendor = read_pci_config(num, slot, func,
-                                                         PCI_VENDOR_ID);
-
-                                if (check_bridge(vendor & 0xffff, vendor >> 16))
-                                        return;
-                        }
-
-                }
-        }
-}
diff --git a/arch/x86/kernel/early-quirks_64.c b/arch/x86/kernel/early-quirks.c
index 13aa4fd728f3..dc34acbd54aa 100644
--- a/arch/x86/kernel/early-quirks_64.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -13,9 +13,13 @@
 #include <linux/acpi.h>
 #include <linux/pci_ids.h>
 #include <asm/pci-direct.h>
-#include <asm/proto.h>
-#include <asm/iommu.h>
 #include <asm/dma.h>
+#include <asm/io_apic.h>
+#include <asm/apic.h>
+
+#ifdef CONFIG_IOMMU
+#include <asm/iommu.h>
+#endif
 
 static void __init via_bugs(void)
 {
@@ -23,7 +27,8 @@ static void __init via_bugs(void)
         if ((end_pfn > MAX_DMA32_PFN ||  force_iommu) &&
             !iommu_aperture_allowed) {
                 printk(KERN_INFO
-  "Looks like a VIA chipset. Disabling IOMMU. Override with iommu=allowed\n");
+                       "Looks like a VIA chipset. Disabling IOMMU."
+                       " Override with iommu=allowed\n");
                 iommu_aperture_disabled = 1;
         }
 #endif
@@ -40,6 +45,7 @@ static int __init nvidia_hpet_check(struct acpi_table_header *header)
 static void __init nvidia_bugs(void)
 {
 #ifdef CONFIG_ACPI
+#ifdef CONFIG_X86_IO_APIC
         /*
          * All timer overrides on Nvidia are
          * wrong unless HPET is enabled.
@@ -59,17 +65,20 @@ static void __init nvidia_bugs(void)
                         "try acpi_use_timer_override\n");
         }
 #endif
+#endif
         /* RED-PEN skip them on mptables too? */
 
 }
 
 static void __init ati_bugs(void)
 {
+#ifdef CONFIG_X86_IO_APIC
         if (timer_over_8254 == 1) {
                 timer_over_8254 = 0;
                 printk(KERN_INFO
-                "ATI board detected. Disabling timer routing over 8254.\n");
+                "ATI board detected. Disabling timer routing over 8254.\n");
         }
+#endif
 }
 
 struct chipset {
@@ -104,7 +113,7 @@ void __init early_quirks(void)
                                 if (class == 0xffffffff)
                                         break;
 
-                                if ((class >> 16) != PCI_CLASS_BRIDGE_PCI)
+                                if ((class >> 16) != PCI_CLASS_BRIDGE_PCI)
                                         continue;
 
                                 vendor = read_pci_config(num, slot, func,
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
index b87a6fd5ba48..d357d60431f0 100644
--- a/arch/x86/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
@@ -622,9 +622,7 @@ void __init setup_arch(char **cmdline_p)
 #endif
 
 #ifdef CONFIG_PCI
-#ifdef CONFIG_X86_IO_APIC
-        check_acpi_pci();       /* Checks more than just ACPI actually */
-#endif
+        early_quirks();
 #endif
 
 #ifdef CONFIG_ACPI
diff --git a/include/asm-x86/acpi_32.h b/include/asm-x86/acpi_32.h
index 125179adf044..723493e6c851 100644
--- a/include/asm-x86/acpi_32.h
+++ b/include/asm-x86/acpi_32.h
@@ -81,11 +81,7 @@ int __acpi_release_global_lock(unsigned int *lock);
         :"=r"(n_hi), "=r"(n_lo)     \
         :"0"(n_hi), "1"(n_lo))
 
-#ifdef CONFIG_X86_IO_APIC
-extern void check_acpi_pci(void);
-#else
-static inline void check_acpi_pci(void) { }
-#endif
+extern void early_quirks(void);
 
 #ifdef CONFIG_ACPI
 extern int acpi_lapic;
diff --git a/include/asm-x86/io_apic_64.h b/include/asm-x86/io_apic_64.h
index d9f2e54324d5..e2c13675ee4e 100644
--- a/include/asm-x86/io_apic_64.h
+++ b/include/asm-x86/io_apic_64.h
@@ -133,4 +133,6 @@ void enable_NMI_through_LVT0 (void * dummy);
 
 extern spinlock_t i8259A_lock;
 
+extern int timer_over_8254;
+
 #endif
diff --git a/include/asm-x86/proto.h b/include/asm-x86/proto.h
index c44a3a93b5a4..dabba55f7ed8 100644
--- a/include/asm-x86/proto.h
+++ b/include/asm-x86/proto.h
@@ -83,8 +83,6 @@ extern unsigned tsc_khz;
 extern int reboot_force;
 extern int notsc_setup(char *);
 
-extern int timer_over_8254;
-
 extern int gsi_irq_sharing(int gsi);
 
 extern int force_mwait;