WebSVN – HelenOS – Diff – /branches/fs/kernel/arch/sparc64/src/mm/as.c

 #include <config.h>
 #ifdef CONFIG_TSB
 #include <arch/mm/tsb.h>
 #include <arch/memstr.h>
-#include <synch/mutex.h>
 #include <arch/asm.h>
 #include <mm/frame.h>
 #include <bitops.h>
 #include <macros.h>
 #endif /* CONFIG_TSB */
+}
 int as_constructor_arch(as_t *as, int flags)
+{
 #ifdef CONFIG_TSB
+    /*
+     * The order must be calculated with respect to the emulated
+     * 16K page size.
+     */
     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((uintptr_t) as->arch.itsb, (ITSB_ENTRY_COUNT + DTSB_ENTRY_COUNT)
+    memsetb((uintptr_t) as->arch.itsb,
-        * sizeof(tsb_entry_t), 0);
+        (ITSB_ENTRY_COUNT + DTSB_ENTRY_COUNT) * sizeof(tsb_entry_t), 0);
 #endif
     return 0;
+}
 int as_destructor_arch(as_t *as)
+{
 #ifdef CONFIG_TSB
+    /*
+     * The count must be calculated with respect to the emualted 16K page
+     * size.
+     */
     count_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;
 #endif
+}
 int as_create_arch(as_t *as, int flags)
+{
 #ifdef CONFIG_TSB
-    ipl_t ipl;
-    ipl = interrupts_disable();
-    mutex_lock_active(&as->lock);   /* completely unnecessary, but polite */
     tsb_invalidate(as, 0, (count_t) -1);
-    mutex_unlock(&as->lock);
-    interrupts_restore(ipl);
 #endif
     return 0;
+}
 /** Perform sparc64-specific tasks when an address space becomes active on the
 void as_install_arch(as_t *as)
+{
     tlb_context_reg_t ctx;
     /*
-     * Note that we don't lock the address space.
+     * Note that we don't and may not lock the address space. That's ok
-     * That's correct - we can afford it here
-     * because we only read members that are
+     * since we only read members that are currently read-only.
+     *
-     * currently read-only.
+     * Moreover, the as->asid is protected by asidlock, which is being held.
      */
     /*
-     * Write ASID to secondary context register.
+     * Write ASID to secondary context register. The primary context
-     * The primary context register has to be set
-     * from TL>0 so it will be filled from the
+     * register has to be set from TL>0 so it will be filled from the
-     * secondary context register from the TL=1
+     * secondary context register from the TL=1 code just before switch to
-     * code just before switch to userspace.
+     * userspace.
      */
     ctx.v = 0;
     ctx.context = as->asid;
     mmu_secondary_context_write(ctx.v);
     ASSERT(as->arch.itsb && as->arch.dtsb);
     uintptr_t tsb = (uintptr_t) as->arch.itsb;
-    if (!overlaps(tsb, 8 * PAGE_SIZE, base, 1 << KERNEL_PAGE_WIDTH)) {
+    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.
          */
     tsb_base.value = 0;
     tsb_base.size = TSB_SIZE;
     tsb_base.split = 0;
-    tsb_base.base = ((uintptr_t) as->arch.itsb) >> PAGE_WIDTH;
+    tsb_base.base = ((uintptr_t) as->arch.itsb) >> MMU_PAGE_WIDTH;
     itsb_base_write(tsb_base.value);
-    tsb_base.base = ((uintptr_t) as->arch.dtsb) >> PAGE_WIDTH;
+    tsb_base.base = ((uintptr_t) as->arch.dtsb) >> MMU_PAGE_WIDTH;
     dtsb_base_write(tsb_base.value);
 #endif
+}
 /** Perform sparc64-specific tasks when an address space is removed from the
  */
 void as_deinstall_arch(as_t *as)
+{
     /*
-     * Note that we don't lock the address space.
+     * Note that we don't and may not lock the address space. That's ok
-     * That's correct - we can afford it here
-     * because we only read members that are
+     * since we only read members that are currently read-only.
+     *
-     * currently read-only.
+     * 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 * PAGE_SIZE, base, 1 << KERNEL_PAGE_WIDTH)) {
+    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 demap the entry installed by as_install_arch().
          */

Subversion Repositories HelenOS

(root)/branches/fs/kernel/arch/sparc64/src/mm/as.c – Rev 2131 → 2422