Changeset 5d8d71e in mainline for kernel/arch/amd64/src/amd64.c

Timestamp:

2009-03-03T21:17:45Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

06f96234

Parents:

c22e964

Message:

Move multiboot parsing to genarch/*/multiboot and adapt it for use with both ia32 and amd64. Multiboot info parsing now supported on amd64, too.

File:

• kernel/arch/amd64/src/amd64.c (modified) (4 diffs)

kernel/arch/amd64/src/amd64.c

@@ -40 +40 @@
 
 #include <proc/thread.h>
+#include <genarch/multiboot/multiboot.h>
 #include <genarch/drivers/legacy/ia32/io.h>
 #include <genarch/drivers/ega/ega.h>
@@ -46 +47 @@
 #include <arch/drivers/i8254.h>
 #include <arch/drivers/i8259.h>
+#include <arch/boot/boot.h>
 
 #ifdef CONFIG_SMP
@@ -66 +68 @@
 #include <sysinfo/sysinfo.h>
 
-
 /** Disable I/O on non-privileged levels
  *
@@ -95 +96 @@
                 ::: "%rax"
         );
+}
+
+/** Perform amd64-specific initialization before main_bsp() is called.
+ *
+ * @param signature Should contain the multiboot signature.
+ * @param mi        Pointer to the multiboot information structure.
+ */
+void arch_pre_main(uint32_t signature, const multiboot_info_t *mi)
+{
+        /* Parse multiboot information obtained from the bootloader. */
+        multiboot_info_parse(signature, mi);
+        
+#ifdef CONFIG_SMP
+        /* Copy AP bootstrap routines below 1 MB. */
+        memcpy((void *) AP_BOOT_OFFSET, (void *) BOOT_OFFSET,
+            (size_t) &_hardcoded_unmapped_size);
+#endif
 }