Changes in kernel/arch/sparc64/src/mm/sun4u/as.c [da1bafb:74cbac7d] in mainline

File:

• kernel/arch/sparc64/src/mm/sun4u/as.c (modified) (12 diffs)

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

@@ -41 +41 @@
 
 #ifdef CONFIG_TSB
-
 #include <arch/mm/tsb.h>
 #include <arch/memstr.h>
@@ -48 +47 @@
 #include <bitops.h>
 #include <macros.h>
-
 #endif /* CONFIG_TSB */
 
@@ -60 +58 @@
 }
 
-int as_constructor_arch(as_t *as, unsigned int flags)
+int as_constructor_arch(as_t *as, int flags)
 {
 #ifdef CONFIG_TSB
@@ -66 +64 @@
          * The order must be calculated with respect to the emulated
          * 16K page size.
-         *
-         */
-        uint8_t order = fnzb32(((ITSB_ENTRY_COUNT + DTSB_ENTRY_COUNT) *
+         */
+        int order = fnzb32(((ITSB_ENTRY_COUNT + DTSB_ENTRY_COUNT) *
             sizeof(tsb_entry_t)) >> FRAME_WIDTH);
-        
+
         uintptr_t tsb = (uintptr_t) frame_alloc(order, flags | FRAME_KA);
-        
+
         if (!tsb)
                 return -1;
-        
+
         as->arch.itsb = (tsb_entry_t *) tsb;
         as->arch.dtsb = (tsb_entry_t *) (tsb + ITSB_ENTRY_COUNT *
             sizeof(tsb_entry_t));
-        
+
         memsetb(as->arch.itsb,
             (ITSB_ENTRY_COUNT + DTSB_ENTRY_COUNT) * sizeof(tsb_entry_t), 0);
 #endif
-        
         return 0;
 }
@@ -97 +93 @@
             sizeof(tsb_entry_t)) >> FRAME_WIDTH;
         frame_free(KA2PA((uintptr_t) as->arch.itsb));
-        
         return cnt;
 #else
@@ -104 +99 @@
 }
 
-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;
 }
@@ -129 +123 @@
          *
          * Moreover, the as->asid is protected by asidlock, which is being held.
-         *
          */
         
@@ -137 +130 @@
          * secondary context register from the TL=1 code just before switch to
          * userspace.
-         *
          */
         ctx.v = 0;
         ctx.context = as->asid;
         mmu_secondary_context_write(ctx.v);
-        
-#ifdef CONFIG_TSB
+
+#ifdef CONFIG_TSB       
         uintptr_t base = ALIGN_DOWN(config.base, 1 << KERNEL_PAGE_WIDTH);
-        
+
         ASSERT(as->arch.itsb && as->arch.dtsb);
-        
+
         uintptr_t tsb = (uintptr_t) as->arch.itsb;
-        
+                
         if (!overlaps(tsb, 8 * MMU_PAGE_SIZE, base, 1 << KERNEL_PAGE_WIDTH)) {
                 /*
@@ -155 +147 @@
                  * by the locked 4M kernel DTLB entry. We need
                  * to map both TSBs explicitly.
-                 *
                  */
                 dtlb_demap(TLB_DEMAP_PAGE, TLB_DEMAP_NUCLEUS, tsb);
                 dtlb_insert_mapping(tsb, KA2PA(tsb), PAGESIZE_64K, true, true);
         }
-        
+                
         /*
          * Setup TSB Base registers.
-         *
          */
         tsb_base_reg_t tsb_base;
-        
+                
         tsb_base.value = 0;
         tsb_base.size = TSB_SIZE;
         tsb_base.split = 0;
-        
+
         tsb_base.base = ((uintptr_t) as->arch.itsb) >> MMU_PAGE_WIDTH;
         itsb_base_write(tsb_base.value);
@@ -185 +175 @@
          * Clearing the extension registers will ensure that the value of the
          * TSB Base register will be used as an address of TSB, making the code
-         * compatible with the US port.
-         *
+         * compatible with the US port. 
          */
         itsb_primary_extension_write(0);
@@ -206 +195 @@
 void as_deinstall_arch(as_t *as)
 {
+
         /*
          * Note that we don't and may not lock the address space. That's ok
@@ -211 +201 @@
          *
          * 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.itsb && as->arch.dtsb);
-        
+
         uintptr_t tsb = (uintptr_t) as->arch.itsb;
-        
+                
         if (!overlaps(tsb, 8 * MMU_PAGE_SIZE, base, 1 << KERNEL_PAGE_WIDTH)) {
                 /*