Changeset 00287cc in mainline for kernel/arch/arm32/src/mm

Timestamp:

2009-03-12T23:26:32Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

648c9d9

Parents:

3b122e9

Message:

arm32: update for the new scheme of device drivers and keyboard/serial modules
streamline arm32 port (as GXemul is still the only machine supported), more cleanup is needed

Location:

kernel/arch/arm32/src/mm

Files:

• frame.c (modified) (3 diffs)
• page.c (modified) (4 diffs)
• page_fault.c (modified) (3 diffs)

kernel/arch/arm32/src/mm/frame.c

@@ -36 +36 @@
 #include <mm/frame.h>
 #include <arch/mm/frame.h>
-#include <arch/machine.h>
+#include <arch/drivers/gxemul.h>
 #include <config.h>
-#include <arch/debug/print.h>
 
 /** Address of the last frame in the memory. */
@@ -46 +45 @@
 void frame_arch_init(void)
 {
-        /* all memory as one zone */
-        zone_create(0, ADDR2PFN(machine_get_memory_size()),
+        last_frame = *((uintptr_t *) (GXEMUL_MP_ADDRESS + GXEMUL_MP_MEMSIZE_OFFSET));
+        
+        /* All memory as one zone */
+        zone_create(0, ADDR2PFN(last_frame),
             BOOT_PAGE_TABLE_START_FRAME + BOOT_PAGE_TABLE_SIZE_IN_FRAMES, 0);
-        last_frame = machine_get_memory_size();
         
         /* blacklist boot page table */
@@ -59 +59 @@
 void boot_page_table_free(void)
 {
-        int i;
-        for (i = 0; i < BOOT_PAGE_TABLE_SIZE_IN_FRAMES; i++) {
+        unsigned int i;
+        for (i = 0; i < BOOT_PAGE_TABLE_SIZE_IN_FRAMES; i++)
                 frame_free(i * FRAME_SIZE + BOOT_PAGE_TABLE_ADDRESS);
-        }
 }
 

kernel/arch/arm32/src/mm/page.c

@@ -52 +52 @@
 void page_arch_init(void)
 {
+        int flags = PAGE_CACHEABLE;
+        page_mapping_operations = &pt_mapping_operations;
+        
         uintptr_t cur;
-        int flags;
-
-        page_mapping_operations = &pt_mapping_operations;
-
-        flags = PAGE_CACHEABLE;
-
-        /* PA2KA(identity) mapping for all frames until last_frame */
-        for (cur = 0; cur < last_frame; cur += FRAME_SIZE) {
+        /* Kernel identity mapping */
+        for (cur = 0; cur < last_frame; cur += FRAME_SIZE)
                 page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
-        }
         
-        /* create mapping for exception table at high offset */
+        /* Create mapping for exception table at high offset */
 #ifdef HIGH_EXCEPTION_VECTORS
         void *virtaddr = frame_alloc(ONE_FRAME, FRAME_KA);
@@ -71 +67 @@
 #error "Only high exception vector supported now"
 #endif
-
+        
         as_switch(NULL, AS_KERNEL);
-
+        
         boot_page_table_free();
 }
@@ -94 +90 @@
                     physaddr, size)
         }
-
+        
         uintptr_t virtaddr = PA2KA(last_frame);
         pfn_t i;
@@ -102 +98 @@
                     PAGE_NOT_CACHEABLE | PAGE_READ | PAGE_WRITE | PAGE_KERNEL);
         }
-
+        
         last_frame = ALIGN_UP(last_frame + size, FRAME_SIZE);
         return virtaddr;

kernel/arch/arm32/src/mm/page_fault.c

@@ -35 +35 @@
 #include <panic.h>
 #include <arch/exception.h>
-#include <arch/debug/print.h>
 #include <arch/mm/page_fault.h>
 #include <mm/as.h>
@@ -183 +182 @@
         if (ret == AS_PF_FAULT) {
                 print_istate(istate);
-                dprintf("page fault - pc: %x, va: %x, status: %x(%x), "
+                printf("page fault - pc: %x, va: %x, status: %x(%x), "
                     "access:%d\n", istate->pc, badvaddr, fsr.status, fsr,
                     access);
-
+                
                 fault_if_from_uspace(istate, "Page fault: %#x.", badvaddr);
                 panic("Page fault.");
@@ -202 +201 @@
 
         if (ret == AS_PF_FAULT) {
-                dprintf("prefetch_abort\n");
+                printf("prefetch_abort\n");
                 print_istate(istate);
                 panic("page fault - prefetch_abort at address: %x.",