diff options
| author | Johnny Lin <johnny_lin@wiwynn.com> | 2021-01-14 17:49:08 +0800 |
|---|---|---|
| committer | David Hendricks <david.hendricks@gmail.com> | 2023-02-15 21:53:07 +0000 |
| commit | 107e7aa0f58f79ee5719f82c7147e53d7d9fa218 (patch) | |
| tree | 22ea35a3f0f188e2036ce1c710afdef8409c625f /src/cpu/x86 | |
| parent | e822fb358764b78e7d7d02c024ae6a285632ddf9 (diff) | |
cpu/x86/smm: Enable setting SMM console log level from mainboard
Add a Kconfig RUNTIME_CONFIGURABLE_SMM_LOGLEVEL that enables
mainboard to override mainboard_set_smm_log_level for SMM log level.
This can let SMM have different log level than other stages for
more flexibility.
Another reason is that getting certain data that requires searching
from flash VPD or CMOS is not very ideal to be done in SMM, so in this
change the value can be passed via the member variable in struct
smm_runtime and be referenced directly in SMM.
One example is that mainboard can get the desired SMM log level from
VPD/CMOS, and pass SMM console log level via the variable and in SMM
it can be referenced in get_console_loglevel() override function
directly.
Tested=On OCP Delta Lake, verified SMM log level can be overridden.
Change-Id: I81722a4f1bf75ec942cc06e403ad702dfe938e71
Signed-off-by: Johnny Lin <johnny_lin@wiwynn.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49460
Reviewed-by: David Hendricks <david.hendricks@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Jonathan Zhang <jonzhang@fb.com>
Diffstat (limited to 'src/cpu/x86')
| -rw-r--r-- | src/cpu/x86/Kconfig | 12 | ||||
| -rw-r--r-- | src/cpu/x86/smm/smm_module_handler.c | 7 | ||||
| -rw-r--r-- | src/cpu/x86/smm/smm_module_loader.c | 5 |
3 files changed, 24 insertions, 0 deletions
diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig index 1a7d8c6dd6..edba27bd40 100644 --- a/src/cpu/x86/Kconfig +++ b/src/cpu/x86/Kconfig @@ -209,4 +209,16 @@ config AP_STACK_SIZE This is the amount of stack each AP needs. The BSP stack size can be larger and is set with STACK_SIZE. +config RUNTIME_CONFIGURABLE_SMM_LOGLEVEL + bool + default n + depends on DEBUG_SMI && CONSOLE_OVERRIDE_LOGLEVEL + help + This enables setting the SMM console log level at runtime for more + flexibility to use different log levels for each stage. Another reason + is that reading the log level from non-volatile memory such as flash + VPD or CMOS is not very ideal to be done in SMM, with this option the + value can be passed via the member variable in struct smm_runtime and + be referenced directly in SMM. + endif # ARCH_X86 diff --git a/src/cpu/x86/smm/smm_module_handler.c b/src/cpu/x86/smm/smm_module_handler.c index a976521e65..1b3c93b780 100644 --- a/src/cpu/x86/smm/smm_module_handler.c +++ b/src/cpu/x86/smm/smm_module_handler.c @@ -52,6 +52,13 @@ static void smi_release_lock(void) ); } +#if CONFIG(RUNTIME_CONFIGURABLE_SMM_LOGLEVEL) +int get_console_loglevel(void) +{ + return smm_runtime.smm_log_level; +} +#endif + void smm_get_cbmemc_buffer(void **buffer_out, size_t *size_out) { *buffer_out = smm_runtime.cbmemc; diff --git a/src/cpu/x86/smm/smm_module_loader.c b/src/cpu/x86/smm/smm_module_loader.c index 6924f08e78..1b04e8894d 100644 --- a/src/cpu/x86/smm/smm_module_loader.c +++ b/src/cpu/x86/smm/smm_module_loader.c @@ -338,6 +338,11 @@ static void setup_smihandler_params(struct smm_runtime *mod_params, for (int i = 0; i < loader_params->num_cpus; i++) mod_params->save_state_top[i] = region_end(&cpus[i].ss); + + if (CONFIG(RUNTIME_CONFIGURABLE_SMM_LOGLEVEL)) + mod_params->smm_log_level = mainboard_set_smm_log_level(); + else + mod_params->smm_log_level = 0; } static void print_region(const char *name, const struct region region) |