diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/lib/cbmem_common.c | 16 | ||||
| -rw-r--r-- | src/lib/cbmem_console.c | 6 | ||||
| -rw-r--r-- | src/lib/hardwaremain.c | 8 | ||||
| -rw-r--r-- | src/lib/imd_cbmem.c | 9 | ||||
| -rw-r--r-- | src/lib/prog_loaders.c | 3 | ||||
| -rw-r--r-- | src/lib/timestamp.c | 22 |
7 files changed, 16 insertions, 52 deletions
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index e988e89cd6..2fd4e4ca0c 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -43,9 +43,7 @@ bootblock-$(CONFIG_GENERIC_GPIO_LIB) += gpio.c bootblock-y += libgcc.c bootblock-$(CONFIG_GENERIC_UDELAY) += timer.c -ifeq ($(CONFIG_EARLY_CBMEM_INIT),y) bootblock-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c -endif bootblock-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c bootblock-y += delay.c @@ -97,10 +95,8 @@ ramstage-y += romstage_stack.c romstage-y += stack.c ramstage-y += rtc.c -ifeq ($(CONFIG_EARLY_CBMEM_INIT),y) romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c romstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c -endif romstage-y += compute_ip_checksum.c ifeq ($(CONFIG_COMPILER_GCC),y) diff --git a/src/lib/cbmem_common.c b/src/lib/cbmem_common.c index e3bec17bd6..ba4660920d 100644 --- a/src/lib/cbmem_common.c +++ b/src/lib/cbmem_common.c @@ -17,9 +17,6 @@ #include <bootstate.h> #include <rules.h> #include <symbols.h> -#if IS_ENABLED(CONFIG_ARCH_X86) && !IS_ENABLED(CONFIG_EARLY_CBMEM_INIT) -#include <arch/acpi.h> -#endif void cbmem_run_init_hooks(int is_recovery) { @@ -40,16 +37,3 @@ void cbmem_run_init_hooks(int is_recovery) void __weak cbmem_fail_resume(void) { } - -#if ENV_RAMSTAGE && !IS_ENABLED(CONFIG_EARLY_CBMEM_INIT) -static void init_cbmem_post_device(void *unused) -{ - if (acpi_is_wakeup()) - cbmem_initialize(); - else - cbmem_initialize_empty(); -} - -BOOT_STATE_INIT_ENTRY(BS_POST_DEVICE, BS_ON_ENTRY, - init_cbmem_post_device, NULL); -#endif diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c index 709752bb23..2f60fb5a7f 100644 --- a/src/lib/cbmem_console.c +++ b/src/lib/cbmem_console.c @@ -63,17 +63,13 @@ static struct cbmem_console *cbmem_console_p CAR_GLOBAL; #else /* - * When running from RAM, a lot of console output is generated before CBMEM is + * When running from RAM, some console output is generated before CBMEM is * reinitialized. This static buffer is used to store that output temporarily, * to be concatenated with the CBMEM console buffer contents accumulated * during the ROM stage, once CBMEM becomes available at RAM stage. */ -#if IS_ENABLED(CONFIG_EARLY_CBMEM_INIT) #define STATIC_CONSOLE_SIZE 1024 -#else -#define STATIC_CONSOLE_SIZE CONFIG_CONSOLE_CBMEM_BUFFER_SIZE -#endif static u8 static_console[STATIC_CONSOLE_SIZE]; #endif diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c index e6cf67f064..e4d5aec990 100644 --- a/src/lib/hardwaremain.c +++ b/src/lib/hardwaremain.c @@ -458,12 +458,10 @@ void main(void) post_code(POST_CONSOLE_READY); /* - * CBMEM needs to be recovered in the EARLY_CBMEM_INIT case because - * timestamps, APCI, etc rely on the cbmem infrastructure being - * around. Explicitly recover it. + * CBMEM needs to be recovered because timestamps, APCI, etc rely on + * the cbmem infrastructure being around. Explicitly recover it. */ - if (IS_ENABLED(CONFIG_EARLY_CBMEM_INIT)) - cbmem_initialize(); + cbmem_initialize(); /* Record current time, try to locate timestamps in CBMEM. */ timestamp_init(timestamp_get()); diff --git a/src/lib/imd_cbmem.c b/src/lib/imd_cbmem.c index a7a513f05c..d6eed28860 100644 --- a/src/lib/imd_cbmem.c +++ b/src/lib/imd_cbmem.c @@ -64,7 +64,7 @@ static inline const struct imd_entry *cbmem_to_imd(const struct cbmem_entry *e) } /* These are the different situations to handle: - * CONFIG_EARLY_CBMEM_INIT: + * * In ramstage cbmem_initialize() attempts a recovery of the * cbmem region set up by romstage. It uses cbmem_top() as the * starting point of recovery. @@ -116,11 +116,8 @@ void __weak cbmem_top_init(void) static void cbmem_top_init_once(void) { /* Call one-time hook on expected cbmem init during boot. This sequence - assumes first init call is in romstage for early cbmem init and - ramstage for late cbmem init. */ - if (IS_ENABLED(CONFIG_EARLY_CBMEM_INIT) && !ENV_ROMSTAGE) - return; - if (IS_ENABLED(CONFIG_LATE_CBMEM_INIT) && !ENV_RAMSTAGE) + assumes first init call is in romstage. */ + if (!ENV_ROMSTAGE) return; cbmem_top_init(); diff --git a/src/lib/prog_loaders.c b/src/lib/prog_loaders.c index a9c9addbc6..b7634177ff 100644 --- a/src/lib/prog_loaders.c +++ b/src/lib/prog_loaders.c @@ -136,8 +136,7 @@ void run_ramstage(void) * firmware path on resume. */ if (IS_ENABLED(CONFIG_ARCH_X86) && - !IS_ENABLED(CONFIG_NO_STAGE_CACHE) && - IS_ENABLED(CONFIG_EARLY_CBMEM_INIT)) + !IS_ENABLED(CONFIG_NO_STAGE_CACHE)) run_ramstage_from_resume(&ramstage); if (prog_locate(&ramstage)) diff --git a/src/lib/timestamp.c b/src/lib/timestamp.c index 105b6961ff..36d02516a3 100644 --- a/src/lib/timestamp.c +++ b/src/lib/timestamp.c @@ -218,10 +218,10 @@ void timestamp_init(uint64_t base) return; } - /* In the EARLY_CBMEM_INIT case timestamps could have already been - * recovered. In those circumstances honor the cache which sits in BSS + /* Timestamps could have already been recovered. + * In those circumstances honor the cache which sits in BSS * as it has already been initialized. */ - if (ENV_RAMSTAGE && IS_ENABLED(CONFIG_EARLY_CBMEM_INIT) && + if (ENV_RAMSTAGE && ts_cache->cache_state != TIMESTAMP_CACHE_UNINITIALIZED) return; @@ -271,10 +271,10 @@ static void timestamp_sync_cache_to_cbmem(int is_recovery) /* * There's no need to worry about the base_time fields being out of - * sync because only the following configurations are used/supported: + * sync because only the following configuration is used/supported: * - * 1. Timestamps get initialized before ramstage, which implies - * CONFIG_EARLY_CBMEM_INIT and CBMEM initialization in romstage. + * Timestamps get initialized before ramstage, which implies + * CBMEM initialization in romstage. * This requires the board to define a TIMESTAMP() region in its * memlayout.ld (default on x86). The base_time from timestamp_init() * (usually called from bootblock.c on most non-x86 boards) persists @@ -283,18 +283,12 @@ static void timestamp_sync_cache_to_cbmem(int is_recovery) * sync, which will adjust the timestamps in there to the correct * base_time (from CBMEM) with the timestamp_add_table_entry() below. * - * 2. Timestamps only get initialized in ramstage *and* - * CONFIG_LATE_CBMEM_INIT is set. main() will call timestamp_init() - * very early (before any timestamps get logged) to set a base_time - * in the BSS cache, which will later get synced over to CBMEM. - * * If you try to initialize timestamps before ramstage but don't define * a TIMESTAMP region, all operations will fail (safely), and coreboot * will behave as if timestamps only get initialized in ramstage. * - * If CONFIG_EARLY_CBMEM_INIT is set but timestamps only get - * initialized in ramstage, the base_time from timestamp_init() will - * get ignored and all timestamps will be 0-based. + * If timestamps only get initialized in ramstage, the base_time from + * timestamp_init() will get ignored and all timestamps will be 0-based. */ for (i = 0; i < ts_cache_table->num_entries; i++) { struct timestamp_entry *tse = &ts_cache_table->entries[i]; |