From cbf5bdfe67e90f780b9f5b2f8cb9cd6e0d46682d Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Tue, 10 Sep 2013 00:07:21 +0300 Subject: CBMEM: Always select CAR_MIGRATION MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If romstage does not make cbmem_initialize() call, linker should optimize the code for CAR migration away. This simplifies design of CBMEM console by a considerable amount. As console buffer is now migrated within cbmem_initialize() call there is no longer need for cbmemc_reinit() call made at end of romstage. Change-Id: I8675ecaafb641fa02675e9ba3f374caa8e240f1d Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/3916 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/lib/cbmem_console.c | 42 +++--------------------------------------- src/lib/hardwaremain.c | 2 +- src/lib/timestamp.c | 5 ++++- src/lib/usbdebug.c | 4 +--- 4 files changed, 9 insertions(+), 44 deletions(-) (limited to 'src/lib') diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c index 819c27f42d..881865cec8 100644 --- a/src/lib/cbmem_console.c +++ b/src/lib/cbmem_console.c @@ -45,17 +45,6 @@ static struct cbmem_console *cbmem_console_p CAR_GLOBAL; static struct cbmem_console car_cbmem_console CAR_CBMEM; -/* - * Once DRAM is initialized and the cache as ram mode is disabled, while still - * running from ROM, the console buffer in the cache as RAM area becomes - * unavailable. - * - * By this time the console log buffer is already available in - * CBMEM. The location at 0x600 is used as the redirect pointer allowing to - * find out where the actual console log buffer is. - */ -#define CBMEM_CONSOLE_REDIRECT (*((struct cbmem_console **)0x600)) - #else /* @@ -69,30 +58,12 @@ static u8 static_console[40000]; static inline struct cbmem_console *current_console(void) { -#if CONFIG_CAR_MIGRATION || !defined(__PRE_RAM__) - return car_get_var(cbmem_console_p); -#else - /* - * This check allows to tell if the cache as RAM mode has been exited - * or not. If it has been exited, the real memory is being used - * (resulting in the variable on the stack located below - * DCACHE_RAM_BASE), use the redirect pointer to find out where the - * actual console buffer is. - */ - if ((uintptr_t)__builtin_frame_address(0) < - (uintptr_t)CONFIG_DCACHE_RAM_BASE) - return CBMEM_CONSOLE_REDIRECT; return car_get_var(cbmem_console_p); -#endif /* CONFIG_CAR_MIGRATION */ } static inline void current_console_set(struct cbmem_console *new_console_p) { -#if CONFIG_CAR_MIGRATION || !defined(__PRE_RAM__) car_set_var(cbmem_console_p, new_console_p); -#else - CBMEM_CONSOLE_REDIRECT = new_console_p; -#endif } static inline void init_console_ptr(void *storage, u32 total_space) @@ -193,7 +164,7 @@ static void copy_console_buffer(struct cbmem_console *new_cons_p) new_cons_p->buffer_cursor = cursor; } -static void cbmemc_reinit_(void) +void cbmemc_reinit(void) { struct cbmem_console *cbm_cons_p = NULL; @@ -221,12 +192,5 @@ static void cbmemc_reinit_(void) current_console_set(cbm_cons_p); } -void cbmemc_reinit(void) -{ -#if !CONFIG_CAR_MIGRATION || !defined(__PRE_RAM__) - cbmemc_reinit_(); -#endif -} - -/* Call cbmemc_reinit_() at CAR migration time. */ -CAR_MIGRATE(cbmemc_reinit_) +/* Call cbmemc_reinit() at CAR migration time. */ +CAR_MIGRATE(cbmemc_reinit) diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c index dd9719642e..a5993c41dc 100644 --- a/src/lib/hardwaremain.c +++ b/src/lib/hardwaremain.c @@ -177,7 +177,7 @@ static boot_state_t bs_post_device(void *arg) { timestamp_add_now(TS_DEVICE_DONE); - timestamp_sync(); + timestamp_reinit(); return BS_OS_RESUME_CHECK; } diff --git a/src/lib/timestamp.c b/src/lib/timestamp.c index 63f17f7467..a9c354eb55 100644 --- a/src/lib/timestamp.c +++ b/src/lib/timestamp.c @@ -140,7 +140,7 @@ void timestamp_init(tsc_t base) #endif } -void timestamp_sync(void) +void timestamp_reinit(void) { if (!boot_cpu()) return; @@ -154,3 +154,6 @@ void timestamp_sync(void) if (ts_table) timestamp_do_sync(); } + +/* Call timestamp_reinit at CAR migration time. */ +CAR_MIGRATE(timestamp_reinit) diff --git a/src/lib/usbdebug.c b/src/lib/usbdebug.c index 27097c7c9b..39cd138ba0 100644 --- a/src/lib/usbdebug.c +++ b/src/lib/usbdebug.c @@ -974,7 +974,6 @@ void pci_ehci_read_resources(struct device *dev) } #endif -#if CONFIG_CAR_MIGRATION #if !defined(__PRE_RAM__) && !defined(__SMM__) static int get_usbdebug_from_cbmem(struct ehci_debug_info *info) { @@ -1004,7 +1003,6 @@ static void migrate_ehci_debug(void) } CAR_MIGRATE(migrate_ehci_debug); #endif -#endif /* CONFIG_CAR_MIGRATION */ unsigned long pci_ehci_base_regs(pci_devfn_t sdev) { @@ -1036,7 +1034,7 @@ int usbdebug_init(void) { struct ehci_debug_info *dbg_info = dbgp_ehci_info(); -#if CONFIG_CAR_MIGRATION && !defined(__PRE_RAM__) && !defined(__SMM__) +#if !defined(__PRE_RAM__) && !defined(__SMM__) if (!get_usbdebug_from_cbmem(dbg_info)) return 0; #endif -- cgit v1.2.3