Changeset 1f12fab in mainline for kernel/arch/sparc32/src/mm

Timestamp:

2013-10-07T20:00:34Z (12 years ago)

Author:

Jakub Klama <jakub.klama@…>

Branches:

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

Children:

a73ebf0

Parents:

80d9d83

Message:

First attempt to implement preemptive trap handlers
and switch to userspace. Preemptive traps are needed
for at least page faults, as page fault handling code
can trigger window underflow/overflow exceptions.

This commit also introduces userspace window buffer
for saving userspace register windows (just as in
sparc64).

These changes are unfinished and far from working
correctly.

Location:

kernel/arch/sparc32/src/mm

Files:

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

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

@@ -60 +60 @@
                     BOOT_PT_START_FRAME + BOOT_PT_SIZE_FRAMES,
                     ZONE_AVAILABLE | ZONE_LOWMEM);
+
+                printf("low_zone: %d frames\n", SIZE2FRAMES(size));
         } else {
                 pfn_t conf = zone_external_conf_alloc(SIZE2FRAMES(size));
@@ -65 +67 @@
                         zone_create(ADDR2PFN(base), SIZE2FRAMES(size), conf,
                             ZONE_AVAILABLE | ZONE_HIGHMEM);
+
+                printf("high zone: %d frames\n", SIZE2FRAMES(size));
         }
-        
+
+        printf("free: %d\n", frame_total_free_get());
 }
 
@@ -81 +86 @@
         /* blacklist boot page table */
         frame_mark_unavailable(BOOT_PT_START_FRAME, BOOT_PT_SIZE_FRAMES);
+        printf("free: %d\n", frame_total_free_get());
         //machine_frame_init();
 }

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

@@ -34 +34 @@
 
 #include <arch/mm/page.h>
+#include <arch/mm/page_fault.h>
+#include <arch/mm/tlb.h>
 #include <genarch/mm/page_pt.h>
 #include <arch/mm/frame.h>
@@ -75 +77 @@
 
         /* Switch MMU to new context table */
-        asi_u32_write(ASI_MMUREGS, 0x100, KA2PA(as_context_table) >> 4);
+        asi_u32_write(ASI_MMUREGS, MMU_CONTEXT_TABLE, KA2PA(as_context_table) >> 4);
 
         //boot_page_table_free();
@@ -82 +84 @@
 void page_fault(unsigned int n __attribute__((unused)), istate_t *istate)
 {
+        uint32_t fault_status = asi_u32_read(ASI_MMUREGS, MMU_FAULT_STATUS);
+        uintptr_t fault_address = asi_u32_read(ASI_MMUREGS, MMU_FAULT_ADDRESS);
+        mmu_fault_status_t *fault = (mmu_fault_status_t *)&fault_status;
+        mmu_fault_type_t type = (mmu_fault_type_t)fault->ft;
+
+        printf("page fault on address 0x%08x, status 0x%08x\n", fault_address, fault_status);
+
+        if (type == FAULT_TYPE_LOAD_USER_DATA)  
+                as_page_fault(fault_address, PF_ACCESS_READ, istate);
+
+        if (type == FAULT_TYPE_EXECUTE_USER)
+                as_page_fault(fault_address, PF_ACCESS_EXEC, istate);
+
+        if (type == FAULT_TYPE_STORE_USER_DATA || type == FAULT_TYPE_STORE_USER_INSTRUCTION)
+                as_page_fault(fault_address, PF_ACCESS_WRITE, istate);
 }