summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kurtz <djkurtz@chromium.org>2018-05-24 17:57:37 -0600
committerMartin Roth <martinroth@google.com>2018-05-25 16:37:28 +0000
commitc6c897280e4997eeb3be0311d01c5e2f26b816cd (patch)
tree3434f8a7000a86cf19502a9654a7fd41948f6856
parentb6fdd224569f3ff0073bfe1ecfd110d9d30ec536 (diff)
downloadcoreboot-c6c897280e4997eeb3be0311d01c5e2f26b816cd.tar.xz
soc/amd/stoneyridge: Increment boot_count on non-S3 boots
Increment the boot_count from romstage when not resuming from S3. BUG=b:80266624 TEST=firmware_EventLog TEST=boot, then: mosys eventlog list | grep boot 1 | 2018-05-24 16:51:42 | System boot | 1 reboot mosys eventlog list | grep boot 1 | 2018-05-24 16:51:42 | System boot | 1 6 | 2018-05-24 16:52:34 | System boot | 2 Change-Id: Ideec9da809e494fb0ea073f648540285972f8238 Signed-off-by: Daniel Kurtz <djkurtz@chromium.org> Reviewed-on: https://review.coreboot.org/26525 Reviewed-by: Martin Roth <martinroth@google.com> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/soc/amd/stoneyridge/romstage.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/soc/amd/stoneyridge/romstage.c b/src/soc/amd/stoneyridge/romstage.c
index 0e019f7a86..179168b867 100644
--- a/src/soc/amd/stoneyridge/romstage.c
+++ b/src/soc/amd/stoneyridge/romstage.c
@@ -28,6 +28,7 @@
#include <chip.h>
#include <program_loading.h>
#include <romstage_handoff.h>
+#include <elog.h>
#include <amdblocks/agesawrapper.h>
#include <amdblocks/agesawrapper_call.h>
#include <soc/northbridge.h>
@@ -94,6 +95,8 @@ asmlinkage void car_stage_entry(void)
msr_t sys_cfg = rdmsr(SYSCFG_MSR);
sys_cfg.lo &= ~SYSCFG_MSR_TOM2WB;
wrmsr(SYSCFG_MSR, sys_cfg);
+ if (IS_ENABLED(CONFIG_ELOG_BOOT_COUNT))
+ boot_count_increment();
} else {
printk(BIOS_INFO, "S3 detected\n");
post_code(0x60);