From a19bc34430200f34286f3ba5e8b1df569b69fe8b Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Tue, 31 May 2022 21:25:53 +0200 Subject: soc/amd/*: Move apm call out of MP init code This makes it easier to have common code for MP init on AMD systems. Change-Id: Icb6808edf96a17ec0b3073ba2486b3345a4a66ea Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/64867 Tested-by: build bot (Jenkins) Reviewed-by: Felix Held --- src/soc/amd/sabrina/cpu.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'src/soc/amd/sabrina') diff --git a/src/soc/amd/sabrina/cpu.c b/src/soc/amd/sabrina/cpu.c index 462fb0d6fd..d4258a886f 100644 --- a/src/soc/amd/sabrina/cpu.c +++ b/src/soc/amd/sabrina/cpu.c @@ -2,6 +2,7 @@ /* TODO: Check if this is still correct */ +#include #include #include #include @@ -42,21 +43,12 @@ static void pre_mp_init(void) x86_mtrr_check(); } -static void post_mp_init(void) -{ - global_smi_enable(); - - /* SMMINFO only needs to be set up when booting from S5 */ - if (!acpi_is_wakeup_s3()) - apm_control(APM_CNT_SMMINFO); -} - static const struct mp_ops mp_ops = { .pre_mp_init = pre_mp_init, .get_cpu_count = get_cpu_count, .get_smm_info = get_smm_info, .relocation_handler = smm_relocation_handler, - .post_mp_init = post_mp_init, + .post_mp_init = global_smi_enable, }; void mp_init_cpus(struct bus *cpu_bus) @@ -67,6 +59,10 @@ void mp_init_cpus(struct bus *cpu_bus) /* pre_mp_init made the flash not cacheable. Reset to WP for performance. */ mtrr_use_temp_range(FLASH_BASE_ADDR, CONFIG_ROM_SIZE, MTRR_TYPE_WRPROT); + + /* SMMINFO only needs to be set up when booting from S5 */ + if (!acpi_is_wakeup_s3()) + apm_control(APM_CNT_SMMINFO); } static void zen_2_3_init(struct device *dev) -- cgit v1.2.3