diff options
| -rw-r--r-- | src/arch/x86/include/bootblock_common.h | 24 | ||||
| -rw-r--r-- | src/arch/x86/init/bootblock_simple.c | 3 | ||||
| -rw-r--r-- | src/console/Kconfig | 18 | ||||
| -rw-r--r-- | src/console/post.c | 18 | ||||
| -rw-r--r-- | src/include/pc80/mc146818rtc.h | 19 |
5 files changed, 82 insertions, 0 deletions
diff --git a/src/arch/x86/include/bootblock_common.h b/src/arch/x86/include/bootblock_common.h index bd1968202f..c9674f4a9c 100644 --- a/src/arch/x86/include/bootblock_common.h +++ b/src/arch/x86/include/bootblock_common.h @@ -34,3 +34,27 @@ static void sanitize_cmos(void) } } #endif + +#if CONFIG_CMOS_POST +#include <pc80/mc146818rtc.h> + +static void cmos_post_init(void) +{ + u8 magic = CMOS_POST_BANK_0_MAGIC; + + /* Switch to the other bank */ + switch (cmos_read(CMOS_POST_BANK_OFFSET)) { + case CMOS_POST_BANK_1_MAGIC: + break; + case CMOS_POST_BANK_0_MAGIC: + magic = CMOS_POST_BANK_1_MAGIC; + break; + default: + /* Initialize to zero */ + cmos_write(0, CMOS_POST_BANK_0_OFFSET); + cmos_write(0, CMOS_POST_BANK_1_OFFSET); + } + + cmos_write(magic, CMOS_POST_BANK_OFFSET); +} +#endif diff --git a/src/arch/x86/init/bootblock_simple.c b/src/arch/x86/init/bootblock_simple.c index 41f73b43b6..fd9ba2289b 100644 --- a/src/arch/x86/init/bootblock_simple.c +++ b/src/arch/x86/init/bootblock_simple.c @@ -10,6 +10,9 @@ static void main(unsigned long bist) #if CONFIG_USE_OPTION_TABLE sanitize_cmos(); #endif +#if CONFIG_CMOS_POST + cmos_post_init(); +#endif } const char* target1 = "fallback/romstage"; diff --git a/src/console/Kconfig b/src/console/Kconfig index f1129a1279..c1c201227f 100644 --- a/src/console/Kconfig +++ b/src/console/Kconfig @@ -373,5 +373,23 @@ config CONSOLE_POST usually displayed using a so-called "POST card" ISA/PCI/PCI-E device) on the debug console. +config CMOS_POST + bool "Store post codes in CMOS for debugging" + depends on !NO_POST + default n + help + If enabled, coreboot will store post codes in CMOS and switch between + two offsets on each boot so the last post code in the previous boot + can be retrieved. This uses 3 bytes of CMOS. + +config CMOS_POST_OFFSET + hex "Offset into CMOS to store POST codes" + depends on CMOS_POST + default 0 + help + If CMOS_POST is enabled then an offset into CMOS must be provided. + If CONFIG_HAVE_OPTION_TABLE is enabled then it will use the value + defined in the mainboard option table. + endmenu diff --git a/src/console/post.c b/src/console/post.c index be2d0e9307..ab1afcf50a 100644 --- a/src/console/post.c +++ b/src/console/post.c @@ -21,6 +21,7 @@ #include <arch/io.h> #include <console/console.h> +#include <pc80/mc146818rtc.h> /* Write POST information */ @@ -38,6 +39,20 @@ void __attribute__((weak)) mainboard_post(uint8_t value) #define mainboard_post(x) #endif +#if CONFIG_CMOS_POST +static void cmos_post_code(u8 value) +{ + switch (cmos_read(CMOS_POST_BANK_OFFSET)) { + case CMOS_POST_BANK_0_MAGIC: + cmos_write(value, CMOS_POST_BANK_0_OFFSET); + break; + case CMOS_POST_BANK_1_MAGIC: + cmos_write(value, CMOS_POST_BANK_1_OFFSET); + break; + } +} +#endif /* CONFIG_CMOS_POST */ + void post_code(uint8_t value) { #if !CONFIG_NO_POST @@ -46,6 +61,9 @@ void post_code(uint8_t value) print_emerg_hex8(value); print_emerg("\n"); #endif +#if CONFIG_CMOS_POST + cmos_post_code(value); +#endif outb(value, CONFIG_POST_PORT); #endif mainboard_post(value); diff --git a/src/include/pc80/mc146818rtc.h b/src/include/pc80/mc146818rtc.h index 61b522ca74..edc3241e42 100644 --- a/src/include/pc80/mc146818rtc.h +++ b/src/include/pc80/mc146818rtc.h @@ -158,4 +158,23 @@ static inline int get_option(void *dest __attribute__((unused)), #endif #define read_option(name, default) read_option_lowlevel(CMOS_VSTART_ ##name, CMOS_VLEN_ ##name, (default)) +#if CONFIG_CMOS_POST +#if CONFIG_USE_OPTION_TABLE +# include "option_table.h" +# define CMOS_POST_OFFSET (CMOS_VSTART_cmos_post_offset >> 3) +#else +# if defined(CONFIG_CMOS_POST_OFFSET) +# define CMOS_POST_OFFSET CONFIG_CMOS_POST_OFFSET +# else +# error "Must define CONFIG_CMOS_POST_OFFSET" +# endif +#endif + +#define CMOS_POST_BANK_OFFSET (CMOS_POST_OFFSET) +#define CMOS_POST_BANK_0_MAGIC 0x80 +#define CMOS_POST_BANK_0_OFFSET (CMOS_POST_OFFSET + 1) +#define CMOS_POST_BANK_1_MAGIC 0x81 +#define CMOS_POST_BANK_1_OFFSET (CMOS_POST_OFFSET + 2) +#endif /* CONFIG_CMOS_POST */ + #endif /* PC80_MC146818RTC_H */ |