Changeset 6e5252a in mainline for kernel/arch/ia32/src/mm/frame.c

Timestamp:

2018-11-13T20:22:20Z (5 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

File:

• kernel/arch/ia32/src/mm/frame.c (modified) (2 diffs)

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
         }