i386/x86_64 boot: setup data

Index: linux-2.6.23-rc6/include/asm-i386/bootparam.h
===================================================================
@@ -9,6 +9,17 @@
 #include <asm/ist.h>
 #include <video/edid.h>
 
+/* setup data types */
+#define SETUP_NONE			0
+
+/* extensible setup data list node */
+struct setup_data {
+	u64 next;
+	u32 type;
+	u32 len;
+	u8 data[0];
+} __attribute__((packed));
+
 struct setup_header {
 	u8	setup_sects;
 	u16	root_flags;

@@ -41,6 +52,10 @@
 	u32	initrd_addr_max;
 	u32	kernel_alignment;
 	u8	relocatable_kernel;
+	u8	_pad2[3];
+	u32	cmdline_size;
+	u32	_pad3;
+	u64	setup_data;
 } __attribute__((packed));
 
 struct sys_desc_table {

Index: linux-2.6.23-rc6/arch/x86_64/kernel/setup.c
===================================================================
@@ -221,6 +221,25 @@
 		ebda_size = 64*1024;
 }
 
+void __init parse_setup_data(void)
+{
+	struct setup_data *setup_data;
+	unsigned long pa_setup_data;
+
+	if (boot_params.hdr.version < 0x0207)
+		return;
+	pa_setup_data = boot_params.hdr.setup_data;
+	while (pa_setup_data) {
+		setup_data = early_ioremap(pa_setup_data, PAGE_SIZE);
+		switch (setup_data->type) {
+		default:
+			break;
+		}
+		pa_setup_data = setup_data->next;
+		early_iounmap(setup_data, PAGE_SIZE);
+	}
+}
+
 void __init setup_arch(char **cmdline_p)
 {
 	printk(KERN_INFO "Command line: %s\n", boot_command_line);

@@ -256,6 +275,8 @@
 	strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
 	*cmdline_p = command_line;
 
+	parse_setup_data();
+
 	parse_early_param();
 
 	finish_e820_parsing();

Index: linux-2.6.23-rc6/arch/i386/kernel/setup.c
===================================================================
@@ -496,6 +496,25 @@
 	return machine_specific_memory_setup();
 }
 
+void __init parse_setup_data(void)
+{
+	struct setup_data *setup_data;
+	unsigned long pa_setup_data, pa_next;
+
+	if (boot_params.hdr.version < 0x0207)
+		return;
+	pa_setup_data = boot_params.hdr.setup_data;
+	while (pa_setup_data) {
+		setup_data = boot_ioremap(pa_setup_data, PAGE_SIZE);
+		pa_next = setup_data->next;
+		switch (setup_data->type) {
+		default:
+			break;
+		}
+		pa_setup_data = pa_next;
+	}
+}
+
 /*
  * Determine if we were loaded by an EFI loader.  If so, then we have also been
  * passed the efi memmap, systab, etc., so we should use these data structures

@@ -544,6 +563,9 @@
 	rd_prompt = ((boot_params.hdr.ram_size & RAMDISK_PROMPT_FLAG) != 0);
 	rd_doload = ((boot_params.hdr.ram_size & RAMDISK_LOAD_FLAG) != 0);
 #endif
+
+	parse_setup_data();
+
 	ARCH_SETUP
 	if (efi_enabled)
 		efi_init();

Index: linux-2.6.23-rc6/include/asm-i386/io.h
===================================================================
@@ -126,6 +126,13 @@
 extern void iounmap(volatile void __iomem *addr);
 
 /*
+ * boot_ioremap is for temporary early boot-time mappings, before
+ * paging_init(), when the boot-time page tables are still in use.
+ * The mapping is currently limited to at most 4 pages.
+ */
+extern void *boot_ioremap(unsigned long offset, unsigned long size);
+
+/*
  * bt_ioremap() and bt_iounmap() are for temporary early boot-time
  * mappings, before the real ioremap() is functional.
  * A boot-time mapping is currently limited to at most 16 pages.