From 9d8adc0e3a923e1d201d50344f94a9176e5ec939 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Sun, 4 Dec 2016 22:17:37 +0200 Subject: x86 SMM: Fix use with RELOCATABLE_RAMSTAGE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The value for _size was not evaluated correctly if ramstage is relocated, make the calculation runtime. While touching it, move symbol declarations to header file. Change-Id: I4402315945771acf1c86a81cac6d43f1fe99a2a2 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/17784 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/cpu/amd/smm/smm_init.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/cpu/amd/smm') diff --git a/src/cpu/amd/smm/smm_init.c b/src/cpu/amd/smm/smm_init.c index c87b70109f..4d04cf7762 100644 --- a/src/cpu/amd/smm/smm_init.c +++ b/src/cpu/amd/smm/smm_init.c @@ -26,9 +26,6 @@ #include #include -extern unsigned char _binary_smm_start; -extern unsigned char _binary_smm_size; - void smm_init(void) { msr_t msr, syscfg_orig, mtrr_aseg_orig; @@ -63,7 +60,8 @@ void smm_init(void) enable_cache(); /* copy the real SMM handler */ - memcpy((void *)SMM_BASE, &_binary_smm_start, (size_t)&_binary_smm_size); + memcpy((void *)SMM_BASE, _binary_smm_start, + _binary_smm_end - _binary_smm_start); wbinvd(); disable_cache(); -- cgit v1.2.3