Commit 54ef3400 authored by Andi Kleen's avatar Andi Kleen Committed by Thomas Gleixner
Browse files

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: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 158ad326

arch/x86/kernel/Makefile_32

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/x86/kernel/Makefile_64

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/x86/kernel/acpi/Makefile_32

+0 −3
Original line number Diff line number Diff line 
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),)

arch/x86/kernel/acpi/earlyquirk_32.c

deleted100644 → 0
+0 −84
Original line number Diff line number Diff line 
/* 

 * 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;

			}



		}

	}

}

arch/x86/kernel/early-quirks_64.c→arch/x86/kernel/early-quirks.c

+14 −5
Original line number Diff line number Diff line
@@ -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.
@@ -58,6 +64,7 @@ static void __init nvidia_bugs(void) 
		printk(KERN_INFO "If you got timer trouble "

			"try acpi_use_timer_override\n");

	}

#endif

#endif

	/* RED-PEN skip them on mptables too? */
@@ -65,11 +72,13 @@ static void __init nvidia_bugs(void) 


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");

	}

#endif

}



struct chipset {