Patch set updated for coreboot: 04baa2b cbmem: add and use a function to dump console buffer

[Patrick Georgi]

Patrick Georgi ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9984

-gerrit

commit 04baa2bc288911c7782a7d34f973272cb4030ccf
Author: Vadim Bendebury 
Date:   Fri Apr 10 18:04:04 2015 -0700

cbmem: add and use a function to dump console buffer

The new function can be compiled in only when serial console is
    disabled.

When invoked, this function initializes the serial interface and dumps
    the contents of the CBMEM console buffer to serial output.

Some .h files' tweaking was required to ensure proper exposure of
    external declarations of uart_init().

BRANCH=none
    BUG=chromium:475347
    TEST=compiled for different platforms with and without serial console
         enabled. No actual test of this function yet.

Change-Id: Ia8d16649dc9d09798fa6970f2cfd893438e00dc5
    Signed-off-by: Patrick Georgi 
    Original-Commit-Id: a38a8254dd788ad188ba2509b9ae117d6f699579
    Original-Change-Id: Ib85759a2727e31ba1ca21da7e6c346e434f83b52
    Original-Signed-off-by: Vadim Bendebury 
    Original-Reviewed-on: https://chromium-review.googlesource.com/265293
    Original-Reviewed-by: Aaron Durbin 
---
 src/console/Kconfig                           |  9 +++++++++
 src/include/console/cbmem_console.h           |  1 +
 src/lib/cbmem_console.c                       | 17 +++++++++++++++++
 src/vendorcode/google/chromeos/vboot.c        |  2 ++
 src/vendorcode/google/chromeos/vboot_common.c |  2 ++
 5 files changed, 31 insertions(+)

diff --git a/src/console/Kconfig b/src/console/Kconfig
index 2807039..9adab6d 100644
--- a/src/console/Kconfig
+++ b/src/console/Kconfig
@@ -184,6 +184,15 @@ config CONSOLE_CBMEM_BUFFER_SIZE
      value (128K or 0x20000 bytes) is large enough to accommodate
      even the BIOS_SPEW level.

+config CONSOLE_CBMEM_DUMP_TO_UART
+	depends on !CONSOLE_SERIAL
+	bool "Dump CBMEM console on resets"
+	default n
+	help
+	  Enable this to have CBMEM console buffer contents dumped on the
+	  serial output in case serial console is disabled and the device
+	  resets itself while trying to boot the payload
+
 endif

config CONSOLE_QEMU_DEBUGCON
diff --git a/src/include/console/cbmem_console.h b/src/include/console/cbmem_console.h
index 3431459..8f7fcb2 100644
--- a/src/include/console/cbmem_console.h
+++ b/src/include/console/cbmem_console.h
@@ -43,4 +43,5 @@ static inline void __cbmemc_init(void)	{}
 static inline void __cbmemc_tx_byte(u8 data)	{}
 #endif

+void cbmem_dump_console(void);
 #endif
diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c
index 628d3b9..9d292bf 100644
--- a/src/lib/cbmem_console.c
+++ b/src/lib/cbmem_console.c
@@ -19,6 +19,7 @@

#include <console/console.h>
 #include <console/cbmem_console.h>
+#include <console/uart.h>
 #include <cbmem.h>
 #include <arch/early_variables.h>
 #include <symbols.h>
@@ -236,5 +237,21 @@ void cbmemc_reinit(void)
    init_console_ptr(cbm_cons_p, size, flags);
 }

+#if IS_ENABLED(CONFIG_CONSOLE_CBMEM_DUMP_TO_UART)
+void cbmem_dump_console(void)
+{
+	struct cbmem_console *cbm_cons_p;
+	int cursor;
+
+	cbm_cons_p = current_console();
+	if (!cbm_cons_p)
+		return;
+
+	uart_init(0);
+	for (cursor = 0; cursor < cbm_cons_p->buffer_cursor; cursor++)
+		uart_tx_byte(0, cbm_cons_p->buffer_body[cursor]);
+}
+#endif
+
 /* Call cbmemc_reinit() at CAR migration time. */
 CAR_MIGRATE(cbmemc_reinit)
diff --git a/src/vendorcode/google/chromeos/vboot.c b/src/vendorcode/google/chromeos/vboot.c
index 44fe9e3..a151f54 100644
--- a/src/vendorcode/google/chromeos/vboot.c
+++ b/src/vendorcode/google/chromeos/vboot.c
@@ -234,6 +234,8 @@ static void init_vboot(int bootmode)
 #if !MOCK_TPM
    printk(BIOS_ERR, "TPM: Error code 0x%x. Hard reset!\n", result);
    post_code(POST_TPM_FAILURE);
+	if (IS_ENABLED(CONFIG_CONSOLE_CBMEM_DUMP_TO_UART))
+		cbmem_dump_console();
    hard_reset();
 #endif
 }
diff --git a/src/vendorcode/google/chromeos/vboot_common.c b/src/vendorcode/google/chromeos/vboot_common.c
index 3c1a9c3..2e38563 100644
--- a/src/vendorcode/google/chromeos/vboot_common.c
+++ b/src/vendorcode/google/chromeos/vboot_common.c
@@ -129,6 +129,8 @@ void *vboot_get_payload(int *len)

void vboot_reboot(void)
 {
+	if (IS_ENABLED(CONFIG_CONSOLE_CBMEM_DUMP_TO_UART))
+		cbmem_dump_console();
    hard_reset();
    die("failed to reboot");
 }