Hi,
I made a new version of the patch. Unfortunately, there seems to be a
regression caused by newer toolchain. While my patch works in Lenny, it
will put the Multiboot header too high when using sid binutils. I haven't
had time to figure out why.
--
Robert Millan
"Be the change you want to see in the world" -- Gandhi
diff -x '*~' -Nurp memtest86+-4.00/head.S memtest86+-4.00.new/head.S
--- memtest86+-4.00/head.S 2009-09-22 02:35:46.000000000 +0200
+++ memtest86+-4.00.new/head.S 2010-01-11 17:00:50.000000000 +0100
@@ -13,9 +13,11 @@
.text
#define __ASSEMBLY__
+#define ASM_FILE
#include "defs.h"
#include "config.h"
#include "test.h"
+#include "multiboot.h"
/*
* References to members of the boot_cpu_data structure.
@@ -38,6 +40,13 @@ startup_32:
cld
cli
+ /* Store MBI pointer */
+ xorl %ecx, %ecx
+ cmpl $MULTIBOOT_BOOTLOADER_MAGIC, %eax
+ jne 0f
+ movl %ebx, %ecx
+0:
+
/* Ensure I have a stack pointer */
testl %esp, %esp
jnz 0f
@@ -50,6 +59,20 @@ startup_32:
0: popl %ebx
addl $_GLOBAL_OFFSET_TABLE_+[.-0b], %ebx
+ /* Move MBI pointer to a safe place */
+ testl %ecx, %ecx
+ je 0f
+ movl %ecx, mbi...@gotoff(%ebx)
+0:
+
+ jmp 0f
+ /* Multiboot header */
+.align 4
+ .long MULTIBOOT_HEADER_MAGIC
+ .long 0
+ .long -MULTIBOOT_HEADER_MAGIC
+0:
+
/* Pick the appropriate stack address */
leal stack_...@gotoff(%ebx), %esp
@@ -956,6 +979,9 @@ prot:
movl $1, %eax
ret
+.globl mbiptr
+mbiptr:
+ .long 0
realptr:
.word real - RSTART
.word 0x0000
diff -x '*~' -Nurp memtest86+-4.00/init.c memtest86+-4.00.new/init.c
--- memtest86+-4.00/init.c 2009-09-22 02:35:46.000000000 +0200
+++ memtest86+-4.00.new/init.c 2010-01-11 16:09:47.000000000 +0100
@@ -15,6 +15,7 @@
#include "pci.h"
#include "io.h"
#include "spd.h"
+#include "multiboot.h"
#define rdmsr(msr,val1,val2) \
__asm__ __volatile__("rdmsr" \
@@ -98,7 +99,10 @@ void init(void)
/* Determine the memory map */
if ((firmware == FIRMWARE_UNKNOWN) &&
(memsz_mode != SZ_MODE_PROBE)) {
- if (query_linuxbios()) {
+ if (query_multiboot()) {
+ firmware = FIRMWARE_MULTIBOOT;
+ }
+ else if (query_linuxbios()) {
firmware = FIRMWARE_LINUXBIOS;
}
else if (query_pcbios()) {
diff -x '*~' -Nurp memtest86+-4.00/main.c memtest86+-4.00.new/main.c
--- memtest86+-4.00/main.c 2009-09-22 02:35:46.000000000 +0200
+++ memtest86+-4.00.new/main.c 2010-01-11 16:17:37.000000000 +0100
@@ -11,9 +11,12 @@
#include "test.h"
#include "defs.h"
#include "config.h"
+#include "multiboot.h"
#undef TEST_TIMES
#define DEFTESTS 9
+extern struct multiboot_info *mbiptr;
+
extern void bzero();
const struct tseq tseq[] = {
@@ -151,11 +154,15 @@ static void parse_command_line(void)
if (cmdline_parsed)
return;
- if (*OLD_CL_MAGIC_ADDR != OLD_CL_MAGIC)
- return;
+ if (mbiptr && (mbiptr->flags & MULTIBOOT_INFO_CMDLINE)) {
+ cmdline = (void *) mbiptr->cmdline;
+ } else {
+ if (*OLD_CL_MAGIC_ADDR != OLD_CL_MAGIC)
+ return;
- unsigned short offset = *OLD_CL_OFFSET_ADDR;
- cmdline = MK_PTR(INITSEG, offset);
+ unsigned short offset = *OLD_CL_OFFSET_ADDR;
+ cmdline = MK_PTR(INITSEG, offset);
+ }
/* skip leading spaces */
while (*cmdline == ' ')
diff -x '*~' -Nurp memtest86+-4.00/Makefile memtest86+-4.00.new/Makefile
--- memtest86+-4.00/Makefile 2009-09-22 02:35:46.000000000 +0200
+++ memtest86+-4.00.new/Makefile 2010-01-11 17:03:20.000000000 +0100
@@ -15,7 +15,7 @@ CFLAGS= -Wall -march=i486 -m32 -O2 -fomi
OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
config.o linuxbios.o memsize.o pci.o controller.o random.o spd.o \
- error.o dmi.o cpuid.o
+ error.o dmi.o cpuid.o multiboot.o
all: memtest.bin memtest
diff -x '*~' -Nurp memtest86+-4.00/memsize.c memtest86+-4.00.new/memsize.c
--- memtest86+-4.00/memsize.c 2009-09-22 02:35:46.000000000 +0200
+++ memtest86+-4.00.new/memsize.c 2010-01-11 16:10:33.000000000 +0100
@@ -75,7 +75,7 @@ void mem_size(void)
static void memsize_bios()
{
- if (firmware == FIRMWARE_PCBIOS) {
+ if (firmware == FIRMWARE_PCBIOS || firmware == FIRMWARE_MULTIBOOT) {
memsize_820();
}
else if (firmware == FIRMWARE_LINUXBIOS) {
diff -x '*~' -Nurp memtest86+-4.00/multiboot.c memtest86+-4.00.new/multiboot.c
--- memtest86+-4.00/multiboot.c 1970-01-01 01:00:00.000000000 +0100
+++ memtest86+-4.00.new/multiboot.c 2010-01-11 16:19:23.000000000 +0100
@@ -0,0 +1,49 @@
+/* multiboot.c
+ *
+ * Copyright (C) 2008,2009 Robert Millan
+ *
+ * Loosely based on linuxbios.c, which is:
+ *
+ * Released under version 2 of the Gnu Public License.
+ * By Eric Biederman
+ */
+
+#include "multiboot.h"
+#include "test.h"
+
+extern struct multiboot_info *mbiptr;
+
+int query_multiboot(void)
+{
+ struct multiboot_mmap_entry *mem;
+ int i;
+
+ if (!mbiptr) {
+ return 0;
+ }
+ if (!mbiptr->mmap_addr) {
+ return 1;
+ }
+ if ((mbiptr->flags & MULTIBOOT_INFO_MEM_MAP) == 0) {
+ return 1;
+ }
+
+ mem = (struct multiboot_mmap_entry *) mbiptr->mmap_addr;
+ mem_info.e820_nr = 0;
+
+ for (i = 0; i < E820MAX; i++) {
+ if ((multiboot_uint32_t) mem >= (mbiptr->mmap_addr + mbiptr->mmap_length)) {
+ break;
+ }
+
+ mem_info.e820[mem_info.e820_nr].addr = mem->addr;
+ mem_info.e820[mem_info.e820_nr].size = mem->len;
+ /* Multiboot spec defines available / reserved types to match with E820. */
+ mem_info.e820[mem_info.e820_nr].type = mem->type;
+ mem_info.e820_nr++;
+
+ mem = (struct multiboot_mmap_entry *) ((multiboot_uint32_t) mem + mem->size + sizeof (mem->size));
+ }
+
+ return 1;
+}
diff -x '*~' -Nurp memtest86+-4.00/multiboot.h memtest86+-4.00.new/multiboot.h
--- memtest86+-4.00/multiboot.h 1970-01-01 01:00:00.000000000 +0100
+++ memtest86+-4.00.new/multiboot.h 2010-01-11 16:11:12.000000000 +0100
@@ -0,0 +1,220 @@
+/* multiboot.h - Multiboot header file. */
+/* Copyright (C) 1999,2003,2007,2008,2009 Free Software Foundation, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ANY
+ * DEVELOPER OR DISTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+ * IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef MULTIBOOT_HEADER
+#define MULTIBOOT_HEADER 1
+
+/* How many bytes from the start of the file we search for the header. */
+#define MULTIBOOT_SEARCH 8192
+
+/* The magic field should contain this. */
+#define MULTIBOOT_HEADER_MAGIC 0x1BADB002
+
+/* This should be in %eax. */
+#define MULTIBOOT_BOOTLOADER_MAGIC 0x2BADB002
+
+/* Alignment of multiboot modules. */
+#define MULTIBOOT_MOD_ALIGN 0x00001000
+
+/* Alignment of the multiboot info structure. */
+#define MULTIBOOT_INFO_ALIGN 0x00000004
+
+/* Flags set in the 'flags' member of the multiboot header. */
+
+/* Align all boot modules on i386 page (4KB) boundaries. */
+#define MULTIBOOT_PAGE_ALIGN 0x00000001
+
+/* Must pass memory information to OS. */
+#define MULTIBOOT_MEMORY_INFO 0x00000002
+
+/* Must pass video information to OS. */
+#define MULTIBOOT_VIDEO_MODE 0x00000004
+
+/* This flag indicates the use of the address fields in the header. */
+#define MULTIBOOT_AOUT_KLUDGE 0x00010000
+
+/* Flags to be set in the 'flags' member of the multiboot info structure. */
+
+/* is there basic lower/upper memory information? */
+#define MULTIBOOT_INFO_MEMORY 0x00000001
+/* is there a boot device set? */
+#define MULTIBOOT_INFO_BOOTDEV 0x00000002
+/* is the command-line defined? */
+#define MULTIBOOT_INFO_CMDLINE 0x00000004
+/* are there modules to do something with? */
+#define MULTIBOOT_INFO_MODS 0x00000008
+
+/* These next two are mutually exclusive */
+
+/* is there a symbol table loaded? */
+#define MULTIBOOT_INFO_AOUT_SYMS 0x00000010
+/* is there an ELF section header table? */
+#define MULTIBOOT_INFO_ELF_SHDR 0X00000020
+
+/* is there a full memory map? */
+#define MULTIBOOT_INFO_MEM_MAP 0x00000040
+
+/* Is there drive info? */
+#define MULTIBOOT_INFO_DRIVE_INFO 0x00000080
+
+/* Is there a config table? */
+#define MULTIBOOT_INFO_CONFIG_TABLE 0x00000100
+
+/* Is there a boot loader name? */
+#define MULTIBOOT_INFO_BOOT_LOADER_NAME 0x00000200
+
+/* Is there a APM table? */
+#define MULTIBOOT_INFO_APM_TABLE 0x00000400
+
+/* Is there video information? */
+#define MULTIBOOT_INFO_VIDEO_INFO 0x00000800
+
+#ifndef ASM_FILE
+
+typedef unsigned short multiboot_uint16_t;
+typedef unsigned int multiboot_uint32_t;
+typedef unsigned long long multiboot_uint64_t;
+
+struct multiboot_header
+{
+ /* Must be MULTIBOOT_MAGIC - see above. */
+ multiboot_uint32_t magic;
+
+ /* Feature flags. */
+ multiboot_uint32_t flags;
+
+ /* The above fields plus this one must equal 0 mod 2^32. */
+ multiboot_uint32_t checksum;
+
+ /* These are only valid if MULTIBOOT_AOUT_KLUDGE is set. */
+ multiboot_uint32_t header_addr;
+ multiboot_uint32_t load_addr;
+ multiboot_uint32_t load_end_addr;
+ multiboot_uint32_t bss_end_addr;
+ multiboot_uint32_t entry_addr;
+
+ /* These are only valid if MULTIBOOT_VIDEO_MODE is set. */
+ multiboot_uint32_t mode_type;
+ multiboot_uint32_t width;
+ multiboot_uint32_t height;
+ multiboot_uint32_t depth;
+};
+
+/* The symbol table for a.out. */
+struct multiboot_aout_symbol_table
+{
+ multiboot_uint32_t tabsize;
+ multiboot_uint32_t strsize;
+ multiboot_uint32_t addr;
+ multiboot_uint32_t reserved;
+};
+typedef struct multiboot_aout_symbol_table multiboot_aout_symbol_table_t;
+
+/* The section header table for ELF. */
+struct multiboot_elf_section_header_table
+{
+ multiboot_uint32_t num;
+ multiboot_uint32_t size;
+ multiboot_uint32_t addr;
+ multiboot_uint32_t shndx;
+};
+typedef struct multiboot_elf_section_header_table multiboot_elf_section_header_table_t;
+
+struct multiboot_info
+{
+ /* Multiboot info version number */
+ multiboot_uint32_t flags;
+
+ /* Available memory from BIOS */
+ multiboot_uint32_t mem_lower;
+ multiboot_uint32_t mem_upper;
+
+ /* "root" partition */
+ multiboot_uint32_t boot_device;
+
+ /* Kernel command line */
+ multiboot_uint32_t cmdline;
+
+ /* Boot-Module list */
+ multiboot_uint32_t mods_count;
+ multiboot_uint32_t mods_addr;
+
+ union
+ {
+ multiboot_aout_symbol_table_t aout_sym;
+ multiboot_elf_section_header_table_t elf_sec;
+ } u;
+
+ /* Memory Mapping buffer */
+ multiboot_uint32_t mmap_length;
+ multiboot_uint32_t mmap_addr;
+
+ /* Drive Info buffer */
+ multiboot_uint32_t drives_length;
+ multiboot_uint32_t drives_addr;
+
+ /* ROM configuration table */
+ multiboot_uint32_t config_table;
+
+ /* Boot Loader Name */
+ multiboot_uint32_t boot_loader_name;
+
+ /* APM table */
+ multiboot_uint32_t apm_table;
+
+ /* Video */
+ multiboot_uint32_t vbe_control_info;
+ multiboot_uint32_t vbe_mode_info;
+ multiboot_uint16_t vbe_mode;
+ multiboot_uint16_t vbe_interface_seg;
+ multiboot_uint16_t vbe_interface_off;
+ multiboot_uint16_t vbe_interface_len;
+};
+typedef struct multiboot_info multiboot_info_t;
+
+struct multiboot_mmap_entry
+{
+ multiboot_uint32_t size;
+ multiboot_uint64_t addr;
+ multiboot_uint64_t len;
+#define MULTIBOOT_MEMORY_AVAILABLE 1
+#define MULTIBOOT_MEMORY_RESERVED 2
+ multiboot_uint32_t type;
+} __attribute__((packed));
+typedef struct multiboot_mmap_entry multiboot_memory_map_t;
+
+struct multiboot_mod_list
+{
+ /* the memory used goes from bytes 'mod_start' to 'mod_end-1' inclusive */
+ multiboot_uint32_t mod_start;
+ multiboot_uint32_t mod_end;
+
+ /* Module command line */
+ multiboot_uint32_t cmdline;
+
+ /* padding to take it to 16 bytes (must be zero) */
+ multiboot_uint32_t pad;
+};
+typedef struct multiboot_mod_list multiboot_module_t;
+
+#endif /* ! ASM_FILE */
+
+#endif /* ! MULTIBOOT_HEADER */
diff -x '*~' -Nurp memtest86+-4.00/test.h memtest86+-4.00.new/test.h
--- memtest86+-4.00/test.h 2009-09-22 02:35:46.000000000 +0200
+++ memtest86+-4.00.new/test.h 2010-01-11 16:09:28.000000000 +0100
@@ -106,6 +106,7 @@ int strncmp(const char *s1, const char *
void *memmove(void *dest, const void *src, ulong n);
int query_linuxbios(void);
int query_pcbios(void);
+int query_multiboot(void);
int insertaddress(ulong);
void printpatn(void);
void printpatn(void);
@@ -335,6 +336,7 @@ struct vars {
#define FIRMWARE_UNKNOWN 0
#define FIRMWARE_PCBIOS 1
#define FIRMWARE_LINUXBIOS 2
+#define FIRMWARE_MULTIBOOT 3
extern struct vars * const v;
extern unsigned char _start[], _end[], startup_32[];
