Changeset 6e5252a in mainline for kernel/arch/ia32

Timestamp:

2018-11-13T20:22:20Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Children:

156bae23

Parents:

2214382

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-10-23 21:48:41)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-13 20:22:20)

Message:

Place AP bootstrap correctly via linker script instead of manual copy

Location:

kernel/arch/ia32

Files:

• _link.ld.in (modified) (3 diffs)
• include/arch/boot/boot.h (modified) (1 diff)
• src/boot/multiboot.S (modified) (2 diffs)
• src/boot/multiboot2.S (modified) (1 diff)
• src/ia32.c (modified) (1 diff)
• src/mm/frame.c (modified) (2 diffs)
• src/smp/ap.S (modified) (4 diffs)

kernel/arch/ia32/_link.ld.in

@@ -14 +14 @@
 ENTRY(multiboot_image_start)
 
+PHDRS {
+        ap_boot PT_LOAD ;
+        unmapped PT_LOAD ;
+        mapped PT_LOAD ;
+}
+
 SECTIONS {
         kernel_load_address = PA2KA(BOOT_OFFSET);
 
-        .unmapped (BOOT_OFFSET + SIZEOF_HEADERS): AT (BOOT_OFFSET + SIZEOF_HEADERS) {
+        .ap_bootstrap (AP_BOOT_OFFSET): AT (AP_BOOT_OFFSET) {
+                ap_bootstrap_start = .;
+
+                /* Must be first. */
+                *(.multiboot);
+
+                *(K_AP_TEXT_START);
+                *(K_AP_DATA_START);
+                ap_bootstrap_end = .;
+        } :ap_boot
+
+        .unmapped (BOOT_OFFSET): AT (BOOT_OFFSET) {
                 unmapped_start = .;
                 *(K_TEXT_START);
                 *(K_DATA_START);
                 unmapped_end = .;
-        }
+        } :unmapped
 
-        .mapped (PA2KA(BOOT_OFFSET) + SIZEOF_HEADERS + SIZEOF(.unmapped)): AT (BOOT_OFFSET + SIZEOF_HEADERS + SIZEOF(.unmapped)) {
+        .mapped (PA2KA(BOOT_OFFSET) + SIZEOF(.unmapped)): AT (BOOT_OFFSET + SIZEOF(.unmapped)) {
                 ktext_start = .;
                 *(.text .text.*);
@@ -41 +58 @@
                 *(symtab.*);            /* Symbol table, must be LAST symbol! */
                 kdata_end = .;
-        }
+        } :mapped
 
 #ifdef CONFIG_LINE_DEBUG
@@ -61 +78 @@
 
 #ifdef CONFIG_SMP
-
-        ap_boot = unmapped_ap_boot - BOOT_OFFSET + AP_BOOT_OFFSET;
-        ap_gdtr = unmapped_ap_gdtr - BOOT_OFFSET + AP_BOOT_OFFSET;
         protected_ap_gdtr = PA2KA(ap_gdtr);
-
 #endif /* CONFIG_SMP */
 

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

@@ -44 +44 @@
 #ifdef CONFIG_SMP
 
-extern uint8_t unmapped_end[];
+extern uint8_t ap_bootstrap_start[];
+extern uint8_t ap_bootstrap_end[];
 
 #endif /* CONFIG_SMP */

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

@@ -46 +46 @@
 #define START_STACK  (BOOT_OFFSET - BOOT_STACK_SIZE)
 
-.section K_TEXT_START, "ax"
-
-.code32
-
-.macro pm_status msg
-#if defined(CONFIG_EGA) && !defined(CONFIG_FB)
-        pushl %esi
-        movl \msg, %esi
-        call pm_early_puts
-        popl %esi
-#endif
-.endm
-
-.macro pm2_status msg
-        pushl \msg
-        call early_puts
-.endm
+.section .multiboot, "a"
 
 .align 4
@@ -85 +69 @@
         .long CONFIG_BFB_BPP
 #endif
+
+.section K_TEXT_START, "ax"
+
+.code32
+
+.macro pm_status msg
+#if defined(CONFIG_EGA) && !defined(CONFIG_FB)
+        pushl %esi
+        movl \msg, %esi
+        call pm_early_puts
+        popl %esi
+#endif
+.endm
+
+.macro pm2_status msg
+        pushl \msg
+        call early_puts
+.endm
 
 SYMBOL(multiboot_image_start)

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

@@ -33 +33 @@
 #include <genarch/multiboot/multiboot2.h>
 
-.section K_TEXT_START, "ax"
-
-.code32
+.section .multiboot, "a"
 
 .align 8

kernel/arch/ia32/src/ia32.c

@@ -92 +92 @@
         multiboot_info_parse(signature, (multiboot_info_t *) info);
         multiboot2_info_parse(signature, (multiboot2_info_t *) info);
-
-#ifdef CONFIG_SMP
-        size_t unmapped_size = (uintptr_t) unmapped_end - BOOT_OFFSET;
-        /* Copy AP bootstrap routines below 1 MB. */
-        memcpy((void *) AP_BOOT_OFFSET, (void *) BOOT_OFFSET, unmapped_size);
-#endif
 }
 

kernel/arch/ia32/src/mm/frame.c

@@ -152 +152 @@
 
 #ifdef CONFIG_SMP
-                size_t unmapped_size =
-                    (uintptr_t) unmapped_end - BOOT_OFFSET;
-
-                minconf = max(minconf,
-                    ADDR2PFN(AP_BOOT_OFFSET + unmapped_size));
+                // FIXME: What is the purpose of minconf? Can we remove it?
+                uintptr_t ap_end = ALIGN_UP((uintptr_t) ap_bootstrap_end, FRAME_SIZE);
+                minconf = max(minconf, ADDR2PFN(ap_end));
 #endif
 
@@ -165 +163 @@
 
 #ifdef CONFIG_SMP
+                // TODO: should go away implicitly with section table
+
                 /* Reserve AP real mode bootstrap memory */
+                size_t ap_size =
+                    ALIGN_UP(ap_bootstrap_end - ap_bootstrap_start, FRAME_SIZE);
                 frame_mark_unavailable(AP_BOOT_OFFSET >> FRAME_WIDTH,
-                    unmapped_size >> FRAME_WIDTH);
+                    ap_size >> FRAME_WIDTH);
 #endif
         }

kernel/arch/ia32/src/smp/ap.S

@@ -40 +40 @@
 #include <arch/context_struct.h>
 
-.section K_TEXT_START, "ax"
+.section K_AP_TEXT_START, "ax"
 
 #ifdef CONFIG_SMP
@@ -54 +54 @@
 
 .align 4096
-SYMBOL(unmapped_ap_boot)
+SYMBOL(ap_boot)
 .code16
         cli
@@ -67 +67 @@
         orl $CR0_PE, %eax
         movl %eax, %cr0
-        jmpl $KTEXT, $jump_to_kernel - BOOT_OFFSET + AP_BOOT_OFFSET
+        jmpl $KTEXT, $jump_to_kernel
 
 jump_to_kernel:
@@ -96 +96 @@
 
 
-.section K_DATA_START, "aw", @progbits
+.section K_AP_DATA_START, "aw", @progbits
 
 #ifdef CONFIG_SMP
 
-SYMBOL(unmapped_ap_gdtr)
+SYMBOL(ap_gdtr)
         .word 0
         .long 0