Changeset 3da11f37 in mainline

Timestamp:

2009-11-28T20:19:29Z (15 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

3f35634c

Parents:

18baf9c0

Message:

Merged changes essential for the code to reach 'uinit'.

Location:

kernel

Files:

• arch/sparc64/src/mm/sun4v/tlb.c (modified) (4 diffs)
• arch/sparc64/src/sun4v/asm.S (modified) (1 diff)
• arch/sparc64/src/trap/sun4v/trap_table.S (modified) (2 diffs)
• generic/src/main/kinit.c (modified) (3 diffs)

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2005 Jakub Jermar
+ * Copyright (c) 2008 Pavel Rimsky
  * All rights reserved.
  *
@@ -52 +53 @@
 #include <panic.h>
 #include <arch/asm.h>
+#include <arch/cpu.h>
+#include <arch/mm/pagesize.h>
 
 #ifdef CONFIG_TSB
@@ -518 +521 @@
 void tlb_invalidate_asid(asid_t asid)
 {
-        tlb_context_reg_t pc_save, ctx;
-        
         /* switch to nucleus because we are mapped by the primary context */
         nucleus_enter();
-        
-        ctx.v = pc_save.v = mmu_primary_context_read();
-        ctx.context = asid;
-        mmu_primary_context_write(ctx.v);
-        
-        itlb_demap(TLB_DEMAP_CONTEXT, TLB_DEMAP_PRIMARY, 0);
-        dtlb_demap(TLB_DEMAP_CONTEXT, TLB_DEMAP_PRIMARY, 0);
-        
-        mmu_primary_context_write(pc_save.v);
-        
+        __hypercall_fast4(MMU_DEMAP_CTX, 0, 0, asid,
+                MMU_FLAG_ITLB | MMU_FLAG_DTLB);
+
         nucleus_leave();
 }
@@ -545 +539 @@
 {
         unsigned int i;
-        tlb_context_reg_t pc_save, ctx;
         
         /* switch to nucleus because we are mapped by the primary context */
         nucleus_enter();
-        
-        ctx.v = pc_save.v = mmu_primary_context_read();
-        ctx.context = asid;
-        mmu_primary_context_write(ctx.v);
-        
-        for (i = 0; i < cnt * MMU_PAGES_PER_PAGE; i++) {
-                itlb_demap(TLB_DEMAP_PAGE, TLB_DEMAP_PRIMARY,
-                    page + i * MMU_PAGE_SIZE);
-                dtlb_demap(TLB_DEMAP_PAGE, TLB_DEMAP_PRIMARY,
-                    page + i * MMU_PAGE_SIZE);
-        }
-        
-        mmu_primary_context_write(pc_save.v);
-        
+
+        for (i = 0; i < cnt; i++) {
+                __hypercall_fast5(MMU_DEMAP_PAGE, 0, 0, page, asid,
+                        MMU_FLAG_DTLB | MMU_FLAG_ITLB);
+        }
+
         nucleus_leave();
 }

kernel/arch/sparc64/src/sun4v/asm.S

@@ -75 +75 @@
          */
         wrpr %g0, WSTATE_OTHER(0) | WSTATE_NORMAL(1), %wstate
-
         done                            ! jump to userspace

kernel/arch/sparc64/src/trap/sun4v/trap_table.S

@@ -281 +281 @@
 .global fast_instruction_access_mmu_miss_handler_tl0
 fast_instruction_access_mmu_miss_handler_tl0:
-        /*FAST_INSTRUCTION_ACCESS_MMU_MISS_HANDLER*/
+        FAST_INSTRUCTION_ACCESS_MMU_MISS_HANDLER
 
 /* TT = 0x68, TL = 0, fast_data_access_MMU_miss */
@@ -390 +390 @@
 .global data_access_exception_tl1
 data_access_exception_tl1:
-        /*wrpr %g0, 1, %tl
+        wrpr %g0, 1, %tl
         wrpr %g0, PSTATE_AG_BIT | PSTATE_PRIV_BIT, %pstate
-        PREEMPTIBLE_HANDLER data_access_exception*/
+        PREEMPTIBLE_HANDLER data_access_exception
 
 /* TT = 0x32, TL > 0, data_access_error */

kernel/generic/src/main/kinit.c

@@ -165 +165 @@
         interrupts_enable();
         
-//MH
-#if defined (SUN4U)
         /*
          * Create user tasks, load RAM disk images.
@@ -218 +216 @@
                 }
         }
-        
+
         /*
          * Run user tasks.
@@ -226 +224 @@
                         program_ready(&programs[i]);
         }
-        
-#endif
+
 #ifdef CONFIG_KCONSOLE
         if (!stdin) {