Changeset 139

Timestamp:

Dec 10, 2010 5:09:57 AM (2 years ago)

Author:

stuge

Message:

Support Linux boot protocol v2.10

The current version of FILO is only aware of the Linux boot protocol up
to the version 2.03. This makes it impossible to, e.g., load newer
kernels compiled with CONFIG_RELOCATABLE=y because they require the boot
loader to at least support version 2.05 of the Linux boot loader
protocol. Otherwise the kernel will just panic while trying to
uncompress (because it thinks the load address is NULL).
The attached patch fixes this problem by enhancing the current
implementation to cover the newer protocol versions and respect the new
members, specifically "relocatable_kernel" and "kernel_alignment".

Signed-off-by: Mathias Krause <mathias.krause@…>
Acked-by: Peter Stuge <peter@…>

File:

• trunk/filo/i386/linux_load.c (modified) (7 diffs)

trunk/filo/i386/linux_load.c

@@ -58 +58 @@
         u8 setup_sects;         /* 0x1f1 */
         u16 root_flags;         /* 0x1f2 */
-        u8 reserved2[6];        /* 0x1f4 */
+        u32 syssize;            /* 0x1f4 (2.04+) */
+        u8 reserved2[2];        /* 0x1f8 */
         u16 vid_mode;           /* 0x1fa */
         u16 root_dev;           /* 0x1fc */
@@ -83 +84 @@
         /* 2.03+ */
         u32 initrd_addr_max;    /* 0x22c */
+        /* 2.05+ */
+        u32 kernel_alignment;   /* 0x230 */
+        u8 relocatable_kernel;  /* 0x234 */
+        u8 min_alignment;       /* 0x235 (2.10+) */
+        u8 reserved6[2];        /* 0x236 */
+        /* 2.06+ */
+        u32 cmdline_size;       /* 0x238 */
+        /* 2.07+ */
+        u32 hardware_subarch;   /* 0x23c */
+        u64 hardware_subarch_data;/* 0x240 */
+        /* 2.08+ */
+        u32 payload_offset;     /* 0x248 */
+        u32 payload_length;     /* 0x24c */
+        /* 2.09+ */
+        u64 setup_data;         /* 0x250 */
+        /* 2.10+ */
+        u64 pref_address;       /* 0x258 */
+        u32 init_size;          /* 0x260 */
 } __attribute__ ((packed));
 
@@ -161 +180 @@
         u8 reserved12_5[8];     /* 0x220 */
         u32 cmd_line_ptr;       /* 0x228 */
-        u8 reserved13[164];     /* 0x22c */
+        u32 initrd_addr_max;    /* 0x22c */
+        u32 kernel_alignment;   /* 0x230 */
+        u8 relocatable_kernel;  /* 0x234 */
+        u8 reserved13[155];             /* 0x22c */
         struct e820entry e820_map[E820MAX];     /* 0x2d0 */
         u8 reserved16[688];     /* 0x550 */
@@ -177 +199 @@
 static u32 load_linux_header(struct linux_header *hdr)
 {
+        u32 kern_addr = 0;
         int load_high;
-        u32 kern_addr;
 
         if (file_read(hdr, sizeof *hdr) != sizeof *hdr) {
@@ -222 +244 @@
                 load_high = hdr->loadflags & 1;
         }
+
+        /* determine kernel load address */
+        if (hdr->protocol_version >= 0x20a) {
+                if (hdr->pref_address >> 32) {
+                        debug(" (ignoring 64bit pref_address)");
+                } else {
+                        kern_addr = hdr->pref_address;
+                }
+        }
+
+        if (hdr->protocol_version >= 0x205 && hdr->relocatable_kernel) {
+                printf(" relocatable");
+        }
+
         if (load_high) {
                 printf(" bzImage");
-                kern_addr = 0x100000;
+                if (kern_addr == 0)
+                        kern_addr = 0x100000;
         } else {
                 printf(" zImage or Image");
-                kern_addr = 0x1000;
+                if (kern_addr == 0)
+                        kern_addr = 0x1000;
         }
 
@@ -258 +296 @@
 
         params->loader_type = 0xff;     /* Unregistered Linux loader */
+
+        /* copy alignment fields for relocatable kernels */
+        if (hdr->protocol_version >= 0x205) {
+                params->relocatable_kernel = hdr->relocatable_kernel;
+                params->kernel_alignment = hdr->kernel_alignment;
+        }
 }
 
@@ -677 +721 @@
         ctx->eip = kern_addr;
 
+        /* set this field in any case to support relocatable kernels */
+        params->kernel_start = kern_addr;
+
         debug("EIP=%#x\n", kern_addr);
         printf("Jumping to entry point...\n");