diff options
author | Vladimir Serbinenko <phcoder@gmail.com> | 2015-05-28 21:09:31 +0200 |
---|---|---|
committer | Vladimir Serbinenko <phcoder@gmail.com> | 2015-05-28 22:07:58 +0200 |
commit | 44cbe10f592965d7611d8624f94f2952d42eba35 (patch) | |
tree | 4da983e52c73cc30653c18946fe6afdd014cb0f7 /src/cpu/x86/smm/smihandler.c | |
parent | beb45020ace2b2d3f6cf4b88f9e7218c33a6225b (diff) |
smm: Merge configs SMM_MODULES and SMM_TSEG
SMM_TSEG now implies SMM_MODULES and SMM_MODULES can't be used without SMM_TSEG
Remove some newly dead code while on it.
Change-Id: I2e1818245170b1e0abbd853bedf856cec83b92f2
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/10355
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/cpu/x86/smm/smihandler.c')
-rw-r--r-- | src/cpu/x86/smm/smihandler.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/cpu/x86/smm/smihandler.c b/src/cpu/x86/smm/smihandler.c index 2387f6e8b7..9c282c3d56 100644 --- a/src/cpu/x86/smm/smihandler.c +++ b/src/cpu/x86/smm/smihandler.c @@ -29,7 +29,6 @@ static int do_driver_init = 1; -#if !CONFIG_SMM_TSEG /* TSEG handler locks in assembly */ typedef enum { SMI_LOCKED, SMI_UNLOCKED } smi_semaphore; /* SMI multiprocessing semaphore */ @@ -61,7 +60,6 @@ void smi_release_lock(void) : "eax" ); } -#endif #define LAPIC_ID 0xfee00020 static inline __attribute__((always_inline)) unsigned long nodeid(void) @@ -129,12 +127,6 @@ void smi_handler(u32 smm_revision) smm_state_save_area_t state_save; u32 smm_base = 0xa0000; /* ASEG */ -#if CONFIG_SMM_TSEG - /* Update global variable TSEG base */ - if (!smi_get_tseg_base()) - return; - smm_base = smi_get_tseg_base(); -#else /* Are we ok to execute the handler? */ if (!smi_obtain_lock()) { /* For security reasons we don't release the other CPUs @@ -147,7 +139,6 @@ void smi_handler(u32 smm_revision) } return; } -#endif smi_backup_pci_address(); @@ -204,9 +195,7 @@ void smi_handler(u32 smm_revision) smi_restore_pci_address(); -#if !CONFIG_SMM_TSEG smi_release_lock(); -#endif /* De-assert SMI# signal to allow another SMI */ smi_set_eos(); |