Changeset 48449a8 in rtems

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.

Location:

c/src/lib/libbsp/sparc64

Files:

• ChangeLog (modified) (1 diff)
• shared/helenos/kernel/sparc64/src/sun4u/takemmu.S (modified) (3 diffs)
• shared/start/start.S (modified) (2 diffs)
• shared/startup/bspgetworkarea.c (modified) (1 diff)
• shared/startup/linkcmds (modified) (2 diffs)

c/src/lib/libbsp/sparc64/ChangeLog

@@ +1 @@
+2011-10-06      Gedare Bloom <giddyup44@yahoo.com>
+
+        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.
+
 2011-10-06      Gedare Bloom <giddyup44@yahoo.com>
 

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

c/src/lib/libbsp/sparc64/shared/start/start.S

@@ -124 +124 @@
         add %sp, -STACK_BIAS, %sp
 
+  /* BSP-specific pre-bootcard initializations */
+  call SYM(_BSP_init)
+  nop
+
         setx ofw_cif, %l0, %l1
  
@@ -132 +136 @@
   nop
 
-  /* BSP-specific pre-bootcard initializations */
-  call SYM(_BSP_init)
-  nop
 
   /* Set up ISR handler for interrupt enable/disable */

c/src/lib/libbsp/sparc64/shared/startup/bspgetworkarea.c

@@ -60 +60 @@
 
   *work_area_start = WorkAreaBase;
-  *work_area_size  = ram_end - (uintptr_t) WorkAreaBase;
+  *work_area_size  = (uintptr_t) HeapSize;
   *heap_start      = (void*) HeapBase;
   *heap_size       = (uintptr_t) HeapSize;

c/src/lib/libbsp/sparc64/shared/startup/linkcmds

@@ -14 +14 @@
  */
 RamBase = DEFINED(RamBase) ? RamBase : 0x0;
-RamSize = DEFINED(RamSize) ? RamSize : 16M;
-HeapSize = DEFINED(HeapSize) ? HeapSize : 256k;
-StackSize = DEFINED(StackSize) ? StackSize : 256k;
+RamSize = DEFINED(RamSize) ? RamSize : 12M;
+HeapSize = DEFINED(HeapSize) ? HeapSize : 1M;
+StackSize = DEFINED(StackSize) ? StackSize : 1M;
 
 RAM_END = RamBase + RamSize;
@@ -26 +26 @@
 MEMORY
         {
-                ram : ORIGIN = 0x0, LENGTH = 16M
+                ram : ORIGIN = 0x0, LENGTH = 12M
         }