Changes in kernel/arch/sparc64/src/mm/sun4u/as.c [cd3b380:e2a0d76] in mainline

File:

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

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

@@ -63 +63 @@
 {
 #ifdef CONFIG_TSB
-        uintptr_t tsb_phys =
-            frame_alloc(SIZE2FRAMES((ITSB_ENTRY_COUNT + DTSB_ENTRY_COUNT) *
-            sizeof(tsb_entry_t)), flags, 0);
-        if (!tsb_phys)
+        /*
+         * The order must be calculated with respect to the emulated
+         * 16K page size.
+         *
+         */
+        uint8_t order = fnzb32(((ITSB_ENTRY_COUNT + DTSB_ENTRY_COUNT) *
+            sizeof(tsb_entry_t)) >> FRAME_WIDTH);
+        
+        uintptr_t tsb = PA2KA(frame_alloc(order, flags, 0));
+        if (!tsb)
                 return -1;
         
-        tsb_entry_t *tsb = (tsb_entry_t *) PA2KA(tsb_phys);
-        
-        as->arch.itsb = tsb;
-        as->arch.dtsb = tsb + ITSB_ENTRY_COUNT;
-        
-        memsetb(as->arch.itsb, (ITSB_ENTRY_COUNT + DTSB_ENTRY_COUNT) *
-            sizeof(tsb_entry_t), 0);
+        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
         
@@ -84 +89 @@
 {
 #ifdef CONFIG_TSB
-        size_t frames = SIZE2FRAMES((ITSB_ENTRY_COUNT + DTSB_ENTRY_COUNT) *
-            sizeof(tsb_entry_t));
-        frame_free(KA2PA((uintptr_t) as->arch.itsb), frames);
-        
-        return frames;
+        /*
+         * The count must be calculated with respect to the emualted 16K page
+         * size.
+         */
+        size_t cnt = ((ITSB_ENTRY_COUNT + DTSB_ENTRY_COUNT) *
+            sizeof(tsb_entry_t)) >> FRAME_WIDTH;
+        frame_free(KA2PA((uintptr_t) as->arch.itsb));
+        
+        return cnt;
 #else
         return 0;