change log for rtems (2011-10-06)

rtems-vc at rtems.org rtems-vc at rtems.org
Thu Oct 6 17:11:25 UTC 2011


 *joel*:
2011-10-06	Gedare Bloom <giddyup44 at yahoo.com>

	PR 1918/cpukit
	* cpu.c: Initialize context with cleared g4 register.

M   1.11  cpukit/score/cpu/sparc64/ChangeLog
M    1.3  cpukit/score/cpu/sparc64/cpu.c

diff -u rtems/cpukit/score/cpu/sparc64/ChangeLog:1.10 rtems/cpukit/score/cpu/sparc64/ChangeLog:1.11
--- rtems/cpukit/score/cpu/sparc64/ChangeLog:1.10	Tue Sep 27 04:18:04 2011
+++ rtems/cpukit/score/cpu/sparc64/ChangeLog	Thu Oct  6 11:42:52 2011
@@ -1,3 +1,8 @@
+2011-10-06	Gedare Bloom <giddyup44 at yahoo.com>
+
+	PR 1918/cpukit
+	* cpu.c: Initialize context with cleared g4 register.
+
 2011-09-27	Sebastian Huber <sebastian.huber at embedded-brains.de>
 
 	PR 1914/cpukit

diff -u rtems/cpukit/score/cpu/sparc64/cpu.c:1.2 rtems/cpukit/score/cpu/sparc64/cpu.c:1.3
--- rtems/cpukit/score/cpu/sparc64/cpu.c:1.2	Sun Jul 24 18:43:20 2011
+++ rtems/cpukit/score/cpu/sparc64/cpu.c	Thu Oct  6 11:42:52 2011
@@ -104,6 +104,9 @@
     the_context->o6_sp = stack_high - CPU_MINIMUM_STACK_FRAME_SIZE - STACK_BIAS;
     the_context->i6_fp = 0;
 
+    /* ABI uses g4 as segment register, make sure it is zeroed */
+    the_context->g4    = 0;
+
     /* PSTATE used to be built here, but is no longer included in context */
 
   /*


 *joel*:
2011-10-06	Gedare Bloom <giddyup44 at yahoo.com>

	PR 1919/bsp
	* Makefile.am: Change install ISR callout to bsppredriverhook.

M    1.9  c/src/lib/libbsp/sparc64/usiii/ChangeLog
M    1.3  c/src/lib/libbsp/sparc64/usiii/Makefile.am

diff -u rtems/c/src/lib/libbsp/sparc64/usiii/ChangeLog:1.8 rtems/c/src/lib/libbsp/sparc64/usiii/ChangeLog:1.9
--- rtems/c/src/lib/libbsp/sparc64/usiii/ChangeLog:1.8	Mon Jun 20 05:30:35 2011
+++ rtems/c/src/lib/libbsp/sparc64/usiii/ChangeLog	Thu Oct  6 11:44:56 2011
@@ -1,3 +1,8 @@
+2011-10-06	Gedare Bloom <giddyup44 at yahoo.com>
+
+	PR 1919/bsp
+	* Makefile.am: Change install ISR callout to bsppredriverhook.
+
 2011-06-20	Ralf Corsépius <ralf.corsepius at rtems.org>
 
 	* Makefile.am: Don't reference non-existing files.

diff -u rtems/c/src/lib/libbsp/sparc64/usiii/Makefile.am:1.2 rtems/c/src/lib/libbsp/sparc64/usiii/Makefile.am:1.3
--- rtems/c/src/lib/libbsp/sparc64/usiii/Makefile.am:1.2	Mon Jun 20 05:30:37 2011
+++ rtems/c/src/lib/libbsp/sparc64/usiii/Makefile.am	Thu Oct  6 11:44:56 2011
@@ -89,11 +89,11 @@
 dist_project_lib_DATA += ../shared/startup/linkcmds
 
 startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \
-    ../../shared/bsppredriverhook.c ../../shared/bsppretaskinghook.c \
+    ../../shared/bspstart.c ../../shared/bsppretaskinghook.c \
     ../../shared/bsppost.c \
     ../../shared/bootcard.c ../../shared/sbrk.c \
     ../shared/startup/bspgetworkarea.c \
-    ../shared/startup/bspstart.c \
+    ../shared/startup/bsppredriverhook.c \
     ../shared/startup/setvec.c \
     ../../shared/gnatinstallhandler.c  \
     ../shared/helenos/boot/genarch/balloc.c \


 *joel*:
2011-10-06	Gedare Bloom <giddyup44 at yahoo.com>

	PR 1919/bsp
	* shared/startup/bsppredriverhook.c: New file.

M   1.11  c/src/lib/libbsp/sparc64/ChangeLog
A    1.1  c/src/lib/libbsp/sparc64/shared/startup/bsppredriverhook.c

diff -u rtems/c/src/lib/libbsp/sparc64/ChangeLog:1.10 rtems/c/src/lib/libbsp/sparc64/ChangeLog:1.11
--- rtems/c/src/lib/libbsp/sparc64/ChangeLog:1.10	Mon Jun 20 05:46:23 2011
+++ rtems/c/src/lib/libbsp/sparc64/ChangeLog	Thu Oct  6 11:45:12 2011
@@ -1,3 +1,8 @@
+2011-10-06	Gedare Bloom <giddyup44 at yahoo.com>
+
+	PR 1919/bsp
+	* shared/startup/bsppredriverhook.c: New file.
+
 2011-06-20	Ralf Corsépius <ralf.corsepius at rtems.org>
 
 	* Makefile.am: Remove superfluous EXTRA_DIST.

diff -u /dev/null rtems/c/src/lib/libbsp/sparc64/shared/startup/bsppredriverhook.c:1.1
--- /dev/null	Thu Oct  6 12:11:25 2011
+++ rtems/c/src/lib/libbsp/sparc64/shared/startup/bsppredriverhook.c	Thu Oct  6 11:45:12 2011
@@ -0,0 +1,21 @@
+/*
+ *  This is a bsp_predriver_hook routine for sparc64
+ *
+ *  COPYRIGHT (c) 1989-2007.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+
+#include <bsp/bootcard.h>
+
+extern void sparc64_install_isr_entries(void);
+
+void bsp_predriver_hook( void )
+{
+  sparc64_install_isr_entries();
+}


 *joel*:
2011-10-06	Gedare Bloom <giddyup44 at 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.

M   1.12  c/src/lib/libbsp/sparc64/ChangeLog
M    1.2  c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/src/sun4u/takemmu.S
M    1.2  c/src/lib/libbsp/sparc64/shared/start/start.S
M    1.2  c/src/lib/libbsp/sparc64/shared/startup/bspgetworkarea.c
M    1.4  c/src/lib/libbsp/sparc64/shared/startup/linkcmds

diff -u rtems/c/src/lib/libbsp/sparc64/ChangeLog:1.11 rtems/c/src/lib/libbsp/sparc64/ChangeLog:1.12
--- rtems/c/src/lib/libbsp/sparc64/ChangeLog:1.11	Thu Oct  6 11:45:12 2011
+++ rtems/c/src/lib/libbsp/sparc64/ChangeLog	Thu Oct  6 11:46:36 2011
@@ -1,5 +1,13 @@
 2011-10-06	Gedare Bloom <giddyup44 at 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 at yahoo.com>
+
 	PR 1919/bsp
 	* shared/startup/bsppredriverhook.c: New file.
 

diff -u rtems/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/src/sun4u/takemmu.S:1.1 rtems/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/src/sun4u/takemmu.S:1.2
--- rtems/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/src/sun4u/takemmu.S:1.1	Thu Jun 17 11:20:45 2010
+++ rtems/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/src/sun4u/takemmu.S	Thu Oct  6 11:46:36 2011
@@ -178,11 +178,11 @@
 	stxa %g0, [%g1] ASI_DMMU_DEMAP			
 	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
 
@@ -271,7 +271,7 @@
 	flush %g5
 */
 	! 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
 	flush %g5
@@ -280,6 +280,36 @@
 	SET_TLB_DATA(g1, g2, TTE_L)		! use non-global mapping
 	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
 	wrpr %g0, 1, %tl

diff -u rtems/c/src/lib/libbsp/sparc64/shared/start/start.S:1.1 rtems/c/src/lib/libbsp/sparc64/shared/start/start.S:1.2
--- rtems/c/src/lib/libbsp/sparc64/shared/start/start.S:1.1	Thu Jun 17 11:20:45 2010
+++ rtems/c/src/lib/libbsp/sparc64/shared/start/start.S	Thu Oct  6 11:46:36 2011
@@ -123,6 +123,10 @@
 	set SYM(StackStart), %sp
 	add %sp, -STACK_BIAS, %sp
 
+  /* BSP-specific pre-bootcard initializations */
+  call SYM(_BSP_init)
+  nop
+
 	setx ofw_cif, %l0, %l1
  
 	call ofw_init		! initialize OpenFirmware
@@ -131,9 +135,6 @@
   call bootstrap
   nop
 
-  /* BSP-specific pre-bootcard initializations */
-  call SYM(_BSP_init)
-  nop
 
   /* Set up ISR handler for interrupt enable/disable */
 	setx SYM(syscall), %l0, %o1

diff -u rtems/c/src/lib/libbsp/sparc64/shared/startup/bspgetworkarea.c:1.1 rtems/c/src/lib/libbsp/sparc64/shared/startup/bspgetworkarea.c:1.2
--- rtems/c/src/lib/libbsp/sparc64/shared/startup/bspgetworkarea.c:1.1	Thu Jun 17 11:20:46 2010
+++ rtems/c/src/lib/libbsp/sparc64/shared/startup/bspgetworkarea.c	Thu Oct  6 11:46:36 2011
@@ -59,7 +59,7 @@
   #endif
 
   *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;
 

diff -u rtems/c/src/lib/libbsp/sparc64/shared/startup/linkcmds:1.3 rtems/c/src/lib/libbsp/sparc64/shared/startup/linkcmds:1.4
--- rtems/c/src/lib/libbsp/sparc64/shared/startup/linkcmds:1.3	Tue Nov 16 17:20:08 2010
+++ rtems/c/src/lib/libbsp/sparc64/shared/startup/linkcmds	Thu Oct  6 11:46:36 2011
@@ -13,9 +13,9 @@
  * Declare some sizes.
  */
 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;
 
@@ -25,7 +25,7 @@
 
 MEMORY
         {
-	        ram : ORIGIN = 0x0, LENGTH = 16M
+	        ram : ORIGIN = 0x0, LENGTH = 12M
 	}
 
 



--

Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20111006/ef56aea7/attachment-0001.html>


More information about the vc mailing list