[coreboot] [commit] r5417 - in trunk/src: arch/i386/init cpu/via/car

[repository service]

Author: stepan
Date: Tue Apr 13 12:01:14 2010
New Revision: 5417
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5417

Log:
Speed up coreboot_ram loading by moving the decompression stack
into the cached area. Back to 469ms until coreboot_ram is actually
running on epia-cn

Signed-off-by: Stefan Reinauer <stepan at coresystems.de>
Acked-by: Stefan Reinauer <stepan at coresystems.de>

Modified:
   trunk/src/arch/i386/init/crt0_romcc_epilogue.inc
   trunk/src/cpu/via/car/cache_as_ram.inc

Modified: trunk/src/arch/i386/init/crt0_romcc_epilogue.inc
==============================================================================
--- trunk/src/arch/i386/init/crt0_romcc_epilogue.inc	Tue Apr 13 03:22:20 2010	(r5416)
+++ trunk/src/arch/i386/init/crt0_romcc_epilogue.inc	Tue Apr 13 12:01:14 2010	(r5417)
@@ -14,8 +14,16 @@
 	
 	movl	%ebp, %esi
 
-	/* FIXME: look for a proper place for the stack */
-	movl	$0x4000000, %esp
+	/* For now: use CONFIG_RAMBASE + 1MB - 64K (counting downwards) as stack. This
+	 * makes sure that we stay completely within the 1M-64K of memory that we
+	 * preserve for suspend/resume.
+	 */
+
+#ifndef HIGH_MEMORY_SAVE
+#warning Need a central place for HIGH_MEMORY_SAVE
+#define HIGH_MEMORY_SAVE ( (1024 - 64) * 1024 )
+#endif
+	movl $(CONFIG_RAMBASE + HIGH_MEMORY_SAVE), %esp
 	movl	%esp, %ebp
 	pushl %esi
 	call copy_and_run

Modified: trunk/src/cpu/via/car/cache_as_ram.inc
==============================================================================
--- trunk/src/cpu/via/car/cache_as_ram.inc	Tue Apr 13 03:22:20 2010	(r5416)
+++ trunk/src/cpu/via/car/cache_as_ram.inc	Tue Apr 13 12:01:14 2010	(r5417)
@@ -270,14 +270,16 @@
 	
 	movl	%ebp, %esi
 
-	/* FIXME: These values might have to change for suspend-to-ram.
-	 * the 0x00400000 was chosen as this is a place in memory that
-	 * should exist in all contemporary configurations (ie. large
-	 * enough RAM), but doesn't collide with anything coreboot does.
-	 * Other than that, it's arbitrary.
+	/* For now: use CONFIG_RAMBASE + 1MB - 64K (counting downwards) as stack. This
+	 * makes sure that we stay completely within the 1M-64K of memory that we
+	 * preserve for suspend/resume.
 	 */
 
-	movl	$0x4000000, %esp
+#ifndef HIGH_MEMORY_SAVE
+#warning Need a central place for HIGH_MEMORY_SAVE
+#define HIGH_MEMORY_SAVE ( (1024 - 64) * 1024 )
+#endif
+	movl $(CONFIG_RAMBASE + HIGH_MEMORY_SAVE), %esp
 	movl	%esp, %ebp
 	pushl %esi
 	call copy_and_run