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

Timestamp:

2010-03-07T15:11:56Z (14 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

aadf01e

Parents:

2e99277 (diff), 137691a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes, revision 308

File:

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

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Jakub Jermar
+ * Copyright (c) 2009 Pavel Rimsky
  * All rights reserved.
  *
@@ -34 +35 @@
 
 #include <arch/mm/as.h>
+#include <arch/mm/pagesize.h>
 #include <arch/mm/tlb.h>
 #include <genarch/mm/page_ht.h>
@@ -39 +41 @@
 #include <debug.h>
 #include <config.h>
+#include <arch/sun4v/hypercall.h>
 
 #ifdef CONFIG_TSB
@@ -86 +89 @@
 {
 #ifdef CONFIG_TSB
-        count_t cnt = (TSB_ENTRY_COUNT * sizeof(tsb_entry_t)) >> FRAME_WIDTH;
+        size_t cnt = (TSB_ENTRY_COUNT * sizeof(tsb_entry_t)) >> FRAME_WIDTH;
         frame_free((uintptr_t) as->arch.tsb_description.tsb_base);
         return cnt;
@@ -112 +115 @@
 {
         mmu_secondary_context_write(as->asid);
+#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)) {
+                /*
+                 * TSBs were allocated from memory not covered
+                 * 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)));
+        
+#endif
 }
 
@@ -134 +156 @@
         uintptr_t base = ALIGN_DOWN(config.base, 1 << KERNEL_PAGE_WIDTH);
 
-        ASSERT(as->arch.itsb && as->arch.dtsb);
+        ASSERT(as->arch.tsb_description.tsb_base);
 
-        uintptr_t tsb = (uintptr_t) as->arch.itsb;
+        uintptr_t tsb = PA2KA(as->arch.tsb_description.tsb_base);
                 
         if (!overlaps(tsb, 8 * MMU_PAGE_SIZE, base, 1 << KERNEL_PAGE_WIDTH)) {
@@ -144 +166 @@
                  * to demap the entry installed by as_install_arch().
                  */
-                dtlb_demap(TLB_DEMAP_PAGE, TLB_DEMAP_NUCLEUS, tsb);
+                __hypercall_fast3(MMU_UNMAP_PERM_ADDR, tsb, 0, MMU_FLAG_DTLB);
         }
 #endif