Changeset d47f0e1 in mainline for arch/ia32/src/smp

Timestamp:

2005-06-05T15:18:24Z (21 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e3f41b6

Parents:

d1a184f

Message:

SMP recovery patch #1. (SMP still broken)
Move ap_boot() to K_TEXT_START_2 section.
Change ap_boot() to cope with mapping of kernel address space.
Change some addresses in mps.c from kernel to physical.

MIPS.
Move msim dprinter device to 0xB0000000.
This address is from kseg1 (unmapped, uncached) segment.

Location:

arch/ia32/src/smp

Files:

• ap.S (modified) (4 diffs)
• apic.c (modified) (1 diff)
• mps.c (modified) (6 diffs)

arch/ia32/src/smp/ap.S

@@ -31 +31 @@
 #
 
-.text
+.section K_TEXT_START_2
 
 #ifdef __SMP__
@@ -48 +48 @@
 .code16
         cli
-
         xorw %ax,%ax
         movw %ax,%ds
@@ -56 +55 @@
         orl $1,%eax
         movl %eax,%cr0
+        jmp 0f
+0:
         ljmp $KTEXT,$jump_to_kernel
 
@@ -65 +66 @@
         movw %ax,%es
         movw %ax,%ss
-        movl $ctx,%eax
+        movl $(ctx-0x80000000),%eax     # KA2PA((__address) &ctx)
         movl (%eax),%esp
 
         lidt idtr
 
+        call map_kernel
+
         ljmp $KTEXT,$main_ap
 

arch/ia32/src/smp/apic.c

@@ -209 +209 @@
                         lo = l_apic[ICRlo] & ICRloClear;
                         lo |= ((__address) ap_boot) / 4096; /* calculate the reset vector */
-                        l_apic[ICRlo] = lo | DLVRMODE_STUP | DESTMODE_PHYS | LEVEL_ASSERT | SHORTHAND_DEST |  TRGRMODE_LEVEL;
+                        l_apic[ICRlo] = lo | DLVRMODE_STUP | DESTMODE_PHYS | LEVEL_ASSERT | SHORTHAND_DEST | TRGRMODE_LEVEL;
                         delay(200);
                 }

arch/ia32/src/smp/mps.c

@@ -159 +159 @@
         if (fs->config_type == 0 && fs->configuration_table) {
                 if (fs->mpfib2 >> 7) {
-                        printf("mps_init: PIC mode not supported\n");
+                        printf("%s: PIC mode not supported\n", __FUNCTION__);
                         return;
                 }
@@ -189 +189 @@
                 
         if (ct->signature != CT_SIGNATURE) {
-                printf("configure_via_ct: bad ct->signature\n");
+                printf("%s: bad ct->signature\n", __FUNCTION__);
                 return 1;
         }
         if (!mps_ct_check()) {
-                printf("configure_via_ct: bad ct checksum\n");
+                printf("%s: bad ct checksum\n", __FUNCTION__);
                 return 1;
         }
         if (ct->oem_table) {
-                printf("configure_via_ct: ct->oem_table not supported\n");
+                printf("%s: ct->oem_table not supported\n", __FUNCTION__);
                 return 1;
         }
@@ -252 +252 @@
                                  */
                                  
-                                printf("configure_via_ct: ct badness\n");
+                                printf("%s: ct badness\n", __FUNCTION__);
                                 return 1;
                 }
@@ -269 +269 @@
          * Not yet implemented.
          */
-        printf("configure_via_default: not supported\n");
+        printf("%s: not supported\n", __FUNCTION__);
         return 1;
 }
@@ -426 +426 @@
          */
         *((__u16 *) (frame + 0x467+0)) =  ((__address) ap_boot) >> 4;   /* segment */
-        *((__u16 *) (frame + 0x467+2)) =  0x0;  /* offset */
-        
-        /*
-         * Give back the borrowed frame and restore identity mapping for it.
-         */
-        map_page_to_frame(frame,frame,PAGE_CACHEABLE,0);
+        *((__u16 *) (frame + 0x467+2)) =  0;                            /* offset */
+        
+        /*
+         * Give back and unmap the borrowed frame.
+         */
+        map_page_to_frame(frame,0,PAGE_NOT_PRESENT,0);
         frame_free(frame);
 
@@ -473 +473 @@
 
                 memcopy(gdt, gdt_new, GDT_ITEMS*sizeof(struct descriptor));
-                gdtr.base = (__address) gdt_new;
-
+                gdtr.base = KA2PA((__address) gdt_new);
+                
                 if (l_apic_send_init_ipi(pr[i].l_apic_id)) {
                         /*