Changeset e08162b in mainline for kernel/arch/sparc64/src/mm/sun4v/as.c

Timestamp:

2016-01-07T13:41:38Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f4582c6

Parents:

7254df6

Message:

sparc64: TSB needs to be naturally aligned

The ITSB and DTSB on sun4u and the TSB on sun4v are mapped by a single
64K page, so they need to be aligned to 64K. Moreover, the TSB pointer
contruction demands the natural alignment: 32K for ITSB/DTSB on sun4u
and 64K for the unified TSB on sun4v.

The code was also streamlined and made more beautiful.

File:

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

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

@@ -66 +66 @@
 {
 #ifdef CONFIG_TSB
-        uintptr_t tsb =
-            frame_alloc(SIZE2FRAMES(TSB_ENTRY_COUNT * sizeof(tsb_entry_t)),
-            flags, 0);
-        if (!tsb)
+        uintptr_t tsb_base = frame_alloc(TSB_FRAMES, flags, TSB_SIZE - 1);
+        if (!tsb_base)
                 return -1;
-        
+
+        tsb_entry_t *tsb = (tsb_entry_t *) PA2KA(tsb_base);
+
         as->arch.tsb_description.page_size = PAGESIZE_8K;
         as->arch.tsb_description.associativity = 1;
         as->arch.tsb_description.num_ttes = TSB_ENTRY_COUNT;
         as->arch.tsb_description.pgsize_mask = 1 << PAGESIZE_8K;
-        as->arch.tsb_description.tsb_base = tsb;
+        as->arch.tsb_description.tsb_base = tsb_base;
         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);
+        memsetb(tsb, TSB_SIZE, 0);
 #endif
         
@@ -90 +89 @@
 {
 #ifdef CONFIG_TSB
-        size_t frames = SIZE2FRAMES(TSB_ENTRY_COUNT * sizeof(tsb_entry_t));
-        frame_free(as->arch.tsb_description.tsb_base, frames);
+        frame_free(as->arch.tsb_description.tsb_base, TSB_FRAMES);
         
-        return frames;
+        return TSB_FRAMES;
 #else
         return 0;
@@ -126 +124 @@
         uintptr_t tsb = PA2KA(as->arch.tsb_description.tsb_base);
         
-        if (!overlaps(tsb, 8 * MMU_PAGE_SIZE, base, 1 << KERNEL_PAGE_WIDTH)) {
+        if (!overlaps(tsb, TSB_SIZE, base, 1 << KERNEL_PAGE_WIDTH)) {
                 /*
                  * TSBs were allocated from memory not covered
@@ -137 +135 @@
         }
         
-        __hypercall_fast2(MMU_TSB_CTXNON0, 1, KA2PA(&(as->arch.tsb_description)));
+        __hypercall_fast2(MMU_TSB_CTXNON0, 1, KA2PA(&as->arch.tsb_description));
 #endif
 }
@@ -166 +164 @@
         uintptr_t tsb = PA2KA(as->arch.tsb_description.tsb_base);
         
-        if (!overlaps(tsb, 8 * MMU_PAGE_SIZE, base, 1 << KERNEL_PAGE_WIDTH)) {
+        if (!overlaps(tsb, TSB_SIZE, base, 1 << KERNEL_PAGE_WIDTH)) {
                 /*
                  * TSBs were allocated from memory not covered