Changeset 9426f7c4 in mainline

Timestamp:

2013-11-12T22:24:04Z (10 years ago)

Author:

Jakub Klama <jakub.klama@…>

Branches:

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

Children:

a3b034b

Parents:

bf677f6

Message:

• Add proper TLB flushes in as_install_arch()
• Improve saving %g1-%g4,%g7 in trap and syscall handlers

Location:

kernel/arch/sparc32

Files:

• include/arch/arch.h (modified) (1 diff)
• src/mm/as.c (modified) (1 diff)
• src/trap_table.S (modified) (18 diffs)
• src/userspace.c (modified) (1 diff)

kernel/arch/sparc32/include/arch/arch.h

@@ -46 +46 @@
 #define ASI_CACHEMISS   0x01
 #define ASI_CACHECTRL   0x02
+#define ASI_MMUCACHE    0x10
 #define ASI_MMUREGS     0x19
 #define ASI_MMUBYPASS   0x1c
+#define ASI_MMUFLUSH    0x18
 
 #define TASKMAP_MAX_RECORDS  32

kernel/arch/sparc32/src/mm/as.c

@@ -54 +54 @@
         context_table[as->asid].et = PTE_ET_DESCRIPTOR;
         asi_u32_write(ASI_MMUREGS, 0x200, as->asid);
+        asi_u32_write(ASI_MMUCACHE, 0, 1);
+        asi_u32_write(ASI_MMUFLUSH, 0, 1);
 }
 

kernel/arch/sparc32/src/trap_table.S

@@ -88 +88 @@
         or  %l3, %l4, %l3
         and %l3, 0xff, %l3
-
         mov %g0, %wim
+
+        mov %l5, %g5
+        mov %l6, %g6
+        mov %l7, %g7
+
         save
         std %l0, [%sp +  0]
@@ -99 +103 @@
         std %i4, [%sp + 48]
         std %i6, [%sp + 56]
+        mov %g5, %l5
+        mov %g6, %l6
+        mov %g7, %l7
         restore
         mov %l3, %wim
@@ -109 +116 @@
         or  %l3, %l4, %l3
         and %l3, 0xff, %l3
+        mov %g0, %wim
         mov \uwb, %g3
+
+        mov %l5, %g5
+        mov %l6, %g6
+        mov %l7, %g7
 
         save
@@ -120 +132 @@
         std %i4, [%g3 + 48]
         std %i6, [%g3 + 56]
+        mov %g5, %l5
+        mov %g6, %l6
+        mov %g7, %l7
         add \uwb, 64, \uwb
         restore
@@ -223 +238 @@
 
 window_overflow_trap:
+        mov %g7, %l0
+
         /* rotate WIM on bit right, we have 8 windows */
         mov %wim, %l3
@@ -240 +257 @@
 
         /* Check whether previous mode was usermode */
-        and %l0, (1 << 6), %l0
-        cmp %l0, 0
+        mov %psr, %l4
+        and %l4, (1 << 6), %l4
+        cmp %l4, 0
         beq 1f
         nop
@@ -305 +323 @@
 
         /* go home */
+        mov %l0, %g7
         jmp %l1
         rett %l2
 
 window_underflow_trap:
+        mov %g7, %l0
+
         /* rotate WIM on bit LEFT, we have 8 windows */ 
         mov %wim,%l3
@@ -321 +342 @@
 
         /* Check whether previous mode was usermode */
-        mov %psr, %l0
-        and %l0, (1 << 6), %l0
-        cmp %l0, 0
+        mov %psr, %l4
+        and %l4, (1 << 6), %l4
+        cmp %l4, 0
         beq 1f
         nop
@@ -373 +394 @@
 
         /* go home */
+        mov %l0, %g7
         jmp %l1
         rett %l2
 
 preemptible_trap:
+        /* Save %g7 */
+        mov %g7, %l0
+
         /* Check whether we landed in invalid window */
         get_wim_number %g6
@@ -407 +432 @@
         /* Load kernel stack pointer from invalid window */
         switch_to_invalid %g5, %g6
+
         /* set uspace window mark */
         mov %g6, %l7
@@ -412 +438 @@
         and %l7, 0x7, %l7
         or %l7, 0x10, %l7
+
         /* Save stack pointer */
         mov %l5, %g7
@@ -419 +446 @@
 
 5:      /* Set up stack frame */
-        sub %sp, 120, %sp
+        sub %sp, 128, %sp
 
         /* Save trap data on stack */
-        mov %psr, %l0
+        mov %psr, %l5
         st %l1, [%sp + 92]
         st %l2, [%sp + 96]
-        st %l0, [%sp + 100]
+        st %l5, [%sp + 100]
         st %g1, [%sp + 104]
         st %g2, [%sp + 108]
         st %g3, [%sp + 112]
         st %g4, [%sp + 116]
+        st %l0, [%sp + 120]
 
         /* Enable traps */
@@ -448 +476 @@
         ld [%sp + 96], %l2
         ld [%sp + 100], %l0
-        ld [%sp + 104], %g1
-        ld [%sp + 108], %g2
-        ld [%sp + 112], %g3
-        ld [%sp + 116], %g4
         mov %l0, %psr
         nop
@@ -486 +510 @@
 7:      inline_restore_kernel
 
-8:      jmp %l1
+8:      ld [%sp + 104], %g1
+        ld [%sp + 108], %g2
+        ld [%sp + 112], %g3
+        ld [%sp + 116], %g4
+        ld [%sp + 120], %g7
+        jmp %l1
         rett %l2
 
@@ -565 +594 @@
 
 syscall_trap:
+        /* Save %g7 */
+        mov %g7, %l0
+
         /* Check whether we landed in invalid window */
         get_wim_number %g6
@@ -609 +641 @@
 
 5:      /* Set up stack frame */
-        sub %sp, 120, %sp
+        sub %sp, 128, %sp
 
         /* Save trap data on stack */
-        mov %psr, %l0
+        mov %psr, %l5
         st %l1, [%sp + 92]
         st %l2, [%sp + 96]
-        st %l0, [%sp + 100]
+        st %l5, [%sp + 100]
         st %g1, [%sp + 104]
         st %g2, [%sp + 108]
         st %g3, [%sp + 112]
         st %g4, [%sp + 116]
+        st %l0, [%sp + 120]
 
         /* Enable traps */
@@ -645 +678 @@
         ld [%sp + 96], %l2
         ld [%sp + 100], %l0
-        ld [%sp + 104], %g1
-        ld [%sp + 108], %g2
-        ld [%sp + 112], %g3
-        ld [%sp + 116], %g4
-
         mov %o0, %i0
         mov %l0, %psr
@@ -685 +713 @@
 7:      inline_restore_kernel
 
-8:      jmp %l2
+8:      ld [%sp + 104], %g1
+        ld [%sp + 108], %g2
+        ld [%sp + 112], %g3
+        ld [%sp + 116], %g4
+        ld [%sp + 120], %g7
+        jmp %l2
         rett %l2 + 4
 

kernel/arch/sparc32/src/userspace.c

@@ -52 +52 @@
 
         asm volatile (
+                "flush\n"
                 "mov %[stack], %%sp\n"
+                "mov %[arg], %%o1\n"
                 "jmp %[entry]\n"
                 "mov %[psr], %%psr\n" :: [entry] "r" (kernel_uarg->uspace_entry),
+                           [arg] "r" (kernel_uarg->uspace_uarg),
                            [psr] "r" (psr),
                            [stack] "r" (kernel_uarg->uspace_stack + kernel_uarg->uspace_stack_size));