From cd6d281fbee4de59aad1e76f1ed9afeb19ce9a0b Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Tue, 6 Dec 2016 13:58:56 +0200 Subject: CPU: Move SMM prototypes under x86 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iefbc17dcfcf312338d94b2c2945c7fac3b23bff6 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/17732 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/arch/x86/include/arch/cpu.h | 4 ++++ src/include/cpu/cpu.h | 4 ---- src/mainboard/siemens/sitemp_g1p1/mainboard.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/arch/x86/include/arch/cpu.h b/src/arch/x86/include/arch/cpu.h index faa237565c..578bb07369 100644 --- a/src/arch/x86/include/arch/cpu.h +++ b/src/arch/x86/include/arch/cpu.h @@ -163,6 +163,10 @@ int cpu_cpuid_extended_level(void); int cpu_have_cpuid(void); int cpu_phys_address_size(void); +void smm_init(void); +void smm_lock(void); +void smm_setup_structures(void *gnvs, void *tcg, void *smi1); + #ifndef __SIMPLE_DEVICE__ struct device; diff --git a/src/include/cpu/cpu.h b/src/include/cpu/cpu.h index bf622d75d6..3256a83ec6 100644 --- a/src/include/cpu/cpu.h +++ b/src/include/cpu/cpu.h @@ -9,10 +9,6 @@ struct bus; void initialize_cpus(struct bus *cpu_bus); void asmlinkage secondary_cpu_init(unsigned int cpu_index); -void smm_init(void); -void smm_lock(void); -void smm_setup_structures(void *gnvs, void *tcg, void *smi1); - #define __cpu_driver __attribute__ ((used,__section__(".rodata.cpu_driver"))) #ifndef __SIMPLE_DEVICE__ /** start of compile time generated pci driver array */ diff --git a/src/mainboard/siemens/sitemp_g1p1/mainboard.c b/src/mainboard/siemens/sitemp_g1p1/mainboard.c index 736ef3431e..1f266a7a00 100644 --- a/src/mainboard/siemens/sitemp_g1p1/mainboard.c +++ b/src/mainboard/siemens/sitemp_g1p1/mainboard.c @@ -760,7 +760,7 @@ static void detect_hw_variant( device_t dev ) } } -static void smm_lock( void ) +void smm_lock(void) { /* LOCK the SMM memory window and enable normal SMM. * After running this function, only a full reset can -- cgit v1.2.3