diff options
| author | Arthur Heymans <arthur@aheymans.xyz> | 2021-03-02 16:07:52 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2021-04-19 06:36:28 +0000 |
| commit | 88407bcd9d7f26e9a8c42f0592bd7163764c87e6 (patch) | |
| tree | 10da862fee24f850f8882facc70af7c13ce63bb2 /src/cpu/x86/mp_init.c | |
| parent | e6c3523b1b4691940312c083446fcaa59c5d55a4 (diff) | |
cpu/x86/smm: Drop the V1 smmloader
Change-Id: I536a104428ae86e82977f2510b9e76715398b442
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/51187
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src/cpu/x86/mp_init.c')
| -rw-r--r-- | src/cpu/x86/mp_init.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c index bac74f9243..893e8f1fd6 100644 --- a/src/cpu/x86/mp_init.c +++ b/src/cpu/x86/mp_init.c @@ -757,15 +757,10 @@ static void asmlinkage smm_do_relocation(void *arg) * the location of the new SMBASE. If using SMM modules then this * calculation needs to match that of the module loader. */ - if (CONFIG(X86_SMM_LOADER_VERSION2)) { - perm_smbase = smm_get_cpu_smbase(cpu); - if (!perm_smbase) { - printk(BIOS_ERR, "%s: bad SMBASE for CPU %d\n", __func__, cpu); - return; - } - } else { - perm_smbase = mp_state.perm_smbase; - perm_smbase -= cpu * mp_state.smm_save_state_size; + perm_smbase = smm_get_cpu_smbase(cpu); + if (!perm_smbase) { + printk(BIOS_ERR, "%s: bad SMBASE for CPU %d\n", __func__, cpu); + return; } /* Setup code checks this callback for validity. */ |