Changes in kernel/arch/sparc64/src/mm/sun4v/as.c [da1bafb:8c2214e] in mainline

File:

• kernel/arch/sparc64/src/mm/sun4v/as.c (modified) (11 diffs)

kernel/arch/sparc64/src/mm/sun4v/as.c

@@ -44 +44 @@
 
 #ifdef CONFIG_TSB
-
 #include <arch/mm/tsb.h>
 #include <arch/memstr.h>
@@ -51 +50 @@
 #include <bitops.h>
 #include <macros.h>
-
 #endif /* CONFIG_TSB */
 
@@ -63 +61 @@
 }
 
-int as_constructor_arch(as_t *as, unsigned int flags)
+int as_constructor_arch(as_t *as, int flags)
 {
 #ifdef CONFIG_TSB
-        uint8_t order = fnzb32(
+        int order = fnzb32(
                 (TSB_ENTRY_COUNT * sizeof(tsb_entry_t)) >> FRAME_WIDTH);
-        
+
         uintptr_t tsb = (uintptr_t) frame_alloc(order, flags);
-        
+
         if (!tsb)
                 return -1;
-        
+
         as->arch.tsb_description.page_size = PAGESIZE_8K;
         as->arch.tsb_description.associativity = 1;
@@ -81 +79 @@
         as->arch.tsb_description.reserved = 0;
         as->arch.tsb_description.context = 0;
-        
+
         memsetb((void *) PA2KA(as->arch.tsb_description.tsb_base),
                 TSB_ENTRY_COUNT * sizeof(tsb_entry_t), 0);
 #endif
-        
         return 0;
 }
@@ -94 +91 @@
         size_t cnt = (TSB_ENTRY_COUNT * sizeof(tsb_entry_t)) >> FRAME_WIDTH;
         frame_free((uintptr_t) as->arch.tsb_description.tsb_base);
-        
         return cnt;
 #else
@@ -101 +97 @@
 }
 
-int as_create_arch(as_t *as, unsigned int flags)
+int as_create_arch(as_t *as, int flags)
 {
 #ifdef CONFIG_TSB
         tsb_invalidate(as, 0, (size_t) -1);
 #endif
-        
         return 0;
 }
@@ -116 +111 @@
  *
  * @param as Address space.
- *
  */
 void as_install_arch(as_t *as)
 {
         mmu_secondary_context_write(as->asid);
-        
-#ifdef CONFIG_TSB
+#ifdef CONFIG_TSB       
         uintptr_t base = ALIGN_DOWN(config.base, 1 << KERNEL_PAGE_WIDTH);
-        
+
         ASSERT(as->arch.tsb_description.tsb_base);
         uintptr_t tsb = PA2KA(as->arch.tsb_description.tsb_base);
-        
+                
         if (!overlaps(tsb, 8 * MMU_PAGE_SIZE, base, 1 << KERNEL_PAGE_WIDTH)) {
                 /*
@@ -133 +126 @@
                  * by the locked 4M kernel DTLB entry. We need
                  * to map both TSBs explicitly.
-                 *
                  */
                 mmu_demap_page(tsb, 0, MMU_FLAG_DTLB);
                 dtlb_insert_mapping(tsb, KA2PA(tsb), PAGESIZE_64K, true, true);
         }
+
+        __hypercall_fast2(MMU_TSB_CTXNON0, 1, KA2PA(&(as->arch.tsb_description)));
         
-        __hypercall_fast2(MMU_TSB_CTXNON0, 1, KA2PA(&(as->arch.tsb_description)));
 #endif
 }
@@ -149 +142 @@
  *
  * @param as Address space.
- *
  */
 void as_deinstall_arch(as_t *as)
 {
+
         /*
          * Note that we don't and may not lock the address space. That's ok
@@ -158 +151 @@
          *
          * Moreover, the as->asid is protected by asidlock, which is being held.
-         *
          */
-        
+
 #ifdef CONFIG_TSB
         uintptr_t base = ALIGN_DOWN(config.base, 1 << KERNEL_PAGE_WIDTH);
-        
+
         ASSERT(as->arch.tsb_description.tsb_base);
-        
+
         uintptr_t tsb = PA2KA(as->arch.tsb_description.tsb_base);
-        
+                
         if (!overlaps(tsb, 8 * MMU_PAGE_SIZE, base, 1 << KERNEL_PAGE_WIDTH)) {
                 /*
@@ -173 +165 @@
                  * by the locked 4M kernel DTLB entry. We need
                  * to demap the entry installed by as_install_arch().
-                 *
                  */
                 __hypercall_fast3(MMU_UNMAP_PERM_ADDR, tsb, 0, MMU_FLAG_DTLB);