aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cpu/amd/car/cache_as_ram.inc6
-rw-r--r--src/cpu/amd/car/post_cache_as_ram.c8
2 files changed, 13 insertions, 1 deletions
diff --git a/src/cpu/amd/car/cache_as_ram.inc b/src/cpu/amd/car/cache_as_ram.inc
index 9874ec47a2..3295ccc3b1 100644
--- a/src/cpu/amd/car/cache_as_ram.inc
+++ b/src/cpu/amd/car/cache_as_ram.inc
@@ -20,7 +20,7 @@
#include <cpu/amd/mtrr.h>
#define CacheSize CONFIG_DCACHE_RAM_SIZE
-#define CacheBase (0xd0000 - CacheSize)
+#define CacheBase CONFIG_DCACHE_RAM_BASE
#define CacheSizeBSPStack CONFIG_DCACHE_BSP_STACK_SIZE
#define CacheSizeBSPSlush CONFIG_DCACHE_BSP_STACK_SLUSH
@@ -496,6 +496,10 @@ CAR_skip_k8_errata_part2:
movl $(CacheBase + CacheSize), %eax
movl %eax, %esp
+ /* Poison the lower stack boundary */
+ movl $((CacheBase + CacheSize) - CacheSizeBSPStack), %eax
+ movl $0xdeadbeef, (%eax)
+
post_code(0xa3)
jmp CAR_FAM10_ap_out
diff --git a/src/cpu/amd/car/post_cache_as_ram.c b/src/cpu/amd/car/post_cache_as_ram.c
index 49b9ee3fe3..26e611c8a8 100644
--- a/src/cpu/amd/car/post_cache_as_ram.c
+++ b/src/cpu/amd/car/post_cache_as_ram.c
@@ -98,6 +98,14 @@ void post_cache_as_ram(void)
void *resume_backup_memory = NULL;
uint32_t family = amd_fam1x_cpu_family();
+ /* Verify that the BSP didn't overrun the lower stack
+ * boundary during romstage execution
+ */
+ volatile uint32_t *lower_stack_boundary;
+ lower_stack_boundary = (void *)((CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE) - CONFIG_DCACHE_BSP_STACK_SIZE);
+ if ((*lower_stack_boundary) != 0xdeadbeef)
+ printk(BIOS_WARNING, "BSP overran lower stack boundary. Undefined behaviour may result!\n");
+
struct romstage_handoff *handoff;
handoff = romstage_handoff_find_or_add();
if (handoff != NULL)