summaryrefslogtreecommitdiff
path: root/src/soc/amd
diff options
context:
space:
mode:
authorMartin Roth <martinroth@chromium.org>2020-10-02 14:51:40 -0600
committerEdward O'Callaghan <quasisec@chromium.org>2020-10-08 01:05:55 +0000
commitfc33235f82a08e9ec9a0fcff0f7cba8eda1ac251 (patch)
tree437862e278d3f82d2b9f32016027b181cd0f4627 /src/soc/amd
parenteb7fc4aead52d35cde6f14e0e1441e1aae2d222f (diff)
downloadcoreboot-fc33235f82a08e9ec9a0fcff0f7cba8eda1ac251.tar.xz
soc/amd/picasso: Die if the workbuf is missing two boots in a row
BUG=b:169199392 TEST=Corrupt vboot signature to force an error, see that the system halts instead of rebooting forever. BRANCH=Zork Signed-off-by: Martin Roth <martinroth@chromium.org> Change-Id: I949f94e78d25720f6cd7e81de8d030084e267f29 Reviewed-on: https://review.coreboot.org/c/coreboot/+/45964 Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com> Reviewed-by: Edward O'Callaghan <quasisec@chromium.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/amd')
-rw-r--r--src/soc/amd/picasso/Makefile.inc1
-rw-r--r--src/soc/amd/picasso/bootblock/bootblock.c12
2 files changed, 11 insertions, 2 deletions
diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc
index 1e9ba4a124..9c5d4d08c1 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -22,6 +22,7 @@ bootblock-y += tsc_freq.c
bootblock-y += gpio.c
bootblock-y += smi_util.c
bootblock-y += config.c
+bootblock-y += pmutil.c
bootblock-y += reset.c
romstage-y += i2c.c
diff --git a/src/soc/amd/picasso/bootblock/bootblock.c b/src/soc/amd/picasso/bootblock/bootblock.c
index 470002789f..a450544b0d 100644
--- a/src/soc/amd/picasso/bootblock/bootblock.c
+++ b/src/soc/amd/picasso/bootblock/bootblock.c
@@ -17,6 +17,7 @@
#include <amdblocks/amd_pci_mmconf.h>
#include <acpi/acpi.h>
#include <security/vboot/symbols.h>
+#include <security/vboot/vbnv.h>
/* vboot includes directory may not be in include path if vboot is not enabled */
#if CONFIG(VBOOT_STARTS_BEFORE_BOOTBLOCK)
@@ -134,10 +135,17 @@ void bootblock_soc_init(void)
#if CONFIG(VBOOT_STARTS_BEFORE_BOOTBLOCK)
if (*(uint32_t *)_vboot2_work != VB2_SHARED_DATA_MAGIC) {
- printk(BIOS_ERR, "ERROR: VBOOT workbuf not valid.\n");
+ /*
+ * If 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, so halt instead.
+ */
+ 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();