GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cpu/x86/smm: Fix SMM start address passing 

This fixes an issue introduced in
    commit ad0116c032
    cpu/x86/smm_loaderv2: Remove unused variables

It removed one variable that was needed to set the SMM start address
that is used to set the SMM stack location.

Change-Id: Iddf9f204db54f0d97a90bb423b65db2f7625217f
Signed-off-by: Marc Jones <marcjones@sysproconsulting.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/51721
Reviewed-by: Jay Talbott <JayTalbott@sysproconsulting.com>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Marc Jones 2021-03-22 19:40:30 -06:00 committed by Marc Jones
parent 1834fbb83b
commit 93a4e0135c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/cpu/x86/smm/smm_module_loaderv2.c
View File

@ -312,7 +312,8 @@ static int smm_stub_place_staggered_entry_points(char *base,
*/ */
static int smm_module_setup_stub(void *const smbase, const size_t smm_size, static int smm_module_setup_stub(void *const smbase, const size_t smm_size,
struct smm_loader_params *params, 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 total_save_state_size;
size_t smm_stub_size; size_t smm_stub_size;
@ -381,7 +382,7 @@ static int smm_module_setup_stub(void *const smbase, const size_t smm_size,
* for default handler, but for relocated handler it lives at the beginning * for default handler, but for relocated handler it lives at the beginning
* of SMRAM which is TSEG base * 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) { if (stacks_top == NULL) {
printk(BIOS_ERR, "%s: error assigning stacks\n", __func__); printk(BIOS_ERR, "%s: error assigning stacks\n", __func__);
return -1; return -1;
@ -456,7 +457,7 @@ int smm_setup_relocation_handler(struct smm_loader_params *params)
params->num_concurrent_stacks = CONFIG_MAX_CPUS; params->num_concurrent_stacks = CONFIG_MAX_CPUS;
return smm_module_setup_stub(smram, SMM_DEFAULT_SIZE, 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__); printk(BIOS_SPEW, "%s: exit\n", __func__);
} }
@ -498,7 +499,7 @@ int smm_load_module(void *smram, size_t size, struct smm_loader_params *params)
void *fxsave_area; void *fxsave_area;
size_t total_size = 0; size_t total_size = 0;
char *base; char *base;
void *smram_start = smram;
if (size <= SMM_DEFAULT_SIZE) if (size <= SMM_DEFAULT_SIZE)
return -1; return -1;
@ -620,5 +621,5 @@ int smm_load_module(void *smram, size_t size, struct smm_loader_params *params)
cpus[i].ss_start + params->per_cpu_save_state_size; 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);
} }