Changeset deca67b in mainline

Timestamp:

2009-03-03T12:56:20Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

add04f7

Parents:

2f57690

Message:

rename ia32_cboot() to arch_pre_main() and move it to ia32.c (to be in line with other platforms)

Location:

kernel/arch/ia32

Files:

• Makefile.inc (modified) (1 diff)
• include/arch.h (modified) (2 diffs)
• include/boot/boot.h (modified) (2 diffs)
• include/boot/multiboot.h (moved) (moved from kernel/arch/ia32/include/boot/cboot.h ) (3 diffs)
• src/boot/boot.S (modified) (1 diff)
• src/boot/cboot.c (deleted)
• src/ia32.c (modified) (2 diffs)

kernel/arch/ia32/Makefile.inc

@@ -100 +100 @@
         arch/$(KARCH)/src/drivers/vesa.c \
         arch/$(KARCH)/src/boot/boot.S \
-        arch/$(KARCH)/src/boot/cboot.c \
         arch/$(KARCH)/src/boot/memmap.c \
         arch/$(KARCH)/src/fpu_context.c \

kernel/arch/ia32/include/arch.h

@@ -27 +27 @@
  */
 
-/** @addtogroup ia32    
+/** @addtogroup ia32
  * @{
  */
@@ -36 +36 @@
 #define KERN_ia32_ARCH_H_
 
+#include <arch/boot/multiboot.h>
+
+extern void arch_pre_main(uint32_t signature, const mb_info_t *mi);
+
 #endif
 

kernel/arch/ia32/include/boot/boot.h

@@ -27 +27 @@
  */
 
-/** @addtogroup ia32    
+/** @addtogroup ia32
  * @{
  */
@@ -36 +36 @@
 #define KERN_ia32_BOOT_H_
 
-#define BOOT_OFFSET             0x108000
-#define AP_BOOT_OFFSET          0x8000
-#define BOOT_STACK_SIZE 0x400
+#define BOOT_OFFSET      0x108000
+#define AP_BOOT_OFFSET   0x8000
+#define BOOT_STACK_SIZE  0x400
 
-#define MULTIBOOT_HEADER_MAGIC  0x1BADB002
-#define MULTIBOOT_HEADER_FLAGS  0x00010003
+#define MULTIBOOT_HEADER_MAGIC  0x1BADB002
+#define MULTIBOOT_HEADER_FLAGS  0x00010003
 
-#define MULTIBOOT_LOADER_MAGIC  0x2BADB002
+#define MULTIBOOT_LOADER_MAGIC  0x2BADB002
+
+#ifndef __ASM__
+
+#ifdef CONFIG_SMP
+
+extern int _hardcoded_unmapped_size;
+
+#endif /* CONFIG_SMP */
+
+#endif /* __ASM__ */
 
 #endif

kernel/arch/ia32/include/boot/multiboot.h

@@ -27 +27 @@
  */
 
-/** @addtogroup ia32    
+/** @addtogroup ia32
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef KERN_ia32_CBOOT_H__
-#define KERN_ia32_CBOOT_H_
+#ifndef KERN_ia32_MULTIBOOT_H__
+#define KERN_ia32_MULTIBOOT_H_
 
 #include <arch/types.h>
@@ -58 +58 @@
         uintptr_t mem_lower;
         uintptr_t mem_upper;
-
+        
         uint32_t boot_device;
         char *cmdline;
-
+        
         uint32_t mods_count;
         mb_mod_t *mods_addr;
-
+        
         uint32_t syms[4];
-
+        
         uint32_t mmap_length;
         mb_mmap_t *mmap_addr;
-
+        
         /* ... */
 } __attribute__ ((packed)) mb_info_t;
 
 enum mb_info_flags {
-        MBINFO_FLAGS_MEM        = 0x01,
-        MBINFO_FLAGS_BOOT       = 0x02,
-        MBINFO_FLAGS_CMDLINE    = 0x04,
-        MBINFO_FLAGS_MODS       = 0x08,
-        MBINFO_FLAGS_SYMS1      = 0x10,
-        MBINFO_FLAGS_SYMS2      = 0x20,
-        MBINFO_FLAGS_MMAP       = 0x40
+        MBINFO_FLAGS_MEM     = 0x01,
+        MBINFO_FLAGS_BOOT    = 0x02,
+        MBINFO_FLAGS_CMDLINE = 0x04,
+        MBINFO_FLAGS_MODS    = 0x08,
+        MBINFO_FLAGS_SYMS1   = 0x10,
+        MBINFO_FLAGS_SYMS2   = 0x20,
+        MBINFO_FLAGS_MMAP    = 0x40
+        
         /* ... */
 };
-
-extern void ia32_cboot(uint32_t signature, const mb_info_t *mi);
 
 #endif

kernel/arch/ia32/src/boot/boot.S

@@ -105 +105 @@
         call map_kernel                                                 # map kernel and turn paging on
 
-        # ia32_cboot(grub_eax, grub_ebx)
+        # arch_pre_main(grub_eax, grub_ebx)
         pushl grub_ebx
         pushl grub_eax
-        call ia32_cboot         # Does not return.
-
+        call arch_pre_main
+        
+        call main_bsp
+        
         # Not reached.
-
+        
         cli
         hlt

kernel/arch/ia32/src/ia32.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2009 Martin Decky
  * All rights reserved.
  *
@@ -64 +66 @@
 #include <ddi/device.h>
 #include <sysinfo/sysinfo.h>
+#include <arch/boot/boot.h>
+#include <string.h>
+#include <macros.h>
 
 #ifdef CONFIG_SMP
 #include <arch/smp/apic.h>
 #endif
+
+/** Extract command name from the multiboot module command line.
+ *
+ * @param buf      Destination buffer (will always null-terminate).
+ * @param n        Size of destination buffer.
+ * @param cmd_line Input string (the command line).
+ *
+ */
+static void extract_command(char *buf, size_t n, const char *cmd_line)
+{
+        const char *start, *end, *cp;
+        size_t max_len;
+        
+        /* Find the first space. */
+        end = strchr(cmd_line, ' ');
+        if (end == NULL)
+                end = cmd_line + strlen(cmd_line);
+        
+        /*
+         * Find last occurence of '/' before 'end'. If found, place start at
+         * next character. Otherwise, place start at beginning of buffer.
+         */
+        cp = end;
+        start = buf;
+        while (cp != start) {
+                if (*cp == '/') {
+                        start = cp + 1;
+                        break;
+                }
+                --cp;
+        }
+        
+        /* Copy the command and null-terminate the string. */
+        max_len = min(n - 1, (size_t) (end - start));
+        strncpy(buf, start, max_len + 1);
+        buf[max_len] = '\0';
+}
+
+/** C part of ia32 boot sequence.
+ *
+ * @param signature Should contain the multiboot signature.
+ * @param mi        Pointer to the multiboot information structure.
+ */
+void arch_pre_main(uint32_t signature, const mb_info_t *mi)
+{
+        uint32_t flags;
+        mb_mod_t *mods;
+        uint32_t i;
+        
+        if (signature == MULTIBOOT_LOADER_MAGIC)
+                flags = mi->flags;
+        else {
+                /* No multiboot info available. */
+                flags = 0;
+        }
+        
+        /* Copy module information. */
+        
+        if ((flags & MBINFO_FLAGS_MODS) != 0) {
+                init.cnt = mi->mods_count;
+                mods = mi->mods_addr;
+                
+                for (i = 0; i < init.cnt; i++) {
+                        init.tasks[i].addr = mods[i].start + 0x80000000;
+                        init.tasks[i].size = mods[i].end - mods[i].start;
+                        
+                        /* Copy command line, if available. */
+                        if (mods[i].string) {
+                                extract_command(init.tasks[i].name,
+                                    CONFIG_TASK_NAME_BUFLEN,
+                                    mods[i].string);
+                        } else
+                                init.tasks[i].name[0] = '\0';
+                }
+        } else
+                init.cnt = 0;
+        
+        /* Copy memory map. */
+        
+        int32_t mmap_length;
+        mb_mmap_t *mme;
+        uint32_t size;
+        
+        if ((flags & MBINFO_FLAGS_MMAP) != 0) {
+                mmap_length = mi->mmap_length;
+                mme = mi->mmap_addr;
+                e820counter = 0;
+                
+                i = 0;
+                while (mmap_length > 0) {
+                        e820table[i++] = mme->mm_info;
+                        
+                        /* Compute address of next structure. */
+                        size = sizeof(mme->size) + mme->size;
+                        mme = ((void *) mme) + size;
+                        mmap_length -= size;
+                }
+                
+                e820counter = i;
+        } else
+                e820counter = 0;
+        
+#ifdef CONFIG_SMP
+        /* Copy AP bootstrap routines below 1 MB. */
+        memcpy((void *) AP_BOOT_OFFSET, (void *) BOOT_OFFSET,
+            (size_t) &_hardcoded_unmapped_size);
+#endif
+}
 
 void arch_pre_mm_init(void)