From 890b91ce9c71f4bf565f7738a608b438a419f41c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Sat, 18 Jun 2016 17:55:08 +0300
Subject: [PATCH] UPSTREAM: AMD binaryPI: Use common romstage ram stack

Note that no binaryPI board has HAVE_ACPI_RESUME.

Change-Id: I52d0bd7dac86822242400f68f6dc202f02d6e0f1
Signed-off-by: Kysti Mlkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/15575
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/361214
Commit-Ready: Furquan Shaikh <furquan@chromium.org>
Tested-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
---
 src/cpu/amd/pi/s3_resume.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/cpu/amd/pi/s3_resume.c b/src/cpu/amd/pi/s3_resume.c
index 830d1742d3..6426c979b8 100644
--- a/src/cpu/amd/pi/s3_resume.c
+++ b/src/cpu/amd/pi/s3_resume.c
@@ -25,6 +25,7 @@
 #include <device/device.h>
 #include <arch/io.h>
 #include <arch/acpi.h>
+#include <program_loading.h>
 #include <string.h>
 #include "Porting.h"
 #include <northbridge/amd/pi/BiosCallOuts.h>
@@ -137,12 +138,13 @@ void restore_mtrr(void)
 #ifdef __PRE_RAM__
 static void move_stack_high_mem(void)
 {
-	void *high_stack = cbmem_find(CBMEM_ID_ROMSTAGE_RAM_STACK);
-	if (high_stack == NULL)
+	uintptr_t high_stack = romstage_ram_stack_base(HIGH_ROMSTAGE_STACK_SIZE,
+		ROMSTAGE_STACK_CBMEM);
+	if (!high_stack)
 		halt();
 
 	/* TODO: Make the switch with empty stack instead. */
-	memcpy(high_stack, (void *)BSP_STACK_BASE_ADDR, HIGH_ROMSTAGE_STACK_SIZE);
+	memcpy((void*)high_stack, (void *)BSP_STACK_BASE_ADDR, HIGH_ROMSTAGE_STACK_SIZE);
 
 #ifdef __x86_64__
 	__asm__