aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/cbmem_console.c
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-12-21 08:55:47 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2015-01-27 22:44:17 +0100
commit8659e4072e19130099ac4a81b204d594a6d3fb7d (patch)
tree0f2dca86b701833e6be89f794ae39ac9c5dee501 /src/lib/cbmem_console.c
parent4d10750d1341f9831547e69d66b57ad512cfd6fb (diff)
downloadcoreboot-8659e4072e19130099ac4a81b204d594a6d3fb7d.tar.gz
coreboot-8659e4072e19130099ac4a81b204d594a6d3fb7d.tar.xz
coreboot-8659e4072e19130099ac4a81b204d594a6d3fb7d.zip
CBMEM console: Fix and enhance pre-RAM support
Use the value of CONSOLE_PRERAM_BUFFER_SIZE to determine if we can do CBMEM console in bootblock and romstage. Kconfig forces it to zero if _BASE is unset or we cannot do CAR migration on x86. Add CBMEM console to bootblock, except for x86. Only one of bootblock and romstage clears the pre-RAM buffer. To start with empty console log on S3 wakeup, ramstage now clears previous contents of CBMEM buffer if there was no pre-RAM buffer. Unify Kconfig variable naming. TODO: ARM configurations do not define PRERAM_BUFFER_BASE values. Change-Id: I70d82da629529dbfd7bc9491223abd703cbc0115 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/7862 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@google.com>
Diffstat (limited to 'src/lib/cbmem_console.c')
-rw-r--r--src/lib/cbmem_console.c80
1 files changed, 45 insertions, 35 deletions
diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c
index a8195a6a3..6783b30da 100644
--- a/src/lib/cbmem_console.c
+++ b/src/lib/cbmem_console.c
@@ -37,6 +37,9 @@ struct cbmem_console {
static struct cbmem_console *cbmem_console_p CAR_GLOBAL;
+static void copy_console_buffer(struct cbmem_console *old_cons_p,
+ struct cbmem_console *new_cons_p);
+
#ifdef __PRE_RAM__
/*
* While running from ROM, before DRAM is initialized, some area in cache as
@@ -63,6 +66,10 @@ extern struct cbmem_console preram_cbmem_console;
static u8 static_console[STATIC_CONSOLE_SIZE];
#endif
+/* flags for init */
+#define CBMEMC_RESET (1<<0)
+#define CBMEMC_APPEND (1<<1)
+
static inline struct cbmem_console *current_console(void)
{
return car_sync_var(cbmem_console_p);
@@ -73,27 +80,46 @@ static inline void current_console_set(struct cbmem_console *new_console_p)
car_set_var(cbmem_console_p, new_console_p);
}
-static inline void init_console_ptr(void *storage, u32 total_space)
+static inline void init_console_ptr(void *storage, u32 total_space, int flags)
{
struct cbmem_console *cbm_cons_p = storage;
- /* Initialize the cache-as-ram pointer and underlying structure. */
- car_set_var(cbmem_console_p, cbm_cons_p);
- cbm_cons_p->buffer_size = total_space - sizeof(struct cbmem_console);
- cbm_cons_p->buffer_cursor = 0;
+ if (!cbm_cons_p) {
+ current_console_set(NULL);
+ return;
+ }
+
+ if (flags & CBMEMC_RESET) {
+ cbm_cons_p->buffer_size = total_space - sizeof(struct cbmem_console);
+ cbm_cons_p->buffer_cursor = 0;
+ }
+ if (flags & CBMEMC_APPEND) {
+ struct cbmem_console *tmp_cons_p = current_console();
+ if (tmp_cons_p)
+ copy_console_buffer(tmp_cons_p, cbm_cons_p);
+ }
+
+ current_console_set(cbm_cons_p);
}
void cbmemc_init(void)
{
#ifdef __PRE_RAM__
+ int flags = CBMEMC_RESET;
+
+ /* Do not clear output from bootblock. */
+ if (ENV_ROMSTAGE && !IS_ENABLED(CONFIG_CACHE_AS_RAM))
+ if (IS_ENABLED(CONFIG_BOOTBLOCK_CONSOLE))
+ flags = 0;
+
init_console_ptr(&preram_cbmem_console,
- CONFIG_CONSOLE_PRERAM_BUFFER_SIZE);
+ CONFIG_CONSOLE_PRERAM_BUFFER_SIZE, flags);
#else
/*
* Initializing before CBMEM is available, use static buffer to store
* the log.
*/
- init_console_ptr(static_console, sizeof(static_console));
+ init_console_ptr(static_console, sizeof(static_console), CBMEMC_RESET);
#endif
}
@@ -119,13 +145,11 @@ void cbmemc_tx_byte(unsigned char data)
* If there is overflow - add to the destination area a string, reporting the
* overflow and the number of dropped characters.
*/
-static void copy_console_buffer(struct cbmem_console *new_cons_p)
+static void copy_console_buffer(struct cbmem_console *old_cons_p,
+ struct cbmem_console *new_cons_p)
{
u32 copy_size, dropped_chars;
u32 cursor = new_cons_p->buffer_cursor;
- struct cbmem_console *old_cons_p;
-
- old_cons_p = current_console();
if (old_cons_p->buffer_cursor < old_cons_p->buffer_size)
copy_size = old_cons_p->buffer_cursor;
@@ -187,35 +211,21 @@ static void copy_console_buffer(struct cbmem_console *new_cons_p)
void cbmemc_reinit(void)
{
struct cbmem_console *cbm_cons_p = NULL;
+ int flags = CBMEMC_APPEND;
-#ifdef __PRE_RAM__
- if (IS_ENABLED(CONFIG_BROKEN_CAR_MIGRATE))
+ if (ENV_ROMSTAGE && (CONFIG_CONSOLE_PRERAM_BUFFER_SIZE == 0))
return;
-#endif
-
-#ifndef __PRE_RAM__
- cbm_cons_p = cbmem_find(CBMEM_ID_CONSOLE);
-#endif
-
- if (!cbm_cons_p) {
- cbm_cons_p = cbmem_add(CBMEM_ID_CONSOLE,
- CONFIG_CONSOLE_CBMEM_BUFFER_SIZE);
-
- if (!cbm_cons_p) {
- current_console_set(NULL);
- return;
- }
- cbm_cons_p->buffer_size = CONFIG_CONSOLE_CBMEM_BUFFER_SIZE -
- sizeof(struct cbmem_console);
+ /* If CBMEM entry already existed, old contents is not altered. */
+ cbm_cons_p = cbmem_add(CBMEM_ID_CONSOLE,
+ CONFIG_CONSOLE_CBMEM_BUFFER_SIZE);
- cbm_cons_p->buffer_cursor = 0;
- }
+ /* Clear old contents of CBMEM buffer. */
+ if (ENV_ROMSTAGE || (CONFIG_CONSOLE_PRERAM_BUFFER_SIZE == 0))
+ flags |= CBMEMC_RESET;
- copy_console_buffer(cbm_cons_p);
-
- current_console_set(cbm_cons_p);
+ init_console_ptr(cbm_cons_p,
+ CONFIG_CONSOLE_CBMEM_BUFFER_SIZE, flags);
}
-
/* Call cbmemc_reinit() at CAR migration time. */
CAR_MIGRATE(cbmemc_reinit)