Changeset 66def8d in mainline for arch/ia32/src/smp/ap.S

Timestamp:

2006-01-08T17:51:36Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

8725fb4

Parents:

078a0a1

Message:

simplify and cleanup ia32 boot process, remove obsolete stuff

File:

• arch/ia32/src/smp/ap.S (modified) (6 diffs)

arch/ia32/src/smp/ap.S

@@ -1 +1 @@
 #
 # Copyright (C) 2001-2004 Jakub Jermar
+# Copyright (C) 2005-2006 Martin Decky
 # All rights reserved.
 #
@@ -31 +32 @@
 #
 
-.section K_TEXT_START_2, "ax"
+#include <arch/boot/boot.h>
+#include <arch/boot/memmap.h>
+#include <arch/mm/page.h>
+#include <arch/pm.h>
+
+.section K_TEXT_START, "ax"
 
 #ifdef CONFIG_SMP
 
-.global ap_boot
+.global unmapped_ap_boot
 
 KTEXT=8
@@ -45 +51 @@
 
 .align 4096
-ap_boot:
+unmapped_ap_boot:
 .code16
         cli
@@ -51 +57 @@
         movw %ax, %ds
 
-        lgdt real_bootstrap_gdtr_boot   # initialize Global Descriptor Table register
+        lgdt ap_gdtr            # initialize Global Descriptor Table register
         
         movl %cr0, %eax
         orl $1, %eax
         movl %eax, %cr0                         # switch to protected mode
-        jmpl $KTEXT, $jump_to_kernel
+        jmpl $KTEXT, $jump_to_kernel - BOOT_OFFSET + AP_BOOT_OFFSET
         
 jump_to_kernel:
@@ -64 +70 @@
         movw %ax, %es
         movw %ax, %ss
-        movl $(ctx-0x80000000), %eax    # KA2PA((__address) &ctx)
+        movl $KA2PA(ctx), %eax                  # KA2PA((__address) &ctx)
         movl (%eax), %esp
         subl $0x80000000, %esp                  # KA2PA(ctx.sp)
@@ -75 +81 @@
 
 #endif /* CONFIG_SMP */
+
+
+.section K_DATA_START, "ax"
+
+#ifdef CONFIG_SMP
+
+.global unmapped_ap_gdtr
+
+unmapped_ap_gdtr:
+        .word 0
+        .long 0
+
+#endif /* CONFIG_SMP */