From c4fdb7b923f82e31a687fc01f7176ad05ab51689 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Sat, 10 Aug 2019 15:51:59 +0300 Subject: cpu/x86: Move some SMM function declarations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I9a4e57f8fd032f2824eab0e5b59d635710e3e24b Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/34822 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/include/cpu/x86/smi_deprecated.h | 12 ++++++++++++ src/include/cpu/x86/smm.h | 5 ++--- 2 files changed, 14 insertions(+), 3 deletions(-) (limited to 'src/include') diff --git a/src/include/cpu/x86/smi_deprecated.h b/src/include/cpu/x86/smi_deprecated.h index 3eed0fdda5..b5d69dd266 100644 --- a/src/include/cpu/x86/smi_deprecated.h +++ b/src/include/cpu/x86/smi_deprecated.h @@ -43,4 +43,16 @@ void northbridge_smi_handler(unsigned int node, smm_state_save_area_t *state_sav void southbridge_smi_handler(unsigned int node, smm_state_save_area_t *state_save); #endif +#if CONFIG(PARALLEL_MP) || !CONFIG(HAVE_SMI_HANDLER) +/* Empty stubs for platforms without SMI handlers. */ +static inline void smm_init(void) { } +static inline void smm_init_completion(void) { } +#else +void smm_init(void); +void smm_init_completion(void); +#endif + +/* Entry from smmhandler.S. */ +void smi_handler(u32 smm_revision); + #endif diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h index a9d1ad4d1e..ebe6f76da4 100644 --- a/src/include/cpu/x86/smm.h +++ b/src/include/cpu/x86/smm.h @@ -41,9 +41,6 @@ #define APM_CNT_ELOG_GSMI 0xef #define APM_STS 0xb3 -/* SMI handler function prototypes */ -void smi_handler(u32 smm_revision); - void io_trap_handler(int smif); int southbridge_io_trap_handler(int smif); int mainboard_io_trap_handler(int smif); @@ -56,6 +53,8 @@ void northbridge_smi_handler(void); void southbridge_smi_handler(void); #endif +void smm_setup_structures(void *gnvs, void *tcg, void *smi1); + void mainboard_smi_gpi(u32 gpi_sts); int mainboard_smi_apmc(u8 data); void mainboard_smi_sleep(u8 slp_typ); -- cgit v1.2.3