aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/arch/x86/boot/cbmem.c2
-rw-r--r--src/cpu/intel/haswell/Kconfig1
-rw-r--r--src/cpu/intel/haswell/romstage.c1
-rw-r--r--src/cpu/x86/Kconfig9
-rw-r--r--src/cpu/x86/Makefile.inc2
-rw-r--r--src/include/cpu/x86/car.h2
-rw-r--r--src/include/timestamp.h4
-rw-r--r--src/lib/cbmem_console.c42
-rw-r--r--src/lib/hardwaremain.c2
-rw-r--r--src/lib/timestamp.c5
-rw-r--r--src/lib/usbdebug.c4
-rw-r--r--src/mainboard/emulation/qemu-i440fx/romstage.c5
-rw-r--r--src/mainboard/emulation/qemu-q35/romstage.c5
-rw-r--r--src/mainboard/google/butterfly/romstage.c5
-rw-r--r--src/mainboard/google/link/romstage.c5
-rw-r--r--src/mainboard/google/parrot/romstage.c5
-rw-r--r--src/mainboard/google/stout/romstage.c5
-rw-r--r--src/mainboard/intel/emeraldlake2/romstage.c5
-rw-r--r--src/mainboard/kontron/ktqm77/romstage.c5
-rw-r--r--src/mainboard/lenovo/t60/romstage.c5
-rw-r--r--src/mainboard/lenovo/x60/romstage.c5
-rw-r--r--src/mainboard/samsung/lumpy/romstage.c5
-rw-r--r--src/mainboard/samsung/stumpy/romstage.c5
-rw-r--r--src/mainboard/via/epia-m850/romstage.c1
24 files changed, 14 insertions, 121 deletions
diff --git a/src/arch/x86/boot/cbmem.c b/src/arch/x86/boot/cbmem.c
index 991a3e6f0..58ccbca96 100644
--- a/src/arch/x86/boot/cbmem.c
+++ b/src/arch/x86/boot/cbmem.c
@@ -47,7 +47,7 @@ void __attribute__((weak)) backup_top_of_ram(uint64_t ramtop)
/* This is for compatibility with old boards only. Any new chipset and board
* must implement get_top_of_ram() for both romstage and ramstage to support
- * features like CAR_MIGRATION and CBMEM_CONSOLE.
+ * early features like COLLECT_TIMESTAMPS and CBMEM_CONSOLE.
*/
void set_top_of_ram(uint64_t ramtop)
{
diff --git a/src/cpu/intel/haswell/Kconfig b/src/cpu/intel/haswell/Kconfig
index c352e3686..7b6fc4325 100644
--- a/src/cpu/intel/haswell/Kconfig
+++ b/src/cpu/intel/haswell/Kconfig
@@ -18,7 +18,6 @@ config CPU_SPECIFIC_OPTIONS
#select AP_IN_SIPI_WAIT
select TSC_SYNC_MFENCE
select CPU_INTEL_FIRMWARE_INTERFACE_TABLE
- select CAR_MIGRATION
config BOOTBLOCK_CPU_INIT
string
diff --git a/src/cpu/intel/haswell/romstage.c b/src/cpu/intel/haswell/romstage.c
index e62b894bb..757cc34ee 100644
--- a/src/cpu/intel/haswell/romstage.c
+++ b/src/cpu/intel/haswell/romstage.c
@@ -278,7 +278,6 @@ void romstage_common(const struct romstage_params *params)
#if CONFIG_CHROMEOS
init_chromeos(boot_mode);
#endif
- timestamp_sync();
timestamp_add_now(TS_END_ROMSTAGE);
}
diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig
index c10dd1579..c64a8e477 100644
--- a/src/cpu/x86/Kconfig
+++ b/src/cpu/x86/Kconfig
@@ -115,12 +115,3 @@ config X86_AMD_FIXED_MTRRS
help
This option informs the MTRR code to use the RdMem and WrMem fields
in the fixed MTRR MSRs.
-
-config CAR_MIGRATION
- def_bool n
- depends on DYNAMIC_CBMEM || EARLY_CBMEM_INIT
- help
- Migrate the cache-as-ram variables to CBMEM once CBMEM is set up
- in romstage. This option is only needed if one will be doing more
- work in romstage after the cache-as-ram is torn down aside from
- loading ramstage.
diff --git a/src/cpu/x86/Makefile.inc b/src/cpu/x86/Makefile.inc
index fe8648cc4..311dcc1d1 100644
--- a/src/cpu/x86/Makefile.inc
+++ b/src/cpu/x86/Makefile.inc
@@ -1 +1 @@
-romstage-$(CONFIG_CAR_MIGRATION) += car.c
+romstage-$(CONFIG_CACHE_AS_RAM) += car.c
diff --git a/src/include/cpu/x86/car.h b/src/include/cpu/x86/car.h
index 7b5cedf21..5fc11f9cb 100644
--- a/src/include/cpu/x86/car.h
+++ b/src/include/cpu/x86/car.h
@@ -28,7 +28,7 @@
#define CAR_CBMEM
#endif
-#if CONFIG_CAR_MIGRATION && defined(__PRE_RAM__)
+#if defined(__PRE_RAM__)
#define CAR_MIGRATE_ATTR __attribute__ ((used,section (".car.migrate")))
/* Call migrate_fn_() when CAR globals are migrated. */
diff --git a/src/include/timestamp.h b/src/include/timestamp.h
index 0f5620078..edc0076c1 100644
--- a/src/include/timestamp.h
+++ b/src/include/timestamp.h
@@ -59,13 +59,13 @@ enum timestamp_id {
void timestamp_init(tsc_t base);
void timestamp_add(enum timestamp_id id, tsc_t ts_time);
void timestamp_add_now(enum timestamp_id id);
-void timestamp_sync(void);
+void timestamp_reinit(void);
tsc_t get_initial_timestamp(void);
#else
#define timestamp_init(base)
#define timestamp_add(id, time)
#define timestamp_add_now(id)
-#define timestamp_sync()
+#define timestamp_reinit()
#endif
#endif
diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c
index 819c27f42..881865cec 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 dd9719642..a5993c41d 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 63f17f746..a9c354eb5 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 27097c7c9..39cd138ba 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
diff --git a/src/mainboard/emulation/qemu-i440fx/romstage.c b/src/mainboard/emulation/qemu-i440fx/romstage.c
index 70c720263..db8891ee2 100644
--- a/src/mainboard/emulation/qemu-i440fx/romstage.c
+++ b/src/mainboard/emulation/qemu-i440fx/romstage.c
@@ -51,11 +51,6 @@ void main(unsigned long bist)
cbmem_was_initted = !cbmem_initialize();
timestamp_init(rdtsc());
- timestamp_sync();
timestamp_add_now(TS_START_ROMSTAGE);
-#if CONFIG_CONSOLE_CBMEM
- /* Keep this the last thing this function does. */
- cbmemc_reinit();
-#endif
}
diff --git a/src/mainboard/emulation/qemu-q35/romstage.c b/src/mainboard/emulation/qemu-q35/romstage.c
index abc9474f2..fae5095af 100644
--- a/src/mainboard/emulation/qemu-q35/romstage.c
+++ b/src/mainboard/emulation/qemu-q35/romstage.c
@@ -53,11 +53,6 @@ void main(unsigned long bist)
cbmem_was_initted = !cbmem_initialize();
timestamp_init(rdtsc());
- timestamp_sync();
timestamp_add_now(TS_START_ROMSTAGE);
-#if CONFIG_CONSOLE_CBMEM
- /* Keep this the last thing this function does. */
- cbmemc_reinit();
-#endif
}
diff --git a/src/mainboard/google/butterfly/romstage.c b/src/mainboard/google/butterfly/romstage.c
index 670fc005e..f56884d94 100644
--- a/src/mainboard/google/butterfly/romstage.c
+++ b/src/mainboard/google/butterfly/romstage.c
@@ -273,10 +273,5 @@ void main(unsigned long bist)
#if CONFIG_CHROMEOS
init_chromeos(boot_mode);
#endif
- timestamp_sync();
timestamp_add_now(TS_END_ROMSTAGE);
-#if CONFIG_CONSOLE_CBMEM
- /* Keep this the last thing this function does. */
- cbmemc_reinit();
-#endif
}
diff --git a/src/mainboard/google/link/romstage.c b/src/mainboard/google/link/romstage.c
index aaecfc623..27a22f7d2 100644
--- a/src/mainboard/google/link/romstage.c
+++ b/src/mainboard/google/link/romstage.c
@@ -316,10 +316,5 @@ void main(unsigned long bist)
#if CONFIG_CHROMEOS
init_chromeos(boot_mode);
#endif
- timestamp_sync();
timestamp_add_now(TS_END_ROMSTAGE);
-#if CONFIG_CONSOLE_CBMEM
- /* Keep this the last thing this function does. */
- cbmemc_reinit();
-#endif
}
diff --git a/src/mainboard/google/parrot/romstage.c b/src/mainboard/google/parrot/romstage.c
index 444386f1f..2fe61d644 100644
--- a/src/mainboard/google/parrot/romstage.c
+++ b/src/mainboard/google/parrot/romstage.c
@@ -274,10 +274,5 @@ void main(unsigned long bist)
#if CONFIG_CHROMEOS
init_chromeos(boot_mode);
#endif
- timestamp_sync();
timestamp_add_now(TS_END_ROMSTAGE);
-#if CONFIG_CONSOLE_CBMEM
- /* Keep this the last thing this function does. */
- cbmemc_reinit();
-#endif
}
diff --git a/src/mainboard/google/stout/romstage.c b/src/mainboard/google/stout/romstage.c
index 464ddea89..a0700af2e 100644
--- a/src/mainboard/google/stout/romstage.c
+++ b/src/mainboard/google/stout/romstage.c
@@ -326,10 +326,5 @@ void main(unsigned long bist)
#if CONFIG_CHROMEOS
init_chromeos(boot_mode);
#endif
- timestamp_sync();
timestamp_add_now(TS_END_ROMSTAGE);
-#if CONFIG_CONSOLE_CBMEM
- /* Keep this the last thing this function does. */
- cbmemc_reinit();
-#endif
}
diff --git a/src/mainboard/intel/emeraldlake2/romstage.c b/src/mainboard/intel/emeraldlake2/romstage.c
index 09dc60b23..769111627 100644
--- a/src/mainboard/intel/emeraldlake2/romstage.c
+++ b/src/mainboard/intel/emeraldlake2/romstage.c
@@ -328,10 +328,5 @@ void main(unsigned long bist)
#if CONFIG_CHROMEOS
init_chromeos(boot_mode);
#endif
- timestamp_sync();
timestamp_add_now(TS_END_ROMSTAGE);
-#if CONFIG_CONSOLE_CBMEM
- /* Keep this the last thing this function does. */
- cbmemc_reinit();
-#endif
}
diff --git a/src/mainboard/kontron/ktqm77/romstage.c b/src/mainboard/kontron/ktqm77/romstage.c
index 22fff4201..773079d4e 100644
--- a/src/mainboard/kontron/ktqm77/romstage.c
+++ b/src/mainboard/kontron/ktqm77/romstage.c
@@ -322,10 +322,5 @@ void main(unsigned long bist)
}
#endif
post_code(0x3f);
- timestamp_sync();
timestamp_add_now(TS_END_ROMSTAGE);
-#if CONFIG_CONSOLE_CBMEM
- /* Keep this the last thing this function does. */
- cbmemc_reinit();
-#endif
}
diff --git a/src/mainboard/lenovo/t60/romstage.c b/src/mainboard/lenovo/t60/romstage.c
index 42514e3af..1b7e693d8 100644
--- a/src/mainboard/lenovo/t60/romstage.c
+++ b/src/mainboard/lenovo/t60/romstage.c
@@ -343,11 +343,6 @@ void main(unsigned long bist)
}
#endif
- timestamp_sync();
timestamp_add_now(TS_END_ROMSTAGE);
-#if CONFIG_CONSOLE_CBMEM
- /* Keep this the last thing this function does. */
- cbmemc_reinit();
-#endif
}
diff --git a/src/mainboard/lenovo/x60/romstage.c b/src/mainboard/lenovo/x60/romstage.c
index 97317f8ef..26a7b9b6f 100644
--- a/src/mainboard/lenovo/x60/romstage.c
+++ b/src/mainboard/lenovo/x60/romstage.c
@@ -347,11 +347,6 @@ void main(unsigned long bist)
}
#endif
- timestamp_sync();
timestamp_add_now(TS_END_ROMSTAGE);
-#if CONFIG_CONSOLE_CBMEM
- /* Keep this the last thing this function does. */
- cbmemc_reinit();
-#endif
}
diff --git a/src/mainboard/samsung/lumpy/romstage.c b/src/mainboard/samsung/lumpy/romstage.c
index d7b165b6d..6c87f88fa 100644
--- a/src/mainboard/samsung/lumpy/romstage.c
+++ b/src/mainboard/samsung/lumpy/romstage.c
@@ -347,10 +347,5 @@ void main(unsigned long bist)
#if CONFIG_CHROMEOS
init_chromeos(boot_mode);
#endif
- timestamp_sync();
timestamp_add_now(TS_END_ROMSTAGE);
-#if CONFIG_CONSOLE_CBMEM
- /* Keep this the last thing this function does. */
- cbmemc_reinit();
-#endif
}
diff --git a/src/mainboard/samsung/stumpy/romstage.c b/src/mainboard/samsung/stumpy/romstage.c
index b0ac5a892..ee715e7a9 100644
--- a/src/mainboard/samsung/stumpy/romstage.c
+++ b/src/mainboard/samsung/stumpy/romstage.c
@@ -354,10 +354,5 @@ void main(unsigned long bist)
#if CONFIG_CHROMEOS
init_chromeos(boot_mode);
#endif
- timestamp_sync();
timestamp_add_now(TS_END_ROMSTAGE);
-#if CONFIG_CONSOLE_CBMEM
- /* Keep this the last thing this function does. */
- cbmemc_reinit();
-#endif
}
diff --git a/src/mainboard/via/epia-m850/romstage.c b/src/mainboard/via/epia-m850/romstage.c
index 8bbb1f5cb..473e60e1a 100644
--- a/src/mainboard/via/epia-m850/romstage.c
+++ b/src/mainboard/via/epia-m850/romstage.c
@@ -95,7 +95,6 @@ void main(unsigned long bist)
/* We got RAM working, now we can write the timestamps to RAM */
cbmem_initialize();
- timestamp_sync();
timestamp_add_now(TS_END_ROMSTAGE);
/* FIXME: See if this is needed or take this out please */
/* Disable Memcard and SDIO */