Changeset ef67bab in mainline for arch/ia32/src

Timestamp:

2006-02-01T00:02:16Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

071a8ae6

Parents:

fc1e4f6

Message:

Memory management work.
Remove the last (i.e. 'root') argument from page_mapping_insert() and page_mapping_find().
Page table address is now extracted from the first (i.e. 'as') argument.
Add a lot of infrastructure to make the above possible.
sparc64 is now broken, most likely because of insufficient identity mapping of physical memory.

Location:

arch/ia32/src

Files:

• drivers/ega.c (modified) (1 diff)
• mm/as.c (added)
• mm/page.c (modified) (2 diffs)
• smp/smp.c (modified) (1 diff)

arch/ia32/src/drivers/ega.c

@@ -60 +60 @@
         __u8 hi, lo;
 
-        page_mapping_insert(AS_KERNEL, PA2KA(VIDEORAM), VIDEORAM, PAGE_NOT_CACHEABLE, 0);
+        page_mapping_insert(AS_KERNEL, PA2KA(VIDEORAM), VIDEORAM, PAGE_NOT_CACHEABLE);
         outb(0x3d4,0xe);
         hi = inb(0x3d5);

arch/ia32/src/mm/page.c

@@ -43 +43 @@
 #include <interrupt.h>
 
-static __address bootstrap_dba; 
-
 void page_arch_init(void)
 {
-        __address dba;
         __address cur;
 
@@ -53 +50 @@
                 page_operations = &page_pt_operations;
         
-                dba = frame_alloc(FRAME_KA | FRAME_PANIC, ONE_FRAME, NULL);
-                memsetb(dba, PAGE_SIZE, 0);
-
-                bootstrap_dba = dba;
-                
                 /*
                  * PA2KA(identity) mapping for all frames until last_frame.
                  */
                 for (cur = 0; cur < last_frame; cur += FRAME_SIZE)
-                        page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, PAGE_CACHEABLE, KA2PA(dba));
+                        page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, PAGE_CACHEABLE);
 
                 exc_register(14, "page_fault", page_fault);
-                write_cr3(KA2PA(dba));
+                write_cr3((__address) AS_KERNEL->page_table);
         }
         else {
-                write_cr3(KA2PA(bootstrap_dba));
+                write_cr3((__address) AS_KERNEL->page_table);
         }
 

arch/ia32/src/smp/smp.c

@@ -67 +67 @@
         if (config.cpu_count > 1) {             
                 page_mapping_insert(AS_KERNEL, (__address) l_apic, (__address) l_apic, 
-                                  PAGE_NOT_CACHEABLE, 0);
+                                  PAGE_NOT_CACHEABLE);
                 page_mapping_insert(AS_KERNEL, (__address) io_apic, (__address) io_apic,
-                                  PAGE_NOT_CACHEABLE, 0);
+                                  PAGE_NOT_CACHEABLE);
         }