summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/drivers/elog/elog.c29
-rw-r--r--src/drivers/pc80/rtc/post.c27
-rw-r--r--src/include/console/console.h1
-rw-r--r--src/include/pc80/mc146818rtc.h3
4 files changed, 36 insertions, 24 deletions
diff --git a/src/drivers/elog/elog.c b/src/drivers/elog/elog.c
index c353d59e9f..ca604dde3a 100644
--- a/src/drivers/elog/elog.c
+++ b/src/drivers/elog/elog.c
@@ -748,16 +748,35 @@ static bool elog_do_add_boot_count(void)
#endif
}
+/* Check and log POST codes from previous boot */
+static void log_last_boot_post(void)
+{
+#if CONFIG(ARCH_X86)
+ u8 code;
+ u32 extra;
+
+ if (!CONFIG(CMOS_POST))
+ return;
+
+ if (cmos_post_previous_boot(&code, &extra) == 0)
+ return;
+
+ printk(BIOS_WARNING, "POST: Unexpected post code/extra "
+ "in previous boot: 0x%02x/0x%04x\n", code, extra);
+
+ elog_add_event_word(ELOG_TYPE_LAST_POST_CODE, code);
+ /* Always zero with !CMOS_POST_EXTRA. */
+ if (extra)
+ elog_add_event_dword(ELOG_TYPE_POST_EXTRA, extra);
+#endif
+}
+
static void elog_add_boot_count(void)
{
if (elog_do_add_boot_count()) {
elog_add_event_dword(ELOG_TYPE_BOOT, boot_count_read());
-#if CONFIG(ARCH_X86)
- /* Check and log POST codes from previous boot */
- if (CONFIG(CMOS_POST))
- cmos_post_log();
-#endif
+ log_last_boot_post();
}
}
diff --git a/src/drivers/pc80/rtc/post.c b/src/drivers/pc80/rtc/post.c
index 1ac36305a0..e14367424e 100644
--- a/src/drivers/pc80/rtc/post.c
+++ b/src/drivers/pc80/rtc/post.c
@@ -2,7 +2,6 @@
/* This file is part of the coreboot project. */
#include <stdint.h>
-#include <elog.h>
#include <console/console.h>
#include <device/device.h>
#include <pc80/mc146818rtc.h>
@@ -10,45 +9,41 @@
DECLARE_SPIN_LOCK(cmos_post_lock)
-void cmos_post_log(void)
+int cmos_post_previous_boot(u8 *code, u32 *extra)
{
- u8 code = 0;
- u32 extra = 0;
+ *code = 0;
+ *extra = 0;
spin_lock(&cmos_post_lock);
/* Get post code from other bank */
switch (cmos_read(CMOS_POST_BANK_OFFSET)) {
case CMOS_POST_BANK_0_MAGIC:
- code = cmos_read(CMOS_POST_BANK_1_OFFSET);
+ *code = cmos_read(CMOS_POST_BANK_1_OFFSET);
if (CONFIG(CMOS_POST_EXTRA))
- extra = cmos_read32(CMOS_POST_BANK_1_EXTRA);
+ *extra = cmos_read32(CMOS_POST_BANK_1_EXTRA);
break;
case CMOS_POST_BANK_1_MAGIC:
- code = cmos_read(CMOS_POST_BANK_0_OFFSET);
+ *code = cmos_read(CMOS_POST_BANK_0_OFFSET);
if (CONFIG(CMOS_POST_EXTRA))
- extra = cmos_read32(CMOS_POST_BANK_0_EXTRA);
+ *extra = cmos_read32(CMOS_POST_BANK_0_EXTRA);
break;
}
spin_unlock(&cmos_post_lock);
/* Check last post code in previous boot against normal list */
- switch (code) {
+ switch (*code) {
case POST_OS_BOOT:
case POST_OS_RESUME:
case POST_ENTER_ELF_BOOT:
case 0:
break;
default:
- printk(BIOS_WARNING, "POST: Unexpected post code "
- "in previous boot: 0x%02x\n", code);
-#if CONFIG(ELOG) && (ENV_RAMSTAGE || CONFIG(ELOG_PRERAM))
- elog_add_event_word(ELOG_TYPE_LAST_POST_CODE, code);
- if (CONFIG(CMOS_POST_EXTRA) && extra)
- elog_add_event_dword(ELOG_TYPE_POST_EXTRA, extra);
-#endif
+ return -1;
}
+
+ return 0;
}
void cmos_post_init(void)
diff --git a/src/include/console/console.h b/src/include/console/console.h
index c68caf0e00..f9e9fe24c3 100644
--- a/src/include/console/console.h
+++ b/src/include/console/console.h
@@ -19,6 +19,7 @@
void post_code(u8 value);
void arch_post_code(u8 value);
void cmos_post_code(u8 value);
+int cmos_post_previous_boot(u8 *code, u32 *extra);
#if CONFIG(CMOS_POST_EXTRA)
struct device;
void post_log_path(const struct device *dev);
diff --git a/src/include/pc80/mc146818rtc.h b/src/include/pc80/mc146818rtc.h
index 20e963909b..edaeb1e4b2 100644
--- a/src/include/pc80/mc146818rtc.h
+++ b/src/include/pc80/mc146818rtc.h
@@ -210,9 +210,6 @@ void cmos_set_checksum(int range_start, int range_end, int cks_loc);
#define CMOS_POST_EXTRA_DEV_PATH 0x01
-void cmos_post_log(void);
-#else
-static inline void cmos_post_log(void) {}
#endif /* CONFIG_CMOS_POST */
#endif /* CONFIG_ARCH_X86 */