Changeset f6297e0 in mainline for arch/ia32/src/pm.c

Timestamp:

2005-09-03T15:45:14Z (20 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

ab08b42

Parents:

2f08a55d

Message:

proper way of initializing GDT during boot on IA-32, fixes the nasty hack
SMP might be still broken

File:

• arch/ia32/src/pm.c (modified) (2 diffs)

arch/ia32/src/pm.c

@@ -71 +71 @@
 
 /* gdtr is changed by kmp before next CPU is initialized */
-struct ptr_16_32 gdtr __attribute__ ((section ("K_DATA_START"))) = { .limit = sizeof(gdt), .base = KA2PA((__address) gdt - BOOT_OFFSET) };
+struct ptr_16_32 bsp_bootstrap_gdtr __attribute__ ((section ("K_DATA_START"))) = { .limit = sizeof(gdt), .base = KA2PA((__address) gdt - BOOT_OFFSET) };
+struct ptr_16_32 ap_bootstrap_gdtr __attribute__ ((section ("K_DATA_START"))) = { .limit = sizeof(gdt), .base = KA2PA((__address) gdt) };
+struct ptr_16_32 gdtr = { .limit = sizeof(gdt), .base = KA2PA((__address) gdt) };
 struct ptr_16_32 idtr __attribute__ ((section ("K_DATA_START"))) = { .limit = sizeof(idt), .base = KA2PA((__address) idt) };
 
@@ -171 +173 @@
          * Update addresses in GDT and IDT to their virtual counterparts.
          */
-        gdtr.base = KA2PA(gdtr.base);
+        gdtr.base = (__address) gdt;
         idtr.base = (__address) idt;
         __asm__ volatile ("lgdt %0\n" : : "m" (gdtr));