sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CBMEM: Replace cbmem_initialize() with cbmem_recovery()

Browse Source 
The replacement function confirms CBMEM TOC is wiped clean on power
cycles and resets. It also introduces compatibility interface to ease
up transition to DYNAMIC_CBMEM.

Change-Id: Ic5445c5bff4aff22a43821f3064f2df458b9f250
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/4668
Reviewed-by: Aaron Durbin <adurbin@google.com>
Tested-by: build bot (Jenkins)
This commit is contained in:
Kyösti Mälkki
2014-01-06 17:20:31 +02:00
parent 97e1b11f41
commit 2d8520b275
25 changed files with 70 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/lib/cbmem.c
View File

@@ -95,8 +95,7 @@ void cbmem_late_set_table(uint64_t base, uint64_t size)
* - suspend/resume backup memory
*/
#if CONFIG_EARLY_CBMEM_INIT || !defined(__PRE_RAM__)
static void cbmem_init(void)
static void cbmem_initialize_empty(void)
{
uint64_t baseaddr, size;
struct cbmem_entry *cbmem_toc;
@@ -119,7 +118,6 @@ static void cbmem_init(void)
.size = size - CBMEM_TOC_RESERVED
};
}
#endif
int cbmem_reinit(void)
{
@@ -219,32 +217,44 @@ void *cbmem_find(u32 id)
return (void *)NULL;
}
#if CONFIG_EARLY_CBMEM_INIT || !defined(__PRE_RAM__)
/* Returns True if it was not initialized before. */
int cbmem_initialize(void)
int cbmem_recovery(int is_wakeup)
{
int rv = 0;
int found = cbmem_reinit();
int wipe = 0;
/* We expect the romstage to always initialize it. */
if (!cbmem_reinit()) {
cbmem_init();
/* CBMEM TOC is wiped clean when we are not waking up from S3
* suspend. Boards with EARLY_CBMEM_INIT do this in romstage,
* boards without EARLY_CBMEM_INIT do this in ramstage.
*/
#if defined(__PRE_RAM__) && CONFIG_EARLY_CBMEM_INIT
wipe = 1;
#endif
#if !defined(__PRE_RAM__) && !CONFIG_EARLY_CBMEM_INIT
wipe = 1;
#endif
if (!is_wakeup && wipe)
cbmem_initialize_empty();
if (is_wakeup && !found) {
cbmem_initialize_empty();
cbmem_fail_resume();
rv = 1;
}
#ifndef __PRE_RAM__
cbmem_arch_init();
#endif
/* Migrate cache-as-ram variables. */
car_migrate_variables();
return rv;
cbmem_arch_init();
car_migrate_variables();
return !found;
}
#endif
#ifndef __PRE_RAM__
static void init_cbmem_post_device(void *unused)
{
cbmem_initialize();
#if CONFIG_HAVE_ACPI_RESUME
cbmem_recovery(acpi_is_wakeup());
#else
cbmem_recovery(0);
#endif
#if CONFIG_CONSOLE_CBMEM
cbmemc_reinit();
#endif

10
src/lib/dynamic_cbmem.c
View File

@@ -256,6 +256,16 @@ int cbmem_initialize(void)
return 0;
}
int cbmem_recovery(int is_wakeup)
{
int rv = 0;
if (!is_wakeup)
cbmem_initialize_empty();
else
rv = cbmem_initialize();
return rv;
}
static void *cbmem_base(void)
{
struct cbmem_root *root;