diff options
| -rw-r--r-- | src/cpu/x86/smm/smihandler.c | 11 | ||||
| -rw-r--r-- | src/include/cpu/x86/smi_deprecated.h | 6 | ||||
| -rw-r--r-- | src/include/cpu/x86/smm.h | 2 | ||||
| -rw-r--r-- | src/southbridge/amd/agesa/hudson/smihandler.c | 3 | ||||
| -rw-r--r-- | src/southbridge/amd/pi/hudson/smihandler.c | 3 | ||||
| -rw-r--r-- | src/southbridge/intel/common/smihandler.c | 7 | ||||
| -rw-r--r-- | src/southbridge/intel/i82801dx/smihandler.c | 6 |
7 files changed, 5 insertions, 33 deletions
diff --git a/src/cpu/x86/smm/smihandler.c b/src/cpu/x86/smm/smihandler.c index e4b1d6a622..7e8a9ca9de 100644 --- a/src/cpu/x86/smm/smihandler.c +++ b/src/cpu/x86/smm/smihandler.c @@ -194,9 +194,7 @@ void smi_handler(u32 smm_revision) } /* Call chipset specific SMI handlers. */ - cpu_smi_handler(node, &state_save); - northbridge_smi_handler(node, &state_save); - southbridge_smi_handler(node, &state_save); + southbridge_smi_handler(); smi_restore_pci_address(); @@ -211,12 +209,7 @@ void smi_handler(u32 smm_revision) * weak relocations w/o a symbol have a 0 address which is where the modules * are linked at. */ int __weak mainboard_io_trap_handler(int smif) { return 0; } -void __weak cpu_smi_handler(unsigned int node, - smm_state_save_area_t *state_save) {} -void __weak northbridge_smi_handler(unsigned int node, - smm_state_save_area_t *state_save) {} -void __weak southbridge_smi_handler(unsigned int node, - smm_state_save_area_t *state_save) {} +void __weak southbridge_smi_handler(void) {} void __weak mainboard_smi_gpi(u32 gpi_sts) {} int __weak mainboard_smi_apmc(u8 data) { return 0; } void __weak mainboard_smi_sleep(u8 slp_typ) {} diff --git a/src/include/cpu/x86/smi_deprecated.h b/src/include/cpu/x86/smi_deprecated.h index b5d69dd266..fe73d386c9 100644 --- a/src/include/cpu/x86/smi_deprecated.h +++ b/src/include/cpu/x86/smi_deprecated.h @@ -37,12 +37,6 @@ typedef struct { }; } smm_state_save_area_t; -#if !CONFIG(SMM_TSEG) -void cpu_smi_handler(unsigned int node, smm_state_save_area_t *state_save); -void northbridge_smi_handler(unsigned int node, smm_state_save_area_t *state_save); -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) { } diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h index ebe6f76da4..c3387447d8 100644 --- a/src/include/cpu/x86/smm.h +++ b/src/include/cpu/x86/smm.h @@ -47,11 +47,9 @@ int mainboard_io_trap_handler(int smif); void southbridge_smi_set_eos(void); -#if CONFIG(SMM_TSEG) void cpu_smi_handler(void); void northbridge_smi_handler(void); void southbridge_smi_handler(void); -#endif void smm_setup_structures(void *gnvs, void *tcg, void *smi1); diff --git a/src/southbridge/amd/agesa/hudson/smihandler.c b/src/southbridge/amd/agesa/hudson/smihandler.c index 2b2606d1f4..6ecb7462f0 100644 --- a/src/southbridge/amd/agesa/hudson/smihandler.c +++ b/src/southbridge/amd/agesa/hudson/smihandler.c @@ -20,7 +20,6 @@ #include <arch/io.h> #include <cpu/x86/smm.h> -#include <cpu/x86/smi_deprecated.h> #include "hudson.h" #include "smi.h" @@ -121,7 +120,7 @@ static void process_smi_0x90(void) smi_write32(0x90, status); } -void southbridge_smi_handler(unsigned int node, smm_state_save_area_t *state_save) +void southbridge_smi_handler(void) { const uint16_t smi_src = smi_read16(0x94); diff --git a/src/southbridge/amd/pi/hudson/smihandler.c b/src/southbridge/amd/pi/hudson/smihandler.c index 2b2606d1f4..6ecb7462f0 100644 --- a/src/southbridge/amd/pi/hudson/smihandler.c +++ b/src/southbridge/amd/pi/hudson/smihandler.c @@ -20,7 +20,6 @@ #include <arch/io.h> #include <cpu/x86/smm.h> -#include <cpu/x86/smi_deprecated.h> #include "hudson.h" #include "smi.h" @@ -121,7 +120,7 @@ static void process_smi_0x90(void) smi_write32(0x90, status); } -void southbridge_smi_handler(unsigned int node, smm_state_save_area_t *state_save) +void southbridge_smi_handler(void) { const uint16_t smi_src = smi_read16(0x94); diff --git a/src/southbridge/intel/common/smihandler.c b/src/southbridge/intel/common/smihandler.c index 597f1a7421..daa0959e3b 100644 --- a/src/southbridge/intel/common/smihandler.c +++ b/src/southbridge/intel/common/smihandler.c @@ -23,7 +23,6 @@ #include <device/pci_def.h> #include <cpu/x86/smm.h> #include <cpu/intel/em64t101_save_state.h> -#include <cpu/x86/smi_deprecated.h> #include <elog.h> #include <halt.h> #include <pc80/mc146818rtc.h> @@ -477,14 +476,8 @@ static smi_handler_t southbridge_smi[32] = { /** * @brief Interrupt handler for SMI# - * @param node - * @param state_save */ -#if CONFIG(SMM_TSEG) void southbridge_smi_handler(void) -#else -void cpu_smi_handler(unsigned int node, smm_state_save_area_t *state_save) -#endif { int i, dump = 0; u32 smi_sts; diff --git a/src/southbridge/intel/i82801dx/smihandler.c b/src/southbridge/intel/i82801dx/smihandler.c index 3bfe4024bb..d9720e0c0c 100644 --- a/src/southbridge/intel/i82801dx/smihandler.c +++ b/src/southbridge/intel/i82801dx/smihandler.c @@ -20,7 +20,6 @@ #include <console/console.h> #include <cpu/x86/cache.h> #include <cpu/x86/smm.h> -#include <cpu/x86/smi_deprecated.h> #include <device/pci_def.h> #include "i82801dx.h" @@ -604,10 +603,8 @@ smi_handler_t southbridge_smi[32] = { /** * @brief Interrupt handler for SMI# - * @param node - * @param state_save */ -void southbridge_smi_handler(unsigned int node, smm_state_save_area_t *state_save) +void southbridge_smi_handler(void) { int i, dump = 0; u32 smi_sts; @@ -640,5 +637,4 @@ void southbridge_smi_handler(unsigned int node, smm_state_save_area_t *state_sav if (dump) { dump_smi_status(smi_sts); } - } |