From a804f9195eb8fd93a2a6650cc24a26e422696214 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Mon, 30 May 2022 14:39:45 +0200 Subject: cpu/smm_module_loader.c: Fix up CPU index locally Don't pass the stub params to the mp_init code. Change-Id: I070bc00ae5e5bceb6c5b90ea833cc057dd41f6cc Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/64802 Reviewed-by: Patrick Rudolph Tested-by: build bot (Jenkins) --- src/cpu/x86/mp_init.c | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'src/cpu/x86/mp_init.c') diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c index 01ca64e87e..df6bc4bc87 100644 --- a/src/cpu/x86/mp_init.c +++ b/src/cpu/x86/mp_init.c @@ -744,16 +744,6 @@ static asmlinkage void smm_do_relocation(void *arg) } } -static void adjust_smm_apic_id_map(struct smm_loader_params *smm_params) -{ - struct smm_stub_params *stub_params = smm_params->stub_params; - - int i = 0; - for (struct device *dev = g_cpu_bus->children; dev; dev = dev->sibling) - if (dev->enabled) - stub_params->apic_id_to_cpu[i++] = dev->path.apic.initial_lapicid; -} - static enum cb_err install_relocation_handler(int num_cpus, size_t save_state_size) { if (CONFIG(X86_SMM_SKIP_RELOCATION_HANDLER)) @@ -770,7 +760,6 @@ static enum cb_err install_relocation_handler(int num_cpus, size_t save_state_si printk(BIOS_ERR, "%s: smm setup failed\n", __func__); return CB_ERR; } - adjust_smm_apic_id_map(&smm_params); return CB_SUCCESS; } @@ -796,8 +785,6 @@ static enum cb_err install_permanent_handler(int num_cpus, uintptr_t smbase, if (smm_load_module(smbase, smsize, &smm_params)) return CB_ERR; - adjust_smm_apic_id_map(&smm_params); - return CB_SUCCESS; } -- cgit v1.2.3