summaryrefslogtreecommitdiff
path: root/src/southbridge
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-08-10 15:32:03 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-08-13 14:00:06 +0000
commit1ef039bb4965213c87b844ca30482853fb86b418 (patch)
tree444e9b959f2ea4afee59a4abe772963d4d6c9d5b /src/southbridge
parentc4fdb7b923f82e31a687fc01f7176ad05ab51689 (diff)
cpu/x86: Change old-style SMI handler prototypes
Change-Id: Ic1e3cae5298997b552020b78e6ff56d60cf22036 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34821 Reviewed-by: Arthur Heymans <arthur@aheymans.xyz> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/southbridge')
-rw-r--r--src/southbridge/amd/agesa/hudson/smihandler.c3
-rw-r--r--src/southbridge/amd/pi/hudson/smihandler.c3
-rw-r--r--src/southbridge/intel/common/smihandler.c7
-rw-r--r--src/southbridge/intel/i82801dx/smihandler.c6
4 files changed, 3 insertions, 16 deletions
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);
}
-
}