From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>, Peter Anvin <hpa@zytor.com>,
Arjan van de Veen <arjan@infradead.org>,
Pan Jacob jun <jacob.jun.pan@intel.com>
Subject: [patch 1/3] x86: Add early platform detection
Date: Sun, 30 Aug 2009 13:46:24 -0000 [thread overview]
Message-ID: <20090830134517.650652025@linutronix.de> (raw)
In-Reply-To: 20090830134446.843410397@linutronix.de
[-- Attachment #1: x86-add-early-platform-detection.patch --]
[-- Type: text/plain, Size: 3980 bytes --]
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>
---
arch/x86/include/asm/x86_init.h | 3 +--
arch/x86/kernel/head32.c | 22 +++++++++++++++++-----
arch/x86/kernel/head64.c | 3 ++-
arch/x86/kernel/x86_init.c | 1 -
4 files changed, 20 insertions(+), 9 deletions(-)
Index: linux-2.6-tip/arch/x86/include/asm/x86_init.h
===================================================================
--- linux-2.6-tip.orig/arch/x86/include/asm/x86_init.h
+++ linux-2.6-tip/arch/x86/include/asm/x86_init.h
@@ -2,6 +2,7 @@
#define _ASM_X86_PLATFORM_H
#include <asm/pgtable_types.h>
+#include <asm/bootparam.h>
struct mpc_bus;
struct mpc_cpu;
@@ -34,14 +35,12 @@ struct x86_init_mpparse {
* @probe_roms: probe BIOS roms
* @reserve_resources: reserve the standard resources for the
* platform
- * @reserve_ebda_region: reserve the extended bios data area
* @memory_setup: platform specific memory setup
*
*/
struct x86_init_resources {
void (*probe_roms)(void);
void (*reserve_resources)(void);
- void (*reserve_ebda_region)(void);
char *(*memory_setup)(void);
};
Index: linux-2.6-tip/arch/x86/kernel/head32.c
===================================================================
--- linux-2.6-tip.orig/arch/x86/kernel/head32.c
+++ linux-2.6-tip/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
Index: linux-2.6-tip/arch/x86/kernel/head64.c
===================================================================
--- linux-2.6-tip.orig/arch/x86/kernel/head64.c
+++ linux-2.6-tip/arch/x86/kernel/head64.c
@@ -24,6 +24,7 @@
#include <asm/kdebug.h>
#include <asm/e820.h>
#include <asm/trampoline.h>
+#include <asm/bios_ebda.h>
static void __init zap_identity_mappings(void)
{
@@ -111,7 +112,7 @@ void __init x86_64_start_reservations(ch
}
#endif
- x86_init.resources.reserve_ebda_region();
+ reserve_ebda_region();
/*
* At this point everything still needed from the boot loader
Index: linux-2.6-tip/arch/x86/kernel/x86_init.c
===================================================================
--- linux-2.6-tip.orig/arch/x86/kernel/x86_init.c
+++ linux-2.6-tip/arch/x86/kernel/x86_init.c
@@ -28,7 +28,6 @@ struct __initdata x86_init_ops x86_init
.resources = {
.probe_roms = x86_init_noop,
.reserve_resources = reserve_standard_io_resources,
- .reserve_ebda_region = reserve_ebda_region,
.memory_setup = default_machine_specific_memory_setup,
},
next prev parent reply other threads:[~2009-08-30 13:46 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-30 13:46 [patch 0/3] x86: Early platform detection based on boot param subarch id Thomas Gleixner
2009-08-30 13:46 ` Thomas Gleixner [this message]
2009-08-30 13:46 ` [patch 2/3] x86/boot: adding hw subarch ID for Moorestown Thomas Gleixner
2009-08-31 11:13 ` Daniele Calore
2009-08-31 10:01 ` Thomas Gleixner
2009-08-30 13:46 ` [patch 3/3] x86: Add Moorestown early detection Thomas Gleixner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090830134517.650652025@linutronix.de \
--to=tglx@linutronix.de \
--cc=arjan@infradead.org \
--cc=hpa@zytor.com \
--cc=jacob.jun.pan@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox