Felix Held submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved
cpu/x86/mp_init.c: Fix building without an SMI_HANDLER

Tested on Qemu/i440fx. The follow-up commit adds a config file to
buildtest it.

Change-Id: Ieeaa85691e4c4516bb51df0e87c4ecaa940810f0
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/59694
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
---
M src/cpu/x86/mp_init.c
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c
index 9b5c230..46cb585 100644
--- a/src/cpu/x86/mp_init.c
+++ b/src/cpu/x86/mp_init.c
@@ -1076,7 +1076,9 @@
ops->get_smm_info(&state->perm_smbase, &state->perm_smsize,
&state->smm_real_save_state_size);

- state->smm_save_state_size = MAX(state->smm_real_save_state_size, smm_stub_size());
+ if (CONFIG(HAVE_SMI_HANDLER))
+ state->smm_save_state_size = MAX(state->smm_real_save_state_size,
+ smm_stub_size());

/*
* Make sure there is enough room for the SMM descriptor

To view, visit change 59694. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ieeaa85691e4c4516bb51df0e87c4ecaa940810f0
Gerrit-Change-Number: 59694
Gerrit-PatchSet: 2
Gerrit-Owner: Arthur Heymans <arthur@aheymans.xyz>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Felix Held <felix-coreboot@felixheld.de>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter@mailbox.org>
Gerrit-MessageType: merged