Marc Jones has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/51721 )
Change subject: cpu/x86/smm: Fix SMM start address passing ......................................................................
cpu/x86/smm: Fix SMM start address passing
This fixes an issue introduced in commit ad0116c0327f575f0af184a2f4861848a49a0e2a cpu/x86/smm_loaderv2: Remove unused variables
It removed one variable that was needed to set the SMM start address that is needed to set the SMM stack location.
Change-Id: Iddf9f204db54f0d97a90bb423b65db2f7625217f Signed-off-by: Marc Jones marcjones@sysproconsulting.com (cherry picked from commit 45d691de47df4be2b69da38487fad37db8208f3d) Signed-off-by: Marc Jones marcjones@sysproconsulting.com --- M src/cpu/x86/smm/smm_module_loaderv2.c 1 file changed, 6 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/21/51721/1
diff --git a/src/cpu/x86/smm/smm_module_loaderv2.c b/src/cpu/x86/smm/smm_module_loaderv2.c index 5c45fcc..26be007 100644 --- a/src/cpu/x86/smm/smm_module_loaderv2.c +++ b/src/cpu/x86/smm/smm_module_loaderv2.c @@ -312,7 +312,8 @@ */ static int smm_module_setup_stub(void *const smbase, const size_t smm_size, struct smm_loader_params *params, - void *const fxsave_area) + void *const fxsave_area, + void *const smram_start) { size_t total_save_state_size; size_t smm_stub_size; @@ -381,7 +382,7 @@ * for default handler, but for relocated handler it lives at the beginning * of SMRAM which is TSEG base */ - stacks_top = smm_stub_place_stacks(smbase, params); + stacks_top = smm_stub_place_stacks(smram_start, params); if (stacks_top == NULL) { printk(BIOS_ERR, "%s: error assigning stacks\n", __func__); return -1; @@ -456,7 +457,7 @@ params->num_concurrent_stacks = CONFIG_MAX_CPUS;
return smm_module_setup_stub(smram, SMM_DEFAULT_SIZE, - params, fxsave_area_relocation); + params, fxsave_area_relocation, smram); printk(BIOS_SPEW, "%s: exit\n", __func__); }
@@ -498,7 +499,7 @@ void *fxsave_area; size_t total_size = 0; char *base; - + void *smram_start = smram; if (size <= SMM_DEFAULT_SIZE) return -1;
@@ -620,5 +621,5 @@ cpus[i].ss_start + params->per_cpu_save_state_size; }
- return smm_module_setup_stub(base, size, params, fxsave_area); + return smm_module_setup_stub(base, size, params, fxsave_area, smram_start); }