diff options
| author | Timothy Pearson <tpearson@raptorengineeringinc.com> | 2015-05-18 16:04:10 -0500 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2015-12-15 16:41:13 +0100 |
| commit | 44d53428352ff5d6c8941160429735b5465add5f (patch) | |
| tree | 8b902553c7a507fd8ad303e45a19b70b1887eed1 /src/console | |
| parent | a09bb426d4149506c8cc588704cb5d8136f9c3f9 (diff) | |
src/console: Add x86 romstage spinlock option and printk spinlock support
This paves the way for AP printk spinlock on AMD platforms
Change-Id: Ice42a0d3177736bf6e1bc601092e413601866f20
Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
Reviewed-on: https://review.coreboot.org/11958
Tested-by: Raptor Engineering Automated Test Stand <noreply@raptorengineeringinc.com>
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'src/console')
| -rw-r--r-- | src/console/printk.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/console/printk.c b/src/console/printk.c index aab7ff5f67..99f90a8e28 100644 --- a/src/console/printk.c +++ b/src/console/printk.c @@ -2,6 +2,7 @@ * blatantly copied from linux/kernel/printk.c * * Copyright (C) 1991, 1992 Linus Torvalds + * Copyright (C) 2015 Timothy Pearson <tpearson@raptorengineeringinc.com>, Raptor Engineering * */ @@ -13,7 +14,9 @@ #include <stddef.h> #include <trace.h> +#if (!defined(__PRE_RAM__) && IS_ENABLED(CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK)) || !IS_ENABLED(CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK) DECLARE_SPIN_LOCK(console_lock) +#endif void do_putchar(unsigned char byte) { @@ -39,7 +42,13 @@ int do_printk(int msg_level, const char *fmt, ...) #endif DISABLE_TRACE; +#ifdef __PRE_RAM__ +#if IS_ENABLED(CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK) + spin_lock(romstage_console_lock()); +#endif +#else spin_lock(&console_lock); +#endif va_start(args, fmt); i = vtxprintf(wrap_putchar, fmt, args, NULL); @@ -47,7 +56,13 @@ int do_printk(int msg_level, const char *fmt, ...) console_tx_flush(); +#ifdef __PRE_RAM__ +#if IS_ENABLED(CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK) + spin_unlock(romstage_console_lock()); +#endif +#else spin_unlock(&console_lock); +#endif ENABLE_TRACE; return i; |