Changeset 1f5c9c96 in mainline for kernel/arch/ia32/src

Timestamp:

2011-12-02T17:29:43Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b8b1e631, c3887ad

Parents:

c48f6ab

Message:

implement multiboot v2 specification and use it in GRUB for UEFI

• improve multiboot v1 code, move defines to a common location
• rename VESA framebuffer stuff to generic "boot framebuffer"
• small collateral changes

Location:

kernel/arch/ia32/src

Files:

• boot/memmap.c (modified) (1 diff)
• boot/multiboot.S (moved) (moved from kernel/arch/ia32/src/boot/boot.S ) (8 diffs)
• boot/multiboot2.S (added)
• boot/vesa_prot.inc (modified) (3 diffs)
• boot/vesa_real.inc (modified) (4 diffs)
• ia32.c (modified) (3 diffs)

kernel/arch/ia32/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/ia32/src/boot/multiboot.S

@@ -30 +30 @@
 
 #include <arch/boot/boot.h>
-#include <arch/boot/memmap.h>
 #include <arch/mm/page.h>
 #include <arch/pm.h>
+#include <genarch/multiboot/multiboot.h>
 #include <arch/cpuid.h>
 
@@ -92 +92 @@
         multiboot_meeting_point:
         
-        /* Save GRUB arguments */
-        movl %eax, grub_eax
-        movl %ebx, grub_ebx
+        /* Save multiboot arguments */
+        movl %eax, multiboot_eax
+        movl %ebx, multiboot_ebx
         
         pm_status $status_prot
@@ -135 +135 @@
         pm2_status $status_prot3
         
-        /* Call arch_pre_main(grub_eax, grub_ebx) */
-        pushl grub_ebx
-        pushl grub_eax
+        /* Call arch_pre_main(multiboot_eax, multiboot_ebx) */
+        pushl multiboot_ebx
+        pushl multiboot_eax
         call arch_pre_main
         
@@ -196 +196 @@
  *
  */
+.global map_kernel_non_pse
 map_kernel_non_pse:
         /* Paging features */
@@ -299 +300 @@
 find_mem_for_pt:
         /* Check if multiboot info is present */
-        cmpl $MULTIBOOT_LOADER_MAGIC, grub_eax
+        cmpl $MULTIBOOT_LOADER_MAGIC, multiboot_eax
         je check_multiboot_map
                 
@@ -307 +308 @@
                 
                 /* Copy address of the multiboot info to ebx */
-                movl grub_ebx, %ebx
+                movl multiboot_ebx, %ebx
                 
                 /* Check if memory map flag is present */
@@ -701 +702 @@
         .space 4096, 0
 
+.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
 
@@ -725 +730 @@
 status_vesa_copy:
         .asciz "[vesa_copy] "
-status_grub_cmdline:
-        .asciz "[grub_cmdline] "
+status_multiboot_cmdline:
+        .asciz "[multiboot_cmdline] "
 status_vesa_real:
         .asciz "[vesa_real] "

kernel/arch/ia32/src/boot/vesa_prot.inc

@@ -1 +1 @@
 #ifdef CONFIG_FB
 
-#define MULTIBOOT_LOADER_MAGIC  0x2BADB002
 #define MBINFO_BIT_CMDLINE      2
 #define MBINFO_OFFSET_CMDLINE   16
@@ -14 +13 @@
         rep movsb
         
-        /* Check for GRUB command line */
+        /* Check for multiboot command line */
         
-        pm_status $status_grub_cmdline
+        pm_status $status_multiboot_cmdline
         
-        mov grub_eax, %eax
+        mov multiboot_eax, %eax
         cmp $MULTIBOOT_LOADER_MAGIC, %eax
         jne no_cmdline
         
-        mov grub_ebx, %ebx
+        mov multiboot_ebx, %ebx
         mov (%ebx), %eax
         bt $MBINFO_BIT_CMDLINE, %eax
@@ -89 +88 @@
                 /* Returned back to protected mode */
                 
-                mov %ax, KA2PA(vesa_scanline)
+                movzx %ax, %ecx
+                mov %ecx, KA2PA(bfb_scanline)
+                
                 shr $16, %eax
-                mov %ax, KA2PA(vesa_bpp)
+                mov %ax, KA2PA(bfb_bpp)
                 
-                mov %bx, KA2PA(vesa_height)
+                movzx %bx, %ecx
+                mov %ecx, KA2PA(bfb_height)
+                
                 shr $16, %ebx
-                mov %bx, KA2PA(vesa_width)
+                mov %ebx, KA2PA(bfb_width)
                 
-                mov %dl, KA2PA(vesa_green_pos)
+                mov %dl, KA2PA(bfb_green_pos)
+                
                 shr $8, %edx
-                mov %dl, KA2PA(vesa_green_mask)
+                mov %dl, KA2PA(bfb_green_size)
+                
                 shr $8, %edx
-                mov %dl, KA2PA(vesa_red_pos)
+                mov %dl, KA2PA(bfb_red_pos)
+                
                 shr $8, %edx
-                mov %dl, KA2PA(vesa_red_mask)
+                mov %dl, KA2PA(bfb_red_size)
                 
                 mov %esi, %edx
-                mov %dl, KA2PA(vesa_blue_pos)
+                mov %dl, KA2PA(bfb_blue_pos)
+                
                 shr $8, %edx
-                mov %dl, KA2PA(vesa_blue_mask)
+                mov %dl, KA2PA(bfb_blue_size)
                 
-                mov %edi, KA2PA(vesa_ph_addr)
+                mov %edi, KA2PA(bfb_addr)
 #endif

kernel/arch/ia32/src/boot/vesa_real.inc

@@ -304 +304 @@
                 /*
                  * Store mode parameters:
-                 *  eax = bpp[8] scanline[16]
+                 *  eax = bpp[16] scanline[16]
                  *  ebx = width[16]  height[16]
                  *  edx = red_mask[8] red_pos[8] green_mask[8] green_pos[8]
@@ -328 +328 @@
                 shl $8, %edx
                 mov VESA_MODE_RED_POS_OFFSET(%di), %dl
+                
                 shl $8, %edx
                 mov VESA_MODE_GREEN_MASK_OFFSET(%di), %dl
@@ -369 +370 @@
                 mov $0x0003, %ax
                 int $0x10
+                
+                xor %eax, %eax
+                xor %ebx, %ebx
+                xor %edx, %edx
                 mov $0xffffffff, %edi
-                xor %ax, %ax
+                
                 jz vesa_leave_real  /* force relative jump */
 
@@ -386 +391 @@
 
 default_mode:
-        .ascii STRING(CONFIG_VESA_MODE)
+        .ascii STRING(CONFIG_BFB_MODE)
         .ascii "-"
-        .asciz STRING(CONFIG_VESA_BPP)
+        .asciz STRING(CONFIG_BFB_BPP)
         .fill 24
 

kernel/arch/ia32/src/ia32.c

@@ -42 +42 @@
 
 #include <genarch/multiboot/multiboot.h>
+#include <genarch/multiboot/multiboot2.h>
 #include <genarch/drivers/legacy/ia32/io.h>
 #include <genarch/drivers/ega/ega.h>
-#include <arch/drivers/vesa.h>
+#include <genarch/fb/bfb.h>
 #include <genarch/drivers/i8042/i8042.h>
 #include <genarch/kbrd/kbrd.h>
@@ -76 +77 @@
 /** Perform ia32-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
@@ -114 +117 @@
                 
 #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)