diff options
| -rw-r--r-- | src/Kconfig | 16 | ||||
| -rw-r--r-- | src/arch/x86/include/arch/smp/spinlock.h | 26 | ||||
| -rw-r--r-- | src/console/printk.c | 14 |
3 files changed, 6 insertions, 50 deletions
diff --git a/src/Kconfig b/src/Kconfig index ba9ae86067..8df5323cf6 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -527,22 +527,6 @@ config RESUME_PATH_SAME_AS_BOOT same path as a regular boot. e.g. an x86 system runs from the reset vector at 0xfffffff0 on both resume and warm/cold boot. -config HAVE_ROMSTAGE_CONSOLE_SPINLOCK - bool - default n - -config HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK - bool - default n - help - This should be enabled on certain plaforms, such as the AMD - SR565x, that cannot handle concurrent CBFS accesses from - multiple APs during early startup. - -config HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK - bool - default n - config NO_MONOTONIC_TIMER def_bool n diff --git a/src/arch/x86/include/arch/smp/spinlock.h b/src/arch/x86/include/arch/smp/spinlock.h index f9186787af..8bdb125223 100644 --- a/src/arch/x86/include/arch/smp/spinlock.h +++ b/src/arch/x86/include/arch/smp/spinlock.h @@ -14,11 +14,6 @@ #ifndef ARCH_SMP_SPINLOCK_H #define ARCH_SMP_SPINLOCK_H -#if !defined(__PRE_RAM__) \ - || CONFIG(HAVE_ROMSTAGE_CONSOLE_SPINLOCK) \ - || CONFIG(HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK) \ - || CONFIG(HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK) - /* * Your basic SMP spinlocks, allowing only a single CPU anywhere */ @@ -27,23 +22,14 @@ typedef struct { volatile unsigned int lock; } spinlock_t; -#ifdef __PRE_RAM__ -spinlock_t *romstage_console_lock(void); -void initialize_romstage_console_lock(void); -spinlock_t *romstage_nvram_cbfs_lock(void); -void initialize_romstage_nvram_cbfs_lock(void); -spinlock_t *romstage_microcode_cbfs_lock(void); -void initialize_romstage_microcode_cbfs_lock(void); -#endif - #define SPIN_LOCK_UNLOCKED { 1 } -#ifndef __PRE_RAM__ +#define STAGE_HAS_SPINLOCKS !ENV_ROMSTAGE_OR_BEFORE + +#if STAGE_HAS_SPINLOCKS + #define DECLARE_SPIN_LOCK(x) \ static spinlock_t x = SPIN_LOCK_UNLOCKED; -#else -#define DECLARE_SPIN_LOCK(x) -#endif /* * Simple spin lock operations. There are two variants, one clears IRQ's @@ -93,7 +79,7 @@ static __always_inline void cpu_relax(void) __asm__ __volatile__("rep;nop" : : : "memory"); } -#else /* !__PRE_RAM__ */ +#else #define DECLARE_SPIN_LOCK(x) #define barrier() do {} while (0) @@ -103,6 +89,6 @@ static __always_inline void cpu_relax(void) #define spin_unlock(lock) do {} while (0) #define cpu_relax() do {} while (0) -#endif /* !__PRE_RAM__ */ +#endif #endif /* ARCH_SMP_SPINLOCK_H */ diff --git a/src/console/printk.c b/src/console/printk.c index 4f9f547bc5..fd590fa6f7 100644 --- a/src/console/printk.c +++ b/src/console/printk.c @@ -23,9 +23,7 @@ #include <trace.h> #include <timer.h> -#if (!defined(__PRE_RAM__) && CONFIG(HAVE_ROMSTAGE_CONSOLE_SPINLOCK)) || !CONFIG(HAVE_ROMSTAGE_CONSOLE_SPINLOCK) DECLARE_SPIN_LOCK(console_lock) -#endif #define TRACK_CONSOLE_TIME (CONFIG(HAVE_MONOTONIC_TIMER) && \ (ENV_RAMSTAGE || !CONFIG(CAR_GLOBAL_MIGRATION))) @@ -95,13 +93,7 @@ int do_vprintk(int msg_level, const char *fmt, va_list args) return 0; DISABLE_TRACE; -#ifdef __PRE_RAM__ -#if CONFIG(HAVE_ROMSTAGE_CONSOLE_SPINLOCK) - spin_lock(romstage_console_lock()); -#endif -#else spin_lock(&console_lock); -#endif console_time_run(); @@ -114,13 +106,7 @@ int do_vprintk(int msg_level, const char *fmt, va_list args) console_time_stop(); -#ifdef __PRE_RAM__ -#if CONFIG(HAVE_ROMSTAGE_CONSOLE_SPINLOCK) - spin_unlock(romstage_console_lock()); -#endif -#else spin_unlock(&console_lock); -#endif ENABLE_TRACE; return i; |