Changeset 946b630 in mainline for arch/amd64/src

Timestamp:

2005-09-03T21:01:23Z (21 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

5260478

Parents:

c835e7c

Message:

Reverted APIC mapping back to identity mapping.
Added AMD64 SMP support. Works now!

Location:

arch/amd64/src

Files:

• boot/boot.S (modified) (2 diffs)
• dummy.s (modified) (1 diff)
• pm.c (modified) (2 diffs)
• smp/ap.S (added)

arch/amd64/src/boot/boot.S

@@ -83 +83 @@
         jmp 1b
 
-# Protected 16-bit. We want to reuse the code-seg descriptor,
-# the Default operand size must not be 1 when entering long mode        
+# Protected 32-bit. We want to reuse the code-seg descriptor,
+# the Default operand size must not be 1 when entering long mode
+.code32
 now_in_prot:  
         # Set up stack & data descriptors
         movw $gdtselector(KDATA_DES), %ax
         movw %ax, %ds
-        movw %ax, %fs
-        movw %ax, %gs
         movw %ax, %ss
 
@@ -172 +171 @@
         .word gdtselector(GDT_ITEMS)
         .long KA2PA(gdt)-BOOT_OFFSET
-
-.global ap_bootstrap_gdtr
-ap_bootstrap_gdtr:
-        .word gdtselector(GDT_ITEMS)
-        .long KA2PA(gdt)-BOOT_OFFSET

arch/amd64/src/dummy.s

@@ -28 +28 @@
 
 .text
-
-.global ap_boot
-        
-ap_boot:        
-        ret

arch/amd64/src/pm.c

@@ -92 +92 @@
           .granularity = 1, 
           .base_24_31  = 0 },
-        /* KTEXT 16-bit protected */
+        /* KTEXT 32-bit protected */
         { .limit_0_15  = 0xffff, 
           .base_0_15   = 0, 
@@ -100 +100 @@
           .available   = 0, 
           .longmode    = 0, 
-          .special     = 0,
+          .special     = 1,
           .granularity = 1, 
           .base_24_31  = 0 },