Changeset 7aaed09 in mainline for kernel/arch/amd64/src

Timestamp:

2011-12-18T14:02:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

kernel/arch/amd64/src

Files:

• amd64.c (modified) (4 diffs)
• boot/memmap.c (modified) (1 diff)
• boot/multiboot.S (moved) (moved from kernel/arch/amd64/src/boot/boot.S ) (6 diffs)
• boot/multiboot2.S (added)

kernel/arch/amd64/src/amd64.c

@@ -34 +34 @@
 
 #include <arch.h>
-
 #include <typedefs.h>
-
-#include <config.h>
-
-#include <proc/thread.h>
-#include <genarch/multiboot/multiboot.h>
-#include <genarch/drivers/legacy/ia32/io.h>
-#include <genarch/drivers/ega/ega.h>
-#include <arch/drivers/vesa.h>
-#include <genarch/drivers/i8042/i8042.h>
-#include <genarch/kbrd/kbrd.h>
+#include <errno.h>
+#include <memstr.h>
+#include <interrupt.h>
+#include <console/console.h>
+#include <syscall/syscall.h>
+#include <sysinfo/sysinfo.h>
+#include <arch/bios/bios.h>
+#include <arch/boot/boot.h>
+#include <arch/debugger.h>
 #include <arch/drivers/i8254.h>
 #include <arch/drivers/i8259.h>
-#include <arch/boot/boot.h>
+#include <arch/syscall.h>
+#include <genarch/acpi/acpi.h>
+#include <genarch/drivers/ega/ega.h>
+#include <genarch/drivers/i8042/i8042.h>
+#include <genarch/drivers/legacy/ia32/io.h>
+#include <genarch/fb/bfb.h>
+#include <genarch/kbrd/kbrd.h>
+#include <genarch/multiboot/multiboot.h>
+#include <genarch/multiboot/multiboot2.h>
 
 #ifdef CONFIG_SMP
 #include <arch/smp/apic.h>
 #endif
-
-#include <arch/bios/bios.h>
-#include <arch/cpu.h>
-#include <print.h>
-#include <arch/cpuid.h>
-#include <genarch/acpi/acpi.h>
-#include <panic.h>
-#include <interrupt.h>
-#include <arch/syscall.h>
-#include <arch/debugger.h>
-#include <syscall/syscall.h>
-#include <console/console.h>
-#include <ddi/irq.h>
-#include <sysinfo/sysinfo.h>
-#include <memstr.h>
 
 /** Disable I/O on non-privileged levels
@@ -101 +92 @@
 /** 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)
+ * @param signature Multiboot signature.
+ * @param info      Multiboot information structure.
+ *
+ */
+void arch_pre_main(uint32_t signature, void *info)
 {
         /* Parse multiboot information obtained from the bootloader. */
-        multiboot_info_parse(signature, mi);
+        multiboot_info_parse(signature, (multiboot_info_t *) info);
+        multiboot2_info_parse(signature, (multiboot2_info_t *) info);
         
 #ifdef CONFIG_SMP
@@ -153 +146 @@
                 
 #if (defined(CONFIG_FB) || defined(CONFIG_EGA))
-                bool vesa = false;
+                bool bfb = false;
 #endif
                 
 #ifdef CONFIG_FB
-                vesa = vesa_init();
+                bfb = bfb_init();
 #endif
                 
 #ifdef CONFIG_EGA
-                if (!vesa) {
+                if (!bfb) {
                         outdev_t *egadev = ega_init(EGA_BASE, EGA_VIDEORAM);
                         if (egadev)
@@ -261 +254 @@
  * we need not to go to CPL0 to read it.
  */
-sysarg_t sys_tls_set(sysarg_t addr)
+sysarg_t sys_tls_set(uintptr_t addr)
 {
         THREAD->arch.tls = addr;
         write_msr(AMD_MSR_FS, addr);
         
-        return 0;
+        return EOK;
 }
 

kernel/arch/amd64/src/boot/memmap.c

@@ -35 +35 @@
 #include <arch/boot/memmap.h>
 
-uint8_t e820counter = 0xffU;
+uint8_t e820counter = 0;
 e820memmap_t e820table[MEMMAP_E820_MAX_RECORDS];
 

kernel/arch/amd64/src/boot/multiboot.S

@@ -30 +30 @@
 
 #include <arch/boot/boot.h>
-#include <arch/boot/memmap.h>
 #include <arch/mm/page.h>
 #include <arch/mm/ptl.h>
 #include <arch/pm.h>
+#include <genarch/multiboot/multiboot.h>
+#include <arch/cpuid.h>
 #include <arch/cpu.h>
-#include <arch/cpuid.h>
 
 #define START_STACK  (BOOT_OFFSET - BOOT_STACK_SIZE)
@@ -101 +101 @@
         multiboot_meeting_point:
         
-        /* Save GRUB arguments */
-        movl %eax, grub_eax
-        movl %ebx, grub_ebx
+        /*
+         * Protected 32-bit. We want to reuse the code-seg descriptor,
+         * the Default operand size must not be 1 when entering long mode.
+         */
+        
+        /* Save multiboot arguments */
+        movl %eax, multiboot_eax
+        movl %ebx, multiboot_ebx
         
         pm_status $status_prot
@@ -149 +154 @@
         
 #include "vesa_prot.inc"
-        
-        /*
-         * Protected 32-bit. We want to reuse the code-seg descriptor,
-         * the Default operand size must not be 1 when entering long mode.
-         */
         
         pm2_status $status_prot2
@@ -422 +422 @@
         long_status $status_long
         
-        /* Call arch_pre_main(grub_eax, grub_ebx) */
+        /* Call arch_pre_main(multiboot_eax, multiboot_ebx) */
         xorq %rdi, %rdi
-        movl grub_eax, %edi
+        movl multiboot_eax, %edi
         xorq %rsi, %rsi
-        movl grub_ebx, %esi
+        movl multiboot_ebx, %esi
         
         movabsq $arch_pre_main, %rax
@@ -645 +645 @@
 .section K_DATA_START, "aw", @progbits
 
+.global bootstrap_gdtr
 bootstrap_gdtr:
         .word GDT_SELECTOR(GDT_ITEMS)
         .long KA2PA(gdt)
 
-grub_eax:
+.global multiboot_eax
+multiboot_eax:
         .long 0
 
-grub_ebx:
+.global multiboot_ebx
+multiboot_ebx:
         .long 0
 
@@ -670 +673 @@
 status_vesa_copy:
         .asciz "[vesa_copy] "
-status_grub_cmdline:
-        .asciz "[grub_cmdline] "
+status_multiboot_cmdline:
+        .asciz "[multiboot_cmdline] "
 status_vesa_real:
         .asciz "[vesa_real] "