diff options
Diffstat (limited to 'src/soc/amd/common')
| -rw-r--r-- | src/soc/amd/common/block/cpu/smm/smm_relocate.c | 28 | ||||
| -rw-r--r-- | src/soc/amd/common/block/include/amdblocks/smm.h | 2 |
2 files changed, 26 insertions, 4 deletions
diff --git a/src/soc/amd/common/block/cpu/smm/smm_relocate.c b/src/soc/amd/common/block/cpu/smm/smm_relocate.c index f3fcc79a86..e464cfca6d 100644 --- a/src/soc/amd/common/block/cpu/smm/smm_relocate.c +++ b/src/soc/amd/common/block/cpu/smm/smm_relocate.c @@ -1,15 +1,31 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include <cpu/x86/mtrr.h> +#include <cpu/x86/mp.h> +#include <amdblocks/cpu.h> #include <amdblocks/smm.h> #include <console/console.h> #include <cpu/amd/amd64_save_state.h> #include <cpu/amd/msr.h> +#include <cpu/amd/mtrr.h> #include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <cpu/x86/smm.h> #include <types.h> -void get_smm_info(uintptr_t *perm_smbase, size_t *perm_smsize, size_t *smm_save_state_size) +/* AP MTRRs will be synced to the BSP in the SIPI vector so set them up before MP init. */ +static void pre_mp_init(void) +{ + const msr_t syscfg = rdmsr(SYSCFG_MSR); + if (syscfg.lo & SYSCFG_MSR_TOM2WB) + x86_setup_mtrrs_with_detect_no_above_4gb(); + else + x86_setup_mtrrs_with_detect(); + x86_mtrr_check(); +} + +static void get_smm_info(uintptr_t *perm_smbase, size_t *perm_smsize, + size_t *smm_save_state_size) { printk(BIOS_DEBUG, "Setting up SMI for CPU\n"); @@ -33,7 +49,7 @@ void get_smm_info(uintptr_t *perm_smbase, size_t *perm_smsize, size_t *smm_save_ *smm_save_state_size = sizeof(amd64_smm_state_save_area_t); } -void smm_relocation_handler(int cpu, uintptr_t curr_smbase, uintptr_t staggered_smbase) +static void smm_relocation_handler(int cpu, uintptr_t curr_smbase, uintptr_t staggered_smbase) { amd64_smm_state_save_area_t *smm_state; @@ -55,3 +71,11 @@ void smm_relocation_handler(int cpu, uintptr_t curr_smbase, uintptr_t staggered_ smm_state = (void *)(SMM_AMD64_SAVE_STATE_OFFSET + curr_smbase); smm_state->smbase = staggered_smbase; } + +const struct mp_ops amd_mp_ops_with_smm = { + .pre_mp_init = pre_mp_init, + .get_cpu_count = get_cpu_count, + .get_smm_info = get_smm_info, + .relocation_handler = smm_relocation_handler, + .post_mp_init = global_smi_enable, +}; diff --git a/src/soc/amd/common/block/include/amdblocks/smm.h b/src/soc/amd/common/block/include/amdblocks/smm.h index 7fa8648ba6..f0a06bf015 100644 --- a/src/soc/amd/common/block/include/amdblocks/smm.h +++ b/src/soc/amd/common/block/include/amdblocks/smm.h @@ -6,8 +6,6 @@ #include <cpu/x86/msr.h> #include <types.h> -void get_smm_info(uintptr_t *perm_smbase, size_t *perm_smsize, size_t *smm_save_state_size); -void smm_relocation_handler(int cpu, uintptr_t curr_smbase, uintptr_t staggered_smbase); void *get_smi_source_handler(int source); void handle_smi_gsmi(void); void handle_smi_store(void); |