Changeset a7a10630 in mainline for arch/ia32/src

Timestamp:

2005-06-07T00:41:39Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d896525

Parents:

b0bf501

Message:

SMP recovery patch #2 (SMP is no longer broken !!!).
Fix missing KA2PA() operation in ap.S which was causing page faults during AP early initialization.
Fix bug in map_page_to_frame(): 'root' was interpretted as kernel address while read_dba() returns physical address.
Make references to page directory and page tables use kernel addresses instead of physical addresses.

Massive frame allocation code cleanup.
Basically revert to what we had had before implementation of userspace.

Usual cosmetics.

Location:

arch/ia32/src

Files:

• boot/boot.S (modified) (1 diff)
• mm/frame.c (modified) (1 diff)
• mm/page.c (modified) (3 diffs)
• pm.c (modified) (1 diff)
• smp/ap.S (modified) (1 diff)
• smp/mps.c (modified) (3 diffs)

arch/ia32/src/boot/boot.S

@@ -96 +96 @@
         orl $(1<<31), %ebx
         movl %ebx, %cr0
-        jmp 0f
-0:
         ret
 

arch/ia32/src/mm/frame.c

@@ -38 +38 @@
 {
         if (config.cpu_active == 1) {
-                kernel_frames = frames;
-                kernel_frames_free = frames_free;
-                frame_kernel_bitmap = frame_bitmap;
-
                 frame_not_free(0x0);
 

arch/ia32/src/mm/page.c

@@ -65 +65 @@
                  */
                 for (i = 1; i < frames; i++) {
-                        map_page_to_frame(i * PAGE_SIZE, i * PAGE_SIZE, PAGE_CACHEABLE, dba);
-                        map_page_to_frame(PA2KA(i * PAGE_SIZE), i * PAGE_SIZE, PAGE_CACHEABLE, dba);
+                        map_page_to_frame(i * PAGE_SIZE, i * PAGE_SIZE, PAGE_CACHEABLE, KA2PA(dba));
+                        map_page_to_frame(PA2KA(i * PAGE_SIZE), i * PAGE_SIZE, PAGE_CACHEABLE, KA2PA(dba));
                 }
 
@@ -113 +113 @@
         pte = (page >> 12) & 0x3ff;     /* page table entry */
         
-        pd = (struct page_specifier *) dba;
+        pd = (struct page_specifier *) PA2KA(dba);
         
         if (!pd[pde].present) {
@@ -127 +127 @@
         }
         
-        pt = (struct page_specifier *) (pd[pde].frame_address << 12);
+        pt = (struct page_specifier *) PA2KA((pd[pde].frame_address << 12));
 
         pt[pte].frame_address = frame >> 12;

arch/ia32/src/pm.c

@@ -132 +132 @@
 void pm_init(void)
 {
-        struct descriptor *gdt_p = (struct descriptor *) gdtr.base;
+        struct descriptor *gdt_p = (struct descriptor *) PA2KA(gdtr.base);
 
         /*

arch/ia32/src/smp/ap.S

@@ -64 +64 @@
         movl $(ctx-0x80000000),%eax     # KA2PA((__address) &ctx)
         movl (%eax),%esp
+        subl $0x80000000,%esp           # KA2PA(ctx.sp)
 
         lidt idtr

arch/ia32/src/smp/mps.c

@@ -393 +393 @@
 }
 
+
 /*
  * Kernel thread for bringing up application processors. It becomes clear
@@ -415 +416 @@
 
         /*
-         * Grab a frame and map its address to page 0. This is a hack which
-         * accesses data in frame 0. Note that page 0 is not present because
-         * of nil reference bug catching.
-         */
-        frame = frame_alloc(FRAME_KA);
+         * We need to access data in frame 0.
+         */
+        frame = frame_alloc(0);
         map_page_to_frame(frame,0,PAGE_CACHEABLE,0);
 
@@ -474 +473 @@
                 memcopy(gdt, gdt_new, GDT_ITEMS*sizeof(struct descriptor));
                 gdtr.base = KA2PA((__address) gdt_new);
-                
+
                 if (l_apic_send_init_ipi(pr[i].l_apic_id)) {
                         /*