soc/amd: move vboot bootblock functions to common folder

Change-Id: I9e9fed26a686b8f90797687dd720902be48dae72
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47975
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>

2 files changed, 55 insertions, 0 deletions

diff --git a/src/soc/amd/common/vboot/Makefile.inc b/src/soc/amd/common/vboot/Makefile.inc
index aff927a5d0..8a6f1162f8 100644
--- a/src/soc/amd/common/vboot/Makefile.inc
+++ b/src/soc/amd/common/vboot/Makefile.inc
@@ -4,3 +4,5 @@ verstage-y += vbnv_cmos.c
 romstage-y += vbnv_cmos.c
 ramstage-y += vbnv_cmos.c
 endif
+
+bootblock-$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK) += vboot_bootblock.c
diff --git a/src/soc/amd/common/vboot/vboot_bootblock.c b/src/soc/amd/common/vboot/vboot_bootblock.c
new file mode 100644
index 0000000000..3fbc4ef608
--- /dev/null
+++ b/src/soc/amd/common/vboot/vboot_bootblock.c
@@ -0,0 +1,53 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <amdblocks/reset.h>
+#include <bl_uapp/bl_syscall_public.h>
+#include <console/console.h>
+#include <pc80/mc146818rtc.h>
+#include <security/vboot/vbnv.h>
+#include <security/vboot/symbols.h>
+#include <soc/psp_transfer.h>
+#include <2struct.h>
+
+void verify_psp_transfer_buf(void)
+{
+	if (*(uint32_t *)_vboot2_work == VB2_SHARED_DATA_MAGIC) {
+		cmos_write(0x00, CMOS_RECOVERY_BYTE);
+		return;
+	}
+
+	/*
+	 * If CMOS is valid and the system has already been rebooted once, but
+	 * still returns here, instead of rebooting to verstage again, assume
+	 * that the system is in a reboot loop and halt.
+	 */
+	if ((!vbnv_cmos_failed()) && cmos_read(CMOS_RECOVERY_BYTE) ==
+			CMOS_RECOVERY_MAGIC_VAL)
+		die("Error: Reboot into recovery was unsuccessful.  Halting.");
+
+	printk(BIOS_ERR, "ERROR: VBOOT workbuf not valid.\n");
+	printk(BIOS_DEBUG, "Signature: %#08x\n", *(uint32_t *)_vboot2_work);
+	cmos_init(0);
+	cmos_write(CMOS_RECOVERY_MAGIC_VAL, CMOS_RECOVERY_BYTE);
+	warm_reset();
+}
+
+void show_psp_transfer_info(void)
+{
+	struct transfer_info_struct *info = (struct transfer_info_struct *)
+			(void *)(uintptr_t)_transfer_buffer;
+
+	if (info->magic_val == TRANSFER_MAGIC_VAL) {
+		if ((info->psp_info & PSP_INFO_VALID) == 0) {
+			printk(BIOS_INFO, "No PSP info found in transfer buffer.\n");
+			return;
+		}
+
+		printk(BIOS_INFO, "PSP boot mode: %s\n",
+				info->psp_info & PSP_INFO_PRODUCTION_MODE ?
+				"Production" : "Development");
+		printk(BIOS_INFO, "Silicon level: %s\n",
+				info->psp_info & PSP_INFO_PRODUCTION_SILICON ?
+				"Production" : "Pre-Production");
+	}
+}