diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-29 15:03:59 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-31 11:09:40 +0200 |
| commit | 47a3d5da70f411bc044ecd3c0593b158b09d0efa (patch) | |
| tree | 30d5204e6d11cd81b20bc3fa582762cd4bdd3135 /arch/x86/kernel/head32.c | |
| parent | dd0a70c8f921708eba29ef9f30dde1f14a74af05 (diff) | |
| download | op-kernel-dev-47a3d5da70f411bc044ecd3c0593b158b09d0efa.zip op-kernel-dev-47a3d5da70f411bc044ecd3c0593b158b09d0efa.tar.gz | |
x86: Add early platform detection
Platforms like Moorestown require early setup and want to avoid the
call to reserve_ebda_region. The x86_init override is too late when
the MRST detection happens in setup_arch. Move the default i386
x86_init overrides and the call to reserve_ebda_region into a separate
function which is called as the default of a switch case depending on
the hardware_subarch id in boot params. This allows us to add a case
for MRST and let MRST have its own early setup function.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/head32.c')
| -rw-r--r-- | arch/x86/kernel/head32.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c index a21398f..441c075 100644 --- a/arch/x86/kernel/head32.c +++ b/arch/x86/kernel/head32.c @@ -15,6 +15,17 @@ #include <asm/trampoline.h> #include <asm/apic.h> #include <asm/io_apic.h> +#include <asm/bios_ebda.h> + +static void __init i386_default_early_setup(void) +{ + /* Initilize 32bit specific setup functions */ + x86_init.resources.probe_roms = probe_roms; + x86_init.resources.reserve_resources = i386_reserve_resources; + x86_init.mpparse.setup_ioapic_ids = setup_ioapic_ids_from_mpc; + + reserve_ebda_region(); +} void __init i386_start_kernel(void) { @@ -31,12 +42,13 @@ void __init i386_start_kernel(void) reserve_early(ramdisk_image, ramdisk_end, "RAMDISK"); } #endif - /* Initilize 32bit specific setup functions */ - x86_init.resources.probe_roms = probe_roms; - x86_init.resources.reserve_resources = i386_reserve_resources; - x86_init.mpparse.setup_ioapic_ids = setup_ioapic_ids_from_mpc; - x86_init.resources.reserve_ebda_region(); + /* Call the subarch specific early setup function */ + switch (boot_params.hdr.hardware_subarch) { + default: + i386_default_early_setup(); + break; + } /* * At this point everything still needed from the boot loader |
