cpu/x86/smm: Promote smm_memory_map()
Change-Id: I909e9b5fead317928d3513a677cfab25e3c42f64 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34792 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
@@ -22,6 +22,7 @@
|
||||
#include <console/console.h>
|
||||
#include <cbmem.h>
|
||||
#include <cpu/x86/mtrr.h>
|
||||
#include <cpu/x86/smm.h>
|
||||
#if CONFIG(EC_GOOGLE_CHROMEEC)
|
||||
#include <ec/google/chromeec/ec.h>
|
||||
#endif
|
||||
@@ -146,6 +147,9 @@ static void romstage_main(uint64_t tsc, uint32_t bist)
|
||||
/* Call into mainboard. */
|
||||
mainboard_romstage_entry(&rp);
|
||||
|
||||
if (CONFIG(SMM_TSEG))
|
||||
smm_list_regions();
|
||||
|
||||
prepare_and_run_postcar(&early_mtrrs);
|
||||
/* We do not return here. */
|
||||
}
|
||||
|
||||
@@ -15,10 +15,6 @@ source "src/soc/intel/common/pch/Kconfig"
|
||||
comment "Intel SoC Common coreboot stages"
|
||||
source "src/soc/intel/common/basecode/Kconfig"
|
||||
|
||||
config DISPLAY_SMM_MEMORY_MAP
|
||||
bool "SMM: Display the SMM memory map"
|
||||
default n
|
||||
|
||||
config SOC_INTEL_COMMON_RESET
|
||||
bool
|
||||
default n
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
#include <console/usb.h>
|
||||
#include <cbmem.h>
|
||||
#include <cpu/x86/mtrr.h>
|
||||
#include <cpu/x86/smm.h>
|
||||
#include <program_loading.h>
|
||||
#include <romstage_handoff.h>
|
||||
#include <timestamp.h>
|
||||
@@ -255,9 +256,11 @@ void romstage_main_continue(EFI_STATUS status, void *hob_list_ptr)
|
||||
|
||||
romstage_handoff_init(prev_sleep_state == ACPI_S3);
|
||||
|
||||
post_code(0x4f);
|
||||
if (CONFIG(SMM_TSEG))
|
||||
smm_list_regions();
|
||||
|
||||
/* Load the ramstage. */
|
||||
post_code(0x4f);
|
||||
run_ramstage();
|
||||
while (1);
|
||||
}
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <console/console.h>
|
||||
#include <console/usb.h>
|
||||
#include <cpu/x86/mtrr.h>
|
||||
#include <cpu/x86/smm.h>
|
||||
#include <program_loading.h>
|
||||
#include <timestamp.h>
|
||||
#include <version.h>
|
||||
@@ -169,6 +170,9 @@ void romstage_main_continue(EFI_STATUS status, void *hob_list_ptr)
|
||||
if (!CONFIG(FSP_MEMORY_DOWN))
|
||||
save_dimm_info();
|
||||
|
||||
if (CONFIG(SMM_TSEG))
|
||||
smm_list_regions();
|
||||
|
||||
/* Load the ramstage. */
|
||||
post_code(0x4e);
|
||||
run_ramstage();
|
||||
|
||||
Reference in New Issue
Block a user