summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorMarshall Dawson <marshalldawson3rd@gmail.com>2018-01-25 14:10:54 -0700
committerMartin Roth <martinroth@google.com>2018-02-12 17:02:12 +0000
commitbb6c3f59d11d9600c1664286299f9abc60cf1b55 (patch)
treecc761eee6d35f6c1b99546e753e0a95c7bd3f34a /src/soc
parentc2f6da00f458f03dd19ee6256e959da4c26c987f (diff)
soc/amd/common: Call AmdS3FinalRestore
AMD support in coreboot has typically not used the AmdS3FinalRestore() Entry Point. Add a call to it immediately prior to resuming to the OS. BUG=b:69614064 TEST=Check console log for execution Change-Id: Iadc4438d8cda9766002f6edade3c7b00b23b98b4 Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com> Reviewed-on: https://review.coreboot.org/23443 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/amd/common/block/pi/Makefile.inc1
-rw-r--r--src/soc/amd/common/block/pi/amd_resume_final.c25
2 files changed, 26 insertions, 0 deletions
diff --git a/src/soc/amd/common/block/pi/Makefile.inc b/src/soc/amd/common/block/pi/Makefile.inc
index de6bf78b03..f5f1f99ab9 100644
--- a/src/soc/amd/common/block/pi/Makefile.inc
+++ b/src/soc/amd/common/block/pi/Makefile.inc
@@ -10,6 +10,7 @@ romstage-y += heapmanager.c
ramstage-y += agesawrapper.c
ramstage-y += amd_late_init.c
+ramstage-$(CONFIG_HAVE_ACPI_RESUME) += amd_resume_final.c
ramstage-y += def_callouts.c
ramstage-y += heapmanager.c
diff --git a/src/soc/amd/common/block/pi/amd_resume_final.c b/src/soc/amd/common/block/pi/amd_resume_final.c
new file mode 100644
index 0000000000..a2826659d3
--- /dev/null
+++ b/src/soc/amd/common/block/pi/amd_resume_final.c
@@ -0,0 +1,25 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Advanced Micro Devices, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <bootstate.h>
+#include <amdblocks/agesawrapper_call.h>
+
+static void agesawrapper_s3finalrestore(void *unused)
+{
+ do_agesawrapper(agesawrapper_amds3finalrestore, "amds3finalrestore");
+}
+
+BOOT_STATE_INIT_ENTRY(BS_OS_RESUME, BS_ON_ENTRY,
+ agesawrapper_s3finalrestore, NULL);