From 882fdcf2271d385f1110c0f3737ceeb5e30d2861 Mon Sep 17 00:00:00 2001
From: David Hendricks <dhendrix@chromium.org>
Date: Thu, 14 Feb 2013 16:41:54 -0800
Subject: [PATCH] armv7/exynos5250: fix usage of _stack and _estack

This patch fixes up the usage of stack pointer and regions.
The current approach only works by coincidence, so this fixes a few
things at once to get it into a working state and allow us to use
checkstack() again:

- Add a STACK_SIZE Kconfig variable. Earlier on it was evaluated to 0.

- Assign _stack and _estack using CPU-specific Kconfig variables since
  it may reside elsewhere in memory (not necessarily DRAM).

- Make the existing IRAM stack variables more useful in this context.

Change-Id: I4ca5b5680c9ea7e26b1b2b6b3890e028188b51c2
Signed-off-by: David Hendricks <dhendrix@chromium.org>
Reviewed-on: http://review.coreboot.org/2416
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Tested-by: build bot (Jenkins)
---
 src/arch/armv7/bootblock.inc       |  2 +-
 src/arch/armv7/coreboot_ram.ld     | 12 +++---------
 src/cpu/samsung/exynos5250/Kconfig | 23 ++++++++++++++++++-----
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/arch/armv7/bootblock.inc b/src/arch/armv7/bootblock.inc
index efe3d67bd1..c8cfe5eb37 100644
--- a/src/arch/armv7/bootblock.inc
+++ b/src/arch/armv7/bootblock.inc
@@ -94,4 +94,4 @@ wait_for_interrupt:
  */
 .align 2
 .Stack:
-	.word CONFIG_IRAM_STACK
+	.word CONFIG_STACK_TOP
diff --git a/src/arch/armv7/coreboot_ram.ld b/src/arch/armv7/coreboot_ram.ld
index 0644e3669d..2edf8e3b26 100644
--- a/src/arch/armv7/coreboot_ram.ld
+++ b/src/arch/armv7/coreboot_ram.ld
@@ -99,15 +99,6 @@ SECTIONS
 	 * this line.
 	 */
 
-	. = ALIGN(CONFIG_STACK_SIZE);
-
-	_stack = .;
-	.stack . : {
-		/* Reserve a stack for each possible cpu */
-		. += CONFIG_MAX_CPUS*CONFIG_STACK_SIZE;
-	}
-	_estack = .;
-
         _heap = .;
         .heap . : {
                 /* Reserve CONFIG_HEAP_SIZE bytes for the heap */
@@ -116,6 +107,9 @@ SECTIONS
         }
         _eheap = .;
 
+	_stack = CONFIG_STACK_BOTTOM;
+	_estack = CONFIG_STACK_TOP;
+
 	/* The ram segment. This includes all memory used by the memory
 	 * resident copy of coreboot, except the tables that are produced on
 	 * the fly, but including stack and heap.
diff --git a/src/cpu/samsung/exynos5250/Kconfig b/src/cpu/samsung/exynos5250/Kconfig
index 2869d7689e..01268e44e5 100644
--- a/src/cpu/samsung/exynos5250/Kconfig
+++ b/src/cpu/samsung/exynos5250/Kconfig
@@ -23,7 +23,7 @@ config BL1_SIZE_KB
 # 0x0202_0000: vendor-provided BL1
 # 0x0202_3400: bootblock, assume up to 32KB in size
 # 0x0203_0000: romstage, assume up to 128KB in size.
-# 0x0207_7f00: stack pointer
+# 0x0207_8000: stack pointer
 
 # this may be used to calculate offsets
 config IRAM_BOTTOM
@@ -46,6 +46,23 @@ config ROMSTAGE_SIZE
 	hex
 	default 0x10000
 
+# Stack may reside in either IRAM or DRAM. We will define it to live
+# at the top of IRAM for now.
+#
+# Stack grows downward, push operation stores register contents in
+# consecutive memory locations ending just below SP
+config STACK_TOP
+	hex
+	default 0x02078000
+
+config STACK_BOTTOM
+	hex
+	default 0x02077000
+
+config STACK_SIZE
+	hex
+	default 0x1000
+
 config CBFS_ROM_OFFSET
 	# Calculated by BL1 + max bootblock size.
 	hex "offset of CBFS data in ROM"
@@ -73,10 +90,6 @@ config SPI_IMAGE_HACK
 	hex
 	default 0x02060000
 
-config IRAM_STACK
-	hex
-	default 0x02077f00
-
 # FIXME: other magic numbers that should probably go away
 config XIP_ROM_SIZE
 	hex