GNUBoot/coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cpu/x86/smm_module_loader: always build with SMM module support

Browse source 
The SMM module loader code was guarded by CONFIG_SMM_TSEG,
however that's not necessary. It's up to the chipset to take
advantage of the SMM module loading. It'll get optimized out
if the code isn't used anyway so just expose the declarations.

Change-Id: I6ba1b91d0c84febd4f1a92737b3d7303ab61b343
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/14560
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
Reviewed-by: Furquan Shaikh <furquan@google.com>
This commit is contained in:
Aaron Durbin 2016-04-30 14:56:20 -05:00
parent 5f72f960df
commit a41e030fbc
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/cpu/x86/smm/Makefile.inc
View file

@ -14,6 +14,7 @@
## ##
ramstage-$(CONFIG_BACKUP_DEFAULT_SMM_REGION) += backup_default_smm.c ramstage-$(CONFIG_BACKUP_DEFAULT_SMM_REGION) += backup_default_smm.c
ramstage-y += smm_module_loader.c
ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_32),y) ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_32),y)
$(eval $(call create_class_compiler,smm,x86_32)) $(eval $(call create_class_compiler,smm,x86_32))
@ -42,8 +43,6 @@ smmstub-y += smm_stub.S
smm-y += smm_module_handler.c smm-y += smm_module_handler.c
ramstage-y += smm_module_loader.c
ramstage-srcs += $(obj)/cpu/x86/smm/smm.manual ramstage-srcs += $(obj)/cpu/x86/smm/smm.manual
ramstage-srcs += $(obj)/cpu/x86/smm/smmstub.manual ramstage-srcs += $(obj)/cpu/x86/smm/smmstub.manual

6
src/include/cpu/x86/smm.h
View file

@ -488,8 +488,6 @@ void smi_release_lock(void);
/* Get PMBASE address */ /* Get PMBASE address */
u16 smm_get_pmbase(void); u16 smm_get_pmbase(void);
#if CONFIG_SMM_TSEG
struct smm_runtime { struct smm_runtime {
u32 smbase; u32 smbase;
u32 save_state_size; u32 save_state_size;
@ -520,8 +518,8 @@ void asmlinkage smm_handler_start(void *params);
/* Retrieve SMM save state for a given CPU. WARNING: This does not take into /* Retrieve SMM save state for a given CPU. WARNING: This does not take into
* account CPUs which are configured to not save their state to RAM. */ * account CPUs which are configured to not save their state to RAM. */
void *smm_get_save_state(int cpu); void *smm_get_save_state(int cpu);
#endif /* __SMM__ */
#else
/* SMM Module Loading API */ /* SMM Module Loading API */
/* The smm_loader_params structure provides direction to the SMM loader: /* The smm_loader_params structure provides direction to the SMM loader:
@ -559,8 +557,6 @@ struct smm_loader_params {
/* Both of these return 0 on success, < 0 on failure. */ /* Both of these return 0 on success, < 0 on failure. */
int smm_setup_relocation_handler(struct smm_loader_params *params); int smm_setup_relocation_handler(struct smm_loader_params *params);
int smm_load_module(void *smram, int size, struct smm_loader_params *params); int smm_load_module(void *smram, int size, struct smm_loader_params *params);
#endif /* __SMM__ */
#endif /* CONFIG_SMM_TSEG */
/* Backup and restore default SMM region. */ /* Backup and restore default SMM region. */
void *backup_default_smm_area(void); void *backup_default_smm_area(void);