GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

console: Hide global console_loglevel 

Change-Id: I7bdc468bc3f74516abb2c583bdb5b6d7555d987c
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5333
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
This commit is contained in:
Kyösti Mälkki 2014-02-28 14:37:27 +02:00 committed by Patrick Georgi
parent b2d2596714
commit 56ae13983b
4 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/arch/x86/lib/romcc_console.c
View File

@ -17,18 +17,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdint.h>
#include <console/loglevel.h>
#include <console/post_codes.h>
#include <console/uart.h> #include <console/uart.h>
#include <console/ne2k.h> #include <console/ne2k.h>
/* __PRE_RAM__ */ /* While in romstage, console loglevel is built-time constant. */
/* Using a global varible can cause problems when we reset the stack #define console_log_level(msg_level) (CONFIG_DEFAULT_CONSOLE_LOGLEVEL >= msg_level)
* from cache as ram to ram. If we make this a define USE_SHARED_STACK
* we could use the same code on all architectures.
*/
#define console_loglevel CONFIG_DEFAULT_CONSOLE_LOGLEVEL
#if CONFIG_CONSOLE_SERIAL && CONFIG_DRIVERS_UART_8250IO #if CONFIG_CONSOLE_SERIAL && CONFIG_DRIVERS_UART_8250IO
#include "drivers/uart/util.c" #include "drivers/uart/util.c"
@ -60,7 +53,7 @@ static void __console_tx_nibble(unsigned nibble)
static void __console_tx_char(int loglevel, unsigned char byte) static void __console_tx_char(int loglevel, unsigned char byte)
{ {
if (console_loglevel >= loglevel) { if (console_log_level(loglevel)) {
#if CONFIG_CONSOLE_SERIAL #if CONFIG_CONSOLE_SERIAL
uart_tx_byte(byte); uart_tx_byte(byte);
#endif #endif
@ -73,7 +66,7 @@ static void __console_tx_char(int loglevel, unsigned char byte)
static void __console_tx_hex8(int loglevel, unsigned char value) static void __console_tx_hex8(int loglevel, unsigned char value)
{ {
if (console_loglevel >= loglevel) { if (console_log_level(loglevel)) {
__console_tx_nibble((value >> 4U) & 0x0fU); __console_tx_nibble((value >> 4U) & 0x0fU);
__console_tx_nibble(value & 0x0fU); __console_tx_nibble(value & 0x0fU);
} }
@ -84,7 +77,7 @@ static void __console_tx_hex8(int loglevel, unsigned char value)
static void __console_tx_hex16(int loglevel, unsigned short value) static void __console_tx_hex16(int loglevel, unsigned short value)
{ {
if (console_loglevel >= loglevel) { if (console_log_level(loglevel)) {
__console_tx_nibble((value >> 12U) & 0x0fU); __console_tx_nibble((value >> 12U) & 0x0fU);
__console_tx_nibble((value >> 8U) & 0x0fU); __console_tx_nibble((value >> 8U) & 0x0fU);
__console_tx_nibble((value >> 4U) & 0x0fU); __console_tx_nibble((value >> 4U) & 0x0fU);
@ -97,7 +90,7 @@ static void __console_tx_hex16(int loglevel, unsigned short value)
static void __console_tx_hex32(int loglevel, unsigned int value) static void __console_tx_hex32(int loglevel, unsigned int value)
{ {
if (console_loglevel >= loglevel) { if (console_log_level(loglevel)) {
__console_tx_nibble((value >> 28U) & 0x0fU); __console_tx_nibble((value >> 28U) & 0x0fU);
__console_tx_nibble((value >> 24U) & 0x0fU); __console_tx_nibble((value >> 24U) & 0x0fU);
__console_tx_nibble((value >> 20U) & 0x0fU); __console_tx_nibble((value >> 20U) & 0x0fU);
@ -114,7 +107,7 @@ static void __console_tx_hex32(int loglevel, unsigned int value)
static void __console_tx_string(int loglevel, const char *str) static void __console_tx_string(int loglevel, const char *str)
{ {
if (console_loglevel >= loglevel) { if (console_log_level(loglevel)) {
unsigned char ch; unsigned char ch;
while((ch = *str++) != '\0') { while((ch = *str++) != '\0') {
if (ch == '\n') if (ch == '\n')

10
src/console/init.c
View File

@ -29,8 +29,14 @@
#include <device/pci.h> #include <device/pci.h>
#endif #endif
#if !defined(__PRE_RAM__) #if !defined(__ROMCC__)
int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; /* While in romstage, console loglevel is built-time constant. */
static ROMSTAGE_CONST int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL;
int console_log_level(int msg_level)
{
return (console_loglevel >= msg_level);
}
#endif #endif
void console_init(void) void console_init(void)

3
src/console/printk.c
View File

@ -18,9 +18,8 @@ int do_printk(int msg_level, const char *fmt, ...)
va_list args; va_list args;
int i; int i;
if (msg_level > console_loglevel) { if (!console_log_level(msg_level))
return 0; return 0;
}
#if CONFIG_SQUELCH_EARLY_SMP && defined(__PRE_RAM__) #if CONFIG_SQUELCH_EARLY_SMP && defined(__PRE_RAM__)
if (!boot_cpu()) if (!boot_cpu())

10
src/include/console/console.h
View File

@ -40,18 +40,10 @@ struct console_driver {
/* Defined by the linker... */ /* Defined by the linker... */
extern struct console_driver console_drivers[]; extern struct console_driver console_drivers[];
extern struct console_driver econsole_drivers[]; extern struct console_driver econsole_drivers[];
extern int console_loglevel;
#else
/* __PRE_RAM__ */
/* Using a global variable can cause problems when we reset the stack
* from cache as ram to ram. If we make this a define USE_SHARED_STACK
* we could use the same code on all architectures.
*/
#define console_loglevel CONFIG_DEFAULT_CONSOLE_LOGLEVEL
#endif #endif
#ifndef __ROMCC__ #ifndef __ROMCC__
int console_log_level(int msg_level);
void console_init(void); void console_init(void);
void console_hw_init(void); void console_hw_init(void);
void console_tx_byte(unsigned char byte); void console_tx_byte(unsigned char byte);