Changeset 32e8cd1 in mainline for kernel/arch/sparc32/src/mm

Timestamp:

2013-12-28T17:16:44Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c1023bcb

Parents:

f6f22cdb

Message:

code revision
coding style fixes
removal of debugging printouts and other temporary stuff

Location:

kernel/arch/sparc32/src/mm

Files:

• as.c (modified) (1 diff)
• frame.c (modified) (5 diffs)
• page.c (modified) (3 diffs)
• tlb.c (modified) (2 diffs)

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

@@ -38 +38 @@
 #include <genarch/mm/page_pt.h>
 
-static ptd_t context_table[ASID_MAX_ARCH] __attribute__((aligned (1024)));
+static ptd_t context_table[ASID_MAX_ARCH] __attribute__((aligned(1024)));
 
 void as_arch_init(void)
 {
         as_operations = &as_pt_operations;
-        as_context_table = (uintptr_t)&context_table;
+        as_context_table = (uintptr_t) &context_table;
 }
 
 void as_install_arch(as_t *as)
 {
-        printf("as_install_arch(asid=%d)\n", as->asid);
-        printf("genarch.page_table=%p\n", as->genarch.page_table);
-
-        context_table[as->asid].table_pointer = (uintptr_t)as->genarch.page_table >> 6;
+        context_table[as->asid].table_pointer =
+            (uintptr_t) as->genarch.page_table >> 6;
         context_table[as->asid].et = PTE_ET_DESCRIPTOR;
         asi_u32_write(ASI_MMUREGS, 0x200, as->asid);

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

@@ -46 +46 @@
         uintptr_t base;
         size_t size;
-
         machine_get_memory_extents(&base, &size);
-
+        
         base = ALIGN_UP(base, FRAME_SIZE);
         size = ALIGN_DOWN(size, FRAME_SIZE);
@@ -54 +53 @@
         if (!frame_adjust_zone_bounds(low, &base, &size))
                 return;
-
+        
         if (low) {
                 zone_create(ADDR2PFN(base), SIZE2FRAMES(size),
                     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));
@@ -66 +63 @@
                         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());
 }
 
 void physmem_print(void)
 {
-
+        // FIXME TODO
 }
 
@@ -82 +75 @@
 {
         frame_common_arch_init(true);
-
-        /* blacklist boot page table */
+        
+        /* 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();
 }
 
@@ -95 +86 @@
 }
 
-/** Frees the boot page table. */
-/*void boot_page_table_free(void)
-{
-        unsigned int i;
-        for (i = 0; i < BOOT_PT_SIZE_FRAMES; i++)
-                frame_free(i * FRAME_SIZE + BOOT_PT_ADDRESS);
-}*/
-
 /** @}
  */

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

@@ -27 +27 @@
  */
 
-/** @addtogroup abs32lemm
+/** @addtogroup sparc32mm
  * @{
  */
@@ -57 +57 @@
         int flags = PAGE_CACHEABLE | PAGE_EXEC;
         page_mapping_operations = &pt_mapping_operations;
-
+        
         page_table_lock(AS_KERNEL, true);
         
         /* Kernel identity mapping */
-        //FIXME: We need to consider the possibility that
-        //identity_base > identity_size and physmem_end.
-        //This might lead to overflow if identity_size is too big.
+        // FIXME:
+        // We need to consider the possibility that
+        // identity_base > identity_size and physmem_end.
+        // This might lead to overflow if identity_size is too big.
         for (uintptr_t cur = PHYSMEM_START_ADDR;
             cur < min(KA2PA(config.identity_base) +
-                config.identity_size, config.physmem_end);
+            config.identity_size, config.physmem_end);
             cur += FRAME_SIZE)
                 page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
         
-
         page_table_unlock(AS_KERNEL, true);
         as_switch(NULL, AS_KERNEL);
-
-//      printf("as_context_table=0x%08x\n", as_context_table);
-
+        
         /* Switch MMU to new context table */
         asi_u32_write(ASI_MMUREGS, MMU_CONTEXT_TABLE, KA2PA(as_context_table) >> 4);
-
-        //boot_page_table_free();
 }
 
@@ -86 +82 @@
         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->at;
-
-//      printf("page fault on address 0x%08x, status 0x%08x, type %d\n", fault_address, fault_status, type);
-
-        if (type == FAULT_TYPE_LOAD_USER_DATA ||
-            type == FAULT_TYPE_LOAD_SUPERVISOR_DATA)    
+        mmu_fault_status_t *fault = (mmu_fault_status_t *) &fault_status;
+        mmu_fault_type_t type = (mmu_fault_type_t) fault->at;
+        
+        if ((type == FAULT_TYPE_LOAD_USER_DATA) ||
+            (type == FAULT_TYPE_LOAD_SUPERVISOR_DATA))
                 as_page_fault(fault_address, PF_ACCESS_READ, istate);
 
-        if (type == FAULT_TYPE_EXECUTE_USER || 
-            type == FAULT_TYPE_EXECUTE_SUPERVISOR)
+        if ((type == FAULT_TYPE_EXECUTE_USER) ||
+            (type == FAULT_TYPE_EXECUTE_SUPERVISOR))
                 as_page_fault(fault_address, PF_ACCESS_EXEC, istate);
 
-        if (type == FAULT_TYPE_STORE_USER_DATA ||
-            type == FAULT_TYPE_STORE_USER_INSTRUCTION ||
-            type == FAULT_TYPE_STORE_SUPERVISOR_INSTRUCTION ||
-            type == FAULT_TYPE_STORE_SUPERVISOR_DATA)
+        if ((type == FAULT_TYPE_STORE_USER_DATA) ||
+            (type == FAULT_TYPE_STORE_USER_INSTRUCTION) ||
+            (type == FAULT_TYPE_STORE_SUPERVISOR_INSTRUCTION) ||
+            (type == FAULT_TYPE_STORE_SUPERVISOR_DATA))
                 as_page_fault(fault_address, PF_ACCESS_WRITE, istate);
 }

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

@@ -27 +27 @@
  */
 
-/** @addtogroup abs32lemm
+/** @addtogroup sparc32mm
  * @{
  */
@@ -45 +45 @@
 }
 
-void tlb_invalidate_pages(asid_t asid __attribute__((unused)), uintptr_t page, size_t cnt)
+void tlb_invalidate_pages(asid_t asid __attribute__((unused)), uintptr_t page,
+    size_t cnt)
 {
         tlb_invalidate_all();