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

cpu/x86/smm_module_loader: Use struct region in cpu map 

We use a region later on so we might as well use a region from the
start. This simplifies the computations too.

Change-Id: Iffa36ccb89c36401d3856b24364216e83ca35f91
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/64609
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Lean Sheng Tan <sheng.tan@9elements.com>
This commit is contained in:
Arthur Heymans 2022-05-23 22:43:51 +02:00 committed by Martin L Roth
parent af04f3cefa
commit 0effeb576e
1 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/cpu/x86/smm/smm_module_loader.c
View File

@ -45,10 +45,8 @@ extern unsigned char _binary_smmstub_start[];
struct cpu_smm_info { struct cpu_smm_info {
uint8_t active; uint8_t active;
uintptr_t smbase; uintptr_t smbase;
uintptr_t ss_start; struct region ss;
uintptr_t ss_top; struct region stub_code;
uintptr_t code_start;
uintptr_t code_end;
}; };
struct cpu_smm_info cpus[CONFIG_MAX_CPUS] = { 0 }; struct cpu_smm_info cpus[CONFIG_MAX_CPUS] = { 0 };
@ -120,21 +118,14 @@ static int smm_create_map(const uintptr_t smbase, const unsigned int num_cpus,
} }
for (unsigned int i = 0; i < num_cpus; i++) { for (unsigned int i = 0; i < num_cpus; i++) {
if (i % cpus_per_segment == 0)
printk(BIOS_SPEW, "-------------NEW CODE SEGMENT --------------\n");
printk(BIOS_SPEW, "CPU 0x%x\n", i);
/* We copy the same stub for each CPU so they all need the same 'smbase'. */
const size_t segment_number = i / cpus_per_segment; const size_t segment_number = i / cpus_per_segment;
cpus[i].smbase = smbase - SMM_CODE_SEGMENT_SIZE * segment_number cpus[i].smbase = smbase - SMM_CODE_SEGMENT_SIZE * segment_number
- needed_ss_size * (i % cpus_per_segment); - needed_ss_size * (i % cpus_per_segment);
cpus[i].code_start = cpus[i].smbase + SMM_ENTRY_OFFSET; cpus[i].stub_code.offset = cpus[i].smbase + SMM_ENTRY_OFFSET;
cpus[i].code_end = cpus[i].code_start + stub_size; cpus[i].stub_code.size = stub_size;
cpus[i].ss_top = cpus[i].smbase + SMM_CODE_SEGMENT_SIZE; cpus[i].ss.offset = cpus[i].smbase + SMM_CODE_SEGMENT_SIZE
cpus[i].ss_start = cpus[i].ss_top - params->cpu_save_state_size; - params->cpu_save_state_size;
printk(BIOS_SPEW, " Stub [0x%lx-0x%lx[\n", cpus[i].code_start, cpus[i].ss.size = params->cpu_save_state_size;
cpus[i].code_end);
printk(BIOS_SPEW, " Save state [0x%lx-0x%lx[\n", cpus[i].ss_start,
cpus[i].ss_top);
cpus[i].active = 1; cpus[i].active = 1;
} }
@ -182,14 +173,16 @@ static void smm_place_entry_code(const unsigned int num_cpus)
unsigned int size; unsigned int size;
/* start at 1, the first CPU stub code is already there */ /* start at 1, the first CPU stub code is already there */
size = cpus[0].code_end - cpus[0].code_start; size = region_sz(&cpus[0].stub_code);
for (i = 1; i < num_cpus; i++) { for (i = 1; i < num_cpus; i++) {
memcpy((int *)cpus[i].code_start, (int *)cpus[0].code_start, size);
printk(BIOS_DEBUG, printk(BIOS_DEBUG,
"SMM Module: placing smm entry code at %lx, cpu # 0x%x\n", "SMM Module: placing smm entry code at %lx, cpu # 0x%x\n",
cpus[i].code_start, i); region_offset(&cpus[i].stub_code), i);
memcpy((void *)region_offset(&cpus[i].stub_code),
(void *)region_offset(&cpus[0].stub_code), size);
printk(BIOS_SPEW, "%s: copying from %lx to %lx 0x%x bytes\n", printk(BIOS_SPEW, "%s: copying from %lx to %lx 0x%x bytes\n",
__func__, cpus[0].code_start, cpus[i].code_start, size); __func__, region_offset(&cpus[0].stub_code),
region_offset(&cpus[i].stub_code), size);
} }
} }
@ -348,7 +341,7 @@ static void setup_smihandler_params(struct smm_runtime *mod_params,
} }
for (int i = 0; i < loader_params->num_cpus; i++) for (int i = 0; i < loader_params->num_cpus; i++)
mod_params->save_state_top[i] = cpus[i].ss_top; mod_params->save_state_top[i] = region_end(&cpus[i].ss);
} }
static void print_region(const char *name, const struct region region) static void print_region(const char *name, const struct region region)
@ -487,16 +480,12 @@ int smm_load_module(const uintptr_t smram_base, const size_t smram_size,
} }
for (unsigned int i = 0; i < params->num_concurrent_save_states; i++) { for (unsigned int i = 0; i < params->num_concurrent_save_states; i++) {
printk(BIOS_DEBUG, "\nCPU %u\n", i); printk(BIOS_DEBUG, "\nCPU %u\n", i);
struct region ss = { .offset = cpus[i].ss_start,
.size = cpus[i].ss_top - cpus[i].ss_start };
char string[13]; char string[13];
snprintf(string, sizeof(string), " ss%d", i); snprintf(string, sizeof(string), " ss%d", i);
if (append_and_check_region(smram, ss, region_list, string)) if (append_and_check_region(smram, cpus[i].ss, region_list, string))
return -1; return -1;
struct region stub = {.offset = cpus[i].code_start,
.size = cpus[i].code_end - cpus[i].code_start};
snprintf(string, sizeof(string), " stub%d", i); snprintf(string, sizeof(string), " stub%d", i);
if (append_and_check_region(smram, stub, region_list, string)) if (append_and_check_region(smram, cpus[i].stub_code, region_list, string))
return -1; return -1;
} }