diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2015-05-26 06:46:41 +0300 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2015-05-26 19:10:39 +0200 |
| commit | 1de648e272a7da523f05ca9d19226a308c1af852 (patch) | |
| tree | 9a15709c31165ea8e7ae0b5c963345f4bc5b7f94 | |
| parent | e03441753ca775df4aacd0a15046d15001fed66e (diff) | |
| download | coreboot-1de648e272a7da523f05ca9d19226a308c1af852.tar.xz | |
CBMEM console: Fix buffer without EARLY_CBMEM_INIT
On S3 resume, CBMEM_ID_CONSOLE from previous boot is found in ramstage,
even when romstage did not create it. So buffer did not get cleared
on S3 resume path.
Also do not allocate for preram_cbmem_console in CAR when there
are no means to back it up to ram.
Change-Id: I175cebbb938adf2a7414703fefffb8da796e9fa9
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/10301
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins)
| -rw-r--r-- | src/arch/x86/init/romstage.ld | 2 | ||||
| -rw-r--r-- | src/lib/cbmem_console.c | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/arch/x86/init/romstage.ld b/src/arch/x86/init/romstage.ld index 27e8de1c5c..ae7049b423 100644 --- a/src/arch/x86/init/romstage.ld +++ b/src/arch/x86/init/romstage.ld @@ -65,7 +65,7 @@ SECTIONS * statically checked because the cache-as-ram region usage is * cpu/chipset dependent. */ _preram_cbmem_console = .; - _epreram_cbmem_console = . + 0xc00; + _epreram_cbmem_console = . + (CONFIG_LATE_CBMEM_INIT ? 0 : 0xc00); } /* Global variables are not allowed in romstage diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c index 30bf439511..e9607f3a35 100644 --- a/src/lib/cbmem_console.c +++ b/src/lib/cbmem_console.c @@ -225,11 +225,8 @@ void cbmemc_reinit(void) /* Need to reset the newly added cbmem console in ramstage * when there was no console in preram environment. */ - if (ENV_RAMSTAGE) { - cbm_cons_p = cbmem_find(CBMEM_ID_CONSOLE); - if (cbm_cons_p == NULL) - flags |= CBMEMC_RESET; - } + if (ENV_RAMSTAGE && IS_ENABLED(CONFIG_LATE_CBMEM_INIT)) + flags |= CBMEMC_RESET; /* If CBMEM entry already existed, old contents is not altered. */ cbm_cons_p = cbmem_add(CBMEM_ID_CONSOLE, size); |