Changeset ac5d02b in mainline for arch/ia32

Timestamp:

2005-06-03T13:17:05Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

70527f1

Parents:

dcbc8be

Message:

IA-32 fixes.
Use kernel addresses instead of physical addresses in map_page_to_frame().
Physical addresses are supposed to only be exported to mm hardware.
Because of this fix, userspace is functional again.

Remap EGA videoram to (0x80000000 + videoram) and change the ega driver to work with the new address.

Minor cosmetics through out the code.
Changes in linker scripts.

Location:

arch/ia32

Files:

• _link.ld (modified) (1 diff)
• include/mm/vm.h (modified) (1 diff)
• src/asm.s (modified) (1 diff)
• src/drivers/ega.c (modified) (3 diffs)
• src/mm/page.c (modified) (6 diffs)
• src/userspace.c (modified) (1 diff)

arch/ia32/_link.ld

@@ -13 +13 @@
 
 SECTIONS {
-    .unmapped 0x8000: AT (0x8000) {
-        unmapped_ktext_start = .;
-        *(K_TEXT_START);
-        unmapped_ktext_end = .;
-        unmapped_kdata_start = .;
-        *(K_DATA_START);
-        unmapped_kdata_end = .;
-    }
-    
-    .mapped (0x80000000+SIZEOF(.unmapped)+0x8000) : AT (0x8000+SIZEOF(.unmapped)) { 
-        ktext_start = .;
-        *(.text);
-        ktext_end = .;
+        .unmapped 0x8000: AT (0x8000) {
+                unmapped_ktext_start = .;
+                *(K_TEXT_START);
+                unmapped_ktext_end = .;
+                unmapped_kdata_start = .;
+                *(K_DATA_START);
+                unmapped_kdata_end = .;
+        }
 
-        kdata_start = .;
-        *(.data);               /* initialized data */
-        *(.rodata*);            /* string literals */
-        *(COMMON);              /* global variables */
-        *(.bss);                /* uninitialized static variables */
-        *(K_DATA_END);
-        kdata_end = .;
-    }
+        .mapped (0x80000000+SIZEOF(.unmapped)+0x8000) : AT (0x8000+SIZEOF(.unmapped)) { 
+                ktext_start = .;
+                *(.text);
+                ktext_end = .;
 
-    _hardcoded_ktext_size = ktext_end - ktext_start + (unmapped_ktext_end - unmapped_ktext_start);
-    _hardcoded_kdata_size = kdata_end - kdata_start + (unmapped_kdata_end - unmapped_kdata_start);
-    _hardcoded_load_address = 0x80008000;
+                kdata_start = .;
+                *(.data);               /* initialized data */
+                *(.rodata*);            /* string literals */
+                *(COMMON);              /* global variables */
+                *(.bss);                /* uninitialized static variables */
+                *(K_DATA_END);
+                kdata_end = .;
+        }
+
+        _hardcoded_ktext_size = ktext_end - ktext_start + (unmapped_ktext_end - unmapped_ktext_start);
+        _hardcoded_kdata_size = kdata_end - kdata_start + (unmapped_kdata_end - unmapped_kdata_start);
+        _hardcoded_load_address = 0x80008000;
 
 }

arch/ia32/include/mm/vm.h

@@ -38 +38 @@
 
 #define UTEXT_ADDRESS_ARCH      0x00001000
-#define USTACK_ADDRESS_ARCH     (0x7fffffffUL-(PAGE_SIZE-1))
+#define USTACK_ADDRESS_ARCH     (0x7fffffff-(PAGE_SIZE-1))
 #define UDATA_ADDRESS_ARCH      0x21000000
 

arch/ia32/src/asm.s

@@ -445 +445 @@
 
 
-.section K_DATA_START
+#.section K_DATA_START
 .global interrupt_handler_size
 

arch/ia32/src/drivers/ega.c

@@ -48 +48 @@
         __u8 hi, lo;
 
-        map_page_to_frame(VIDEORAM, VIDEORAM, PAGE_NOT_CACHEABLE, 0);
+        map_page_to_frame(PA2KA(VIDEORAM), VIDEORAM, PAGE_NOT_CACHEABLE, 0);
         outb(0x3d4,0xe);
         hi = inb(0x3d5);
@@ -59 +59 @@
 void ega_display_char(char ch)
 {
-        __u8 *vram = (__u8 *) VIDEORAM;
+        __u8 *vram = (__u8 *) PA2KA(VIDEORAM);
         
         vram[ega_cursor*2] = ch;
@@ -72 +72 @@
             return;
 
-        memcopy(VIDEORAM + ROW*2, VIDEORAM, (SCREEN - ROW)*2);
-        memsetw(VIDEORAM + (SCREEN - ROW)*2, ROW, 0x0720);
+        memcopy(PA2KA(VIDEORAM) + ROW*2, PA2KA(VIDEORAM), (SCREEN - ROW)*2);
+        memsetw(PA2KA(VIDEORAM) + (SCREEN - ROW)*2, ROW, 0x0720);
         ega_cursor = ega_cursor - ROW;
 }

arch/ia32/src/mm/page.c

@@ -36 +36 @@
 #include <arch/asm.h>
 #include <synch/spinlock.h>
+#include <debug.h>
 
 /*
@@ -54 +55 @@
 
         if (config.cpu_active == 1) {
-                dba = KA2PA(frame_alloc(FRAME_KA | FRAME_PANIC));
+                dba = frame_alloc(FRAME_KA | FRAME_PANIC);
                 memsetb(dba, PAGE_SIZE, 0);
             
@@ -69 +70 @@
 
                 trap_register(14, page_fault);
-                cpu_write_dba(dba);             
+                cpu_write_dba(KA2PA(dba));
         }
         else {
@@ -82 +83 @@
                 dba = frame_alloc(FRAME_KA | FRAME_PANIC);
                 memcopy(bootstrap_dba, dba, PAGE_SIZE);
-                cpu_write_dba(dba);
+                cpu_write_dba(KA2PA(dba));
         }
 
@@ -122 +123 @@
                  * frame for the page table and clean it.
                  */
-                newpt = KA2PA(frame_alloc(FRAME_KA));
-                pd[pde].frame_address = newpt >> 12;
+                newpt = frame_alloc(FRAME_KA);
+                pd[pde].frame_address = KA2PA(newpt) >> 12;
                 memsetb(newpt, PAGE_SIZE, 0);
                 pd[pde].present = 1;
@@ -129 +130 @@
         }
         if (copy) {
-                newpt = KA2PA(frame_alloc(FRAME_KA));
+                newpt = frame_alloc(FRAME_KA);
                 memcopy(pd[pde].frame_address << 12, newpt, PAGE_SIZE);
-                pd[pde].frame_address = newpt >> 12;
+                pd[pde].frame_address = KA2PA(newpt) >> 12;
         }
         

arch/ia32/src/userspace.c

@@ -53 +53 @@
             "pushl %4\n"
             "iret"
-            : : "i" (selector(UDATA_DES) | PL_USER), "i" (USTACK_ADDRESS+THREAD_STACK_SIZE-1000), "r" (pri), "i" (selector(UTEXT_DES) | PL_USER), "i" (UTEXT_ADDRESS));
+            : : "i" (selector(UDATA_DES) | PL_USER), "i" (USTACK_ADDRESS+(THREAD_STACK_SIZE-1)), "r" (pri), "i" (selector(UTEXT_DES) | PL_USER), "i" (UTEXT_ADDRESS));
         
         /* Unreachable */