Change in coreboot[master]: WIP vc/amd/pi/00670F00: Reintroduce FCH restore functions

[Marshall Dawson (Code Review)]

Marshall Dawson has uploaded this change for review. ( https://review.coreboot.org/22729

Change subject: WIP vc/amd/pi/00670F00: Reintroduce FCH restore functions
......................................................................

WIP vc/amd/pi/00670F00: Reintroduce FCH restore functions

Recover the source that had been stripped out when S3 wasn't
supported.

Change-Id: I08c028eadd55ac014fafdd2be71a4b9ce5598119
Signed-off-by: Marshall Dawson 
---
M src/soc/amd/common/agesawrapper.h
M src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c
2 files changed, 33 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/22729/1

diff --git a/src/soc/amd/common/agesawrapper.h b/src/soc/amd/common/agesawrapper.h
index a9ba3e6..a6983ad 100644
--- a/src/soc/amd/common/agesawrapper.h
+++ b/src/soc/amd/common/agesawrapper.h
@@ -52,6 +52,9 @@
 VOID amd_initcpuio(void);
 const void *agesawrapper_locate_module(const CHAR8 name[8]);

+VOID FchInitS3EarlyRestore(IN FCH_DATA_BLOCK *FchDataPtr);
+VOID FchInitS3LateRestore(IN FCH_DATA_BLOCK *FchDataPtr);
+
 void OemPostParams(AMD_POST_PARAMS *PostParams);
 void SetMemParams(AMD_POST_PARAMS *PostParams);

diff --git a/src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c b/src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c
index ec414b4..bf74df2 100644
--- a/src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c
+++ b/src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c
@@ -367,3 +367,33 @@
    Dispatcher = module->ModuleDispatcher;
    return Dispatcher(AmdGetDataEye);
 }
+
+/**********************************************************************
+ * FCH Functions
+ **********************************************************************/
+
+VOID
+FchInitS3EarlyRestore (
+  IN      FCH_DATA_BLOCK     *FchDataPtr
+  )
+{
+	MODULE_ENTRY Dispatcher = NULL;
+	const AMD_MODULE_HEADER* module = agesawrapper_locate_module(ModuleIdentifier);
+	FchDataPtr->StdHeader->Func = FCH_INIT_S3_EARLY_RESTORE;
+	if (!module) return;
+	Dispatcher = module->ModuleDispatcher;
+	Dispatcher(FchDataPtr);
+}
+
+VOID
+FchInitS3LateRestore (
+  IN      FCH_DATA_BLOCK     *FchDataPtr
+  )
+{
+	MODULE_ENTRY Dispatcher = NULL;
+	const AMD_MODULE_HEADER* module = agesawrapper_locate_module(ModuleIdentifier);
+	FchDataPtr->StdHeader->Func = FCH_INIT_S3_LATE_RESTORE;
+	if (!module) return;
+	Dispatcher = module->ModuleDispatcher;
+	Dispatcher(FchDataPtr);
+}