From 1ef039bb4965213c87b844ca30482853fb86b418 Mon Sep 17 00:00:00 2001
From: Kyösti Mälkki <kyosti.malkki@gmail.com>
Date: Sat, 10 Aug 2019 15:32:03 +0300
Subject: cpu/x86: Change old-style SMI handler prototypes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/southbridge/amd/agesa/hudson/smihandler.c | 3 +--
 src/southbridge/amd/pi/hudson/smihandler.c    | 3 +--
 src/southbridge/intel/common/smihandler.c     | 7 -------
 src/southbridge/intel/i82801dx/smihandler.c   | 6 +-----
 4 files changed, 3 insertions(+), 16 deletions(-)

(limited to 'src/southbridge')

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);
 	}
-
 }
-- 
cgit v1.2.3