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

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