summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorEugene Myers <edmyers@tycho.nsa.gov>2020-02-10 15:44:38 -0500
committerPatrick Georgi <pgeorgi@google.com>2020-02-17 15:34:26 +0000
commit53e92360f5b08866856eb50a3d9adae070d4df7b (patch)
tree7b5b4524427ff9274457e05429ca26a1a041a7e8 /src/cpu
parent970ed2ad293c6928a0ebaa41c6229112c7531983 (diff)
downloadcoreboot-53e92360f5b08866856eb50a3d9adae070d4df7b.tar.xz
cpu/x86: Remove unnecessary guard
The is_smm_enabled is not necessary because it is done previously in this code path. Signed-off-by: Eugene D. Myers <edmyers@tycho.nsa.gov> Change-Id: I20d50acbea891cb56ad49edc128df25d21c5f1ca Reviewed-on: https://review.coreboot.org/c/coreboot/+/38820 Reviewed-by: Angel Pons <th3fanbus@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/x86/mp_init.c23
1 files changed, 9 insertions, 14 deletions
diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c
index 5169861676..6082df99d4 100644
--- a/src/cpu/x86/mp_init.c
+++ b/src/cpu/x86/mp_init.c
@@ -747,20 +747,15 @@ static void asmlinkage smm_do_relocation(void *arg)
mp_state.ops.relocation_handler(cpu, curr_smbase, perm_smbase);
if (CONFIG(STM)) {
- if (is_smm_enabled()) {
- uintptr_t mseg;
-
- mseg = mp_state.perm_smbase +
- (mp_state.perm_smsize - CONFIG_MSEG_SIZE);
-
- stm_setup(mseg, p->cpu, runtime->num_cpus,
- perm_smbase,
- mp_state.perm_smbase,
- runtime->start32_offset);
- } else {
- printk(BIOS_DEBUG,
- "STM not loaded because SMM is not enabled!\n");
- }
+ uintptr_t mseg;
+
+ mseg = mp_state.perm_smbase +
+ (mp_state.perm_smsize - CONFIG_MSEG_SIZE);
+
+ stm_setup(mseg, p->cpu, runtime->num_cpus,
+ perm_smbase,
+ mp_state.perm_smbase,
+ runtime->start32_offset);
}
}