Maximilian Brune has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/86682?usp=email )
Change subject: soc/intel/xeon_sp: Use common smm_info function ......................................................................
soc/intel/xeon_sp: Use common smm_info function
Xeons implementation and the common intel implementation are identical so just use the common function.
Signed-off-by: Maximilian Brune maximilian.brune@9elements.com Change-Id: I0ed42a93444e7cc0d339cf63cec4c4411b5b4f73 --- M src/soc/intel/xeon_sp/cpx/cpu.c M src/soc/intel/xeon_sp/gnr/cpu.c M src/soc/intel/xeon_sp/include/soc/smmrelocate.h M src/soc/intel/xeon_sp/skx/cpu.c M src/soc/intel/xeon_sp/smmrelocate.c M src/soc/intel/xeon_sp/spr/cpu.c 6 files changed, 4 insertions(+), 20 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/86682/1
diff --git a/src/soc/intel/xeon_sp/cpx/cpu.c b/src/soc/intel/xeon_sp/cpx/cpu.c index ae3f0fb..5df399a 100644 --- a/src/soc/intel/xeon_sp/cpx/cpu.c +++ b/src/soc/intel/xeon_sp/cpx/cpu.c @@ -186,7 +186,7 @@ static const struct mp_ops mp_ops = { .pre_mp_init = pre_mp_init, .get_cpu_count = get_platform_thread_count, - .get_smm_info = get_smm_info, + .get_smm_info = smm_info, .pre_mp_smm_init = smm_southbridge_clear_state, .relocation_handler = smm_relocation_handler, .get_microcode_info = get_microcode_info, diff --git a/src/soc/intel/xeon_sp/gnr/cpu.c b/src/soc/intel/xeon_sp/gnr/cpu.c index 71edd70..44f466d 100644 --- a/src/soc/intel/xeon_sp/gnr/cpu.c +++ b/src/soc/intel/xeon_sp/gnr/cpu.c @@ -73,7 +73,7 @@ .pre_mp_init = pre_mp_init, .get_cpu_count = get_platform_thread_count, #if CONFIG(HAVE_SMI_HANDLER) - .get_smm_info = get_smm_info, + .get_smm_info = smm_info, .pre_mp_smm_init = smm_southbridge_clear_state, .relocation_handler = smm_relocation_handler, #endif diff --git a/src/soc/intel/xeon_sp/include/soc/smmrelocate.h b/src/soc/intel/xeon_sp/include/soc/smmrelocate.h index b18d057..c3b179c 100644 --- a/src/soc/intel/xeon_sp/include/soc/smmrelocate.h +++ b/src/soc/intel/xeon_sp/include/soc/smmrelocate.h @@ -5,9 +5,6 @@
#include <cpu/x86/smm.h>
-void get_smm_info(uintptr_t *perm_smbase, size_t *perm_smsize, - size_t *smm_save_state_size); - void soc_ubox_store_resources(struct smm_pci_resource_info *slots, size_t size);
#endif diff --git a/src/soc/intel/xeon_sp/skx/cpu.c b/src/soc/intel/xeon_sp/skx/cpu.c index 1becda8..e829aa9 100644 --- a/src/soc/intel/xeon_sp/skx/cpu.c +++ b/src/soc/intel/xeon_sp/skx/cpu.c @@ -268,7 +268,7 @@ static const struct mp_ops mp_ops = { .pre_mp_init = pre_mp_init, .get_cpu_count = get_platform_thread_count, - .get_smm_info = get_smm_info, + .get_smm_info = smm_info, .pre_mp_smm_init = smm_southbridge_clear_state, .relocation_handler = smm_relocation_handler, .get_microcode_info = get_microcode_info, diff --git a/src/soc/intel/xeon_sp/smmrelocate.c b/src/soc/intel/xeon_sp/smmrelocate.c index c359237..79764de 100644 --- a/src/soc/intel/xeon_sp/smmrelocate.c +++ b/src/soc/intel/xeon_sp/smmrelocate.c @@ -71,19 +71,6 @@ memset(ied_base + 1 * MiB, 0, 32 * KiB); }
-void get_smm_info(uintptr_t *perm_smbase, size_t *perm_smsize, - size_t *smm_save_state_size) -{ - fill_in_relocation_params(&smm_reloc_params); - - smm_subregion(SMM_SUBREGION_HANDLER, perm_smbase, perm_smsize); - - if (smm_reloc_params.ied_size) - setup_ied_area(&smm_reloc_params); - - *smm_save_state_size = sizeof(em64t101_smm_state_save_area_t); -} - static void update_save_state(int cpu, uintptr_t curr_smbase, uintptr_t staggered_smbase, struct smm_relocation_params *relo_params) diff --git a/src/soc/intel/xeon_sp/spr/cpu.c b/src/soc/intel/xeon_sp/spr/cpu.c index febc72b..1162da4 100644 --- a/src/soc/intel/xeon_sp/spr/cpu.c +++ b/src/soc/intel/xeon_sp/spr/cpu.c @@ -234,7 +234,7 @@ .pre_mp_init = pre_mp_init, .get_cpu_count = get_platform_thread_count, #if CONFIG(HAVE_SMI_HANDLER) - .get_smm_info = get_smm_info, + .get_smm_info = smm_info, .pre_mp_smm_init = smm_southbridge_clear_state, .relocation_handler = smm_relocation_handler, #endif
-
Maximilian Brune (Code Review)