Changeset 946b630 in mainline

Timestamp:

2005-09-03T21:01:23Z (19 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

Files:

• amd64/Makefile.inc (modified) (1 diff)
• amd64/_link.ld (modified) (1 diff)
• amd64/src/boot/boot.S (modified) (2 diffs)
• amd64/src/dummy.s (modified) (1 diff)
• amd64/src/pm.c (modified) (2 diffs)
• amd64/src/smp/ap.S (added)
• ia32/src/smp/mps.c (modified) (2 diffs)
• ia32/src/smp/smp.c (modified) (1 diff)

arch/amd64/Makefile.inc

@@ -53 +53 @@
 
 ifdef SMP
-arch_sources += arch/smp/apic.c \
+arch_sources += arch/smp/ap.S \
+                arch/smp/apic.c \
                 arch/smp/ipi.c \
                 arch/smp/mps.c \

arch/amd64/_link.ld

@@ -56 +56 @@
                 kdata_end = .;
         }
-        _map_address = 0xffffffff80100000;
+        _boot_offset = 0x100000;
+        _ka2pa_offset = 0xffffffff80000000;
+        _map_address = _ka2pa_offset + _boot_offset;
+
         _hardcoded_kernel_size = (ktext_end - ktext_start) + (unmapped_ktext_end - unmapped_ktext_start) + (kdata_end - kdata_start) + (unmapped_kdata_end - unmapped_kdata_start);
 
         e820table_boot = e820table - _map_address;
         e820counter_boot = e820counter - _map_address;
+        ap_bootstrap_gdtr = ap_bootstrap_gdtr_boot + _ka2pa_offset;
 }

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 },

arch/ia32/src/smp/mps.c

@@ -224 +224 @@
         }
         
-        l_apic = (__u32 *)PA2KA((__address)ct->l_apic);
+        l_apic = (__u32 *)(__address)ct->l_apic;
 
         cnt = 0;
@@ -334 +334 @@
         }
         
-        io_apic = (__u32 *)PA2KA((__address)ioa->io_apic);
+        io_apic = (__u32 *)(__address)ioa->io_apic;
 }
 

arch/ia32/src/smp/smp.c

@@ -62 +62 @@
         }
 
-        if (config.cpu_count > 1) {
-                map_page_to_frame((__address)l_apic, KA2PA((__address)l_apic), 
+        if (config.cpu_count > 1) {             
+                map_page_to_frame((__address)l_apic, (__address)l_apic, 
                                   PAGE_NOT_CACHEABLE, 0);
-                map_page_to_frame((__address) io_apic, 
-                                  KA2PA((__address) io_apic), 
+                map_page_to_frame((__address) io_apic,
+                                  (__address) io_apic,
                                   PAGE_NOT_CACHEABLE, 0);
         }