308c1b7976
We limited the configurability of the debug level to stages that have
a `.data` section. This is not really a requirement, because a `.bss`
section should suffice and we always have that now.
We want to make the debug level configurable early but also want to
avoid calling get_option() early, as an error therein could result
in no console output at all. Hence, we compromise and start using
get_option() from the second console init on.
TEST=Booted QEMU once with `debug_level=Debug` and once with
`debug_level=Notice`. On the second boot, most messages
vanished for all stages but the bootblock.
Change-Id: I11484fc32dcbba8d31772bd0b82785f17b2fba11
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45765
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Marc Jones <marc@marcjonesconsulting.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)
|
|
get_option(&console_loglevel, "debug_level");
|
|
}
|
|
|
|
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());
|
|
}
|