Changeset 48449a8 in rtems for c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/src/sun4u/takemmu.S

Timestamp:

10/06/11 16:46:36 (11 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.11, 5, master

Children:

71d093f0

Parents:

b7d3a2ca

Message:

2011-10-06 Gedare Bloom <giddyup44@…>

PR 1920/bsp

• shared/helenos/kernel/sparc64/src/sun4u/takemmu.S, shared/start/start.S, shared/startup/bspgetworkarea.c, shared/startup/linkcmds: Fix BSP memory use to support more than 4 MB of RAM.

File:

• c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/src/sun4u/takemmu.S (modified) (3 diffs)

c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/src/sun4u/takemmu.S

@@ -179 +179 @@
         membar #Sync
 */
-#define SET_TLB_TAG(r1, context) \
-        set VMA | (context << TLB_TAG_ACCESS_CONTEXT_SHIFT), %r1
+#define SET_TLB_TAG(xVMA, r1, context) \
+        set xVMA | (context << TLB_TAG_ACCESS_CONTEXT_SHIFT), %r1
 
         ! write DTLB tag
-        SET_TLB_TAG(g1, MEM_CONTEXT_KERNEL)
+        SET_TLB_TAG(0x4000, g1, MEM_CONTEXT_KERNEL)
         stxa %g1, [VA_DMMU_TAG_ACCESS] %asi                     
         membar #Sync
@@ -272 +272 @@
 */
         ! write ITLB tag of context 0
-        SET_TLB_TAG(g1, MEM_CONTEXT_KERNEL)
+        SET_TLB_TAG(0x4000, g1, MEM_CONTEXT_KERNEL)
         mov VA_DMMU_TAG_ACCESS, %g2
         stxa %g1, [%g2] ASI_IMMU
@@ -281 +281 @@
         stxa %g1, [%g0] ASI_ITLB_DATA_IN_REG            
         flush %g5
+
+  ! GAB: add more mappings for dmmu in 4 MB chunks
+  SET_TLB_TAG(0x404000, g1, MEM_CONTEXT_KERNEL)
+  stxa %g1, [VA_DMMU_TAG_ACCESS] %asi
+  membar #Sync
+  set 0x400000, %g1
+  add %g1, %l5, %l5
+  SET_TLB_DATA(g1, g2, TTE_L | TTE_W)
+  stxa %g1, [%g0] ASI_DTLB_DATA_IN_REG
+  membar #Sync
+
+  SET_TLB_TAG(0x804000, g1, MEM_CONTEXT_KERNEL)
+  stxa %g1, [VA_DMMU_TAG_ACCESS] %asi
+  membar #Sync
+  set 0x400000, %g1
+  add %g1, %l5, %l5
+  SET_TLB_DATA(g1, g2, TTE_L | TTE_W)
+  stxa %g1, [%g0] ASI_DTLB_DATA_IN_REG
+  membar #Sync
+
+  SET_TLB_TAG(0xc04000, g1, MEM_CONTEXT_KERNEL)
+  stxa %g1, [VA_DMMU_TAG_ACCESS] %asi
+  membar #Sync
+  set 0x400000, %g1
+  add %g1, %l5, %l5
+  SET_TLB_DATA(g1, g2, TTE_L | TTE_W)
+  stxa %g1, [%g0] ASI_DTLB_DATA_IN_REG
+  membar #Sync
+
+
 /*
         ! enter nucleus - using context 0