ab0bcaf732
CB:55356 removed static inline declarations from get_log_level(). This commit puts them back. It also changes the method of accessing static symbols in tests/console/routing-test to source file inclusion like in CB:46458 to avoid changing tested source file. Signed-off-by: Jakub Czapiga <jacz@semihalf.com> Change-Id: Iaa5dcbccb327f819374967be51ef642b1fb25e7b Reviewed-on: https://review.coreboot.org/c/coreboot/+/55473 Reviewed-by: Patrick Georgi <pgeorgi@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
65 lines
1.3 KiB
C
65 lines
1.3 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
|
|
#include <commonlib/helpers.h>
|
|
#include <console/console.h>
|
|
#include <console/uart.h>
|
|
#include <console/streams.h>
|
|
#include <device/pci.h>
|
|
#include <option.h>
|
|
#include <version.h>
|
|
|
|
#define FIRST_CONSOLE (ENV_BOOTBLOCK || (CONFIG(NO_BOOTBLOCK_CONSOLE) && ENV_ROMSTAGE))
|
|
|
|
static int console_inited;
|
|
static int console_loglevel;
|
|
|
|
static inline int get_log_level(void)
|
|
{
|
|
if (console_inited == 0)
|
|
return -1;
|
|
|
|
return console_loglevel;
|
|
}
|
|
|
|
static void init_log_level(void)
|
|
{
|
|
console_loglevel = get_console_loglevel();
|
|
|
|
if (!FIRST_CONSOLE)
|
|
console_loglevel = get_uint_option("debug_level", console_loglevel);
|
|
}
|
|
|
|
int console_log_level(int msg_level)
|
|
{
|
|
int log_level = get_log_level();
|
|
|
|
if (log_level < 0)
|
|
return CONSOLE_LOG_NONE;
|
|
|
|
if (msg_level <= log_level)
|
|
return CONSOLE_LOG_ALL;
|
|
|
|
if (CONFIG(CONSOLE_CBMEM) && (msg_level <= BIOS_DEBUG))
|
|
return CONSOLE_LOG_FAST;
|
|
|
|
return 0;
|
|
}
|
|
|
|
asmlinkage void console_init(void)
|
|
{
|
|
init_log_level();
|
|
|
|
if (CONFIG(DEBUG_CONSOLE_INIT))
|
|
console_inited = 1;
|
|
|
|
if (CONFIG(EARLY_PCI_BRIDGE) && (ENV_BOOTBLOCK || ENV_ROMSTAGE))
|
|
pci_early_bridge_init();
|
|
|
|
console_hw_init();
|
|
|
|
console_inited = 1;
|
|
|
|
printk(BIOS_NOTICE, "\n\ncoreboot-%s%s %s " ENV_STRING " starting (log level: %i)...\n",
|
|
coreboot_version, coreboot_extra_version, coreboot_build,
|
|
get_log_level());
|
|
}
|