Changeset 8a1afd2 in mainline for kernel/arch/amd64

Timestamp:

2018-10-17T22:51:33Z (7 years ago)

Author:

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

Branches:

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

Children:

1d18bbc0, d723a80

Parents:

7900e5d

Message:

Remove hardcoded data variables from kernel linker scripts

Location:

kernel/arch/amd64

Files:

• _link.ld.in (modified) (3 diffs)
• include/arch/boot/boot.h (modified) (1 diff)
• src/amd64.c (modified) (1 diff)

kernel/arch/amd64/_link.ld.in

@@ -13 +13 @@
 
 SECTIONS {
+        kernel_load_address = PA2KA(BOOT_OFFSET);
+
         .unmapped BOOT_OFFSET: AT (0) {
                 unmapped_ktext_start = .;
@@ -32 +34 @@
                 *(.data);              /* initialized data */
                 *(.rodata .rodata.*);  /* string literals */
-                hardcoded_load_address = .;
-                QUAD(PA2KA(BOOT_OFFSET));
-                hardcoded_ktext_size = .;
-                QUAD(ktext_end - ktext_start + (unmapped_ktext_end - unmapped_ktext_start));
-                hardcoded_kdata_size = .;
-                QUAD(kdata_end - kdata_start + (unmapped_kdata_end - unmapped_kdata_start));
-                hardcoded_unmapped_ktext_size = .;
-                QUAD(unmapped_ktext_end - unmapped_ktext_start);
-                hardcoded_unmapped_kdata_size = .;
-                QUAD(unmapped_kdata_end - unmapped_kdata_start);
                 *(COMMON);      /* global variables */
 
@@ -71 +63 @@
 
 #ifdef CONFIG_SMP
-        _hardcoded_unmapped_size = (unmapped_ktext_end - unmapped_ktext_start) + (unmapped_kdata_end - unmapped_kdata_start);
         ap_boot = unmapped_ap_boot - BOOT_OFFSET + AP_BOOT_OFFSET;
         ap_gdtr = unmapped_ap_gdtr - BOOT_OFFSET + AP_BOOT_OFFSET;

kernel/arch/amd64/include/arch/boot/boot.h

@@ -42 +42 @@
 #ifndef __ASSEMBLER__
 
-#ifdef CONFIG_SMP
-
-/* This is only a symbol so the type is dummy. Obtain the value using &. */
-extern int _hardcoded_unmapped_size;
-
-#endif /* CONFIG_SMP */
+extern uint8_t unmapped_kdata_end[];
 
 #endif /* __ASSEMBLER__ */

kernel/arch/amd64/src/amd64.c

@@ -94 +94 @@
 
 #ifdef CONFIG_SMP
+        size_t unmapped_size = (uintptr_t) unmapped_kdata_end - BOOT_OFFSET;
         /* Copy AP bootstrap routines below 1 MB. */
-        memcpy((void *) AP_BOOT_OFFSET, (void *) BOOT_OFFSET,
-            (size_t) &_hardcoded_unmapped_size);
+        memcpy((void *) AP_BOOT_OFFSET, (void *) BOOT_OFFSET, unmapped_size);
 #endif
 }