summaryrefslogtreecommitdiff
path: root/src/southbridge/intel
diff options
context:
space:
mode:
Diffstat (limited to 'src/southbridge/intel')
-rw-r--r--src/southbridge/intel/common/smi.c4
-rw-r--r--src/southbridge/intel/lynxpoint/pch.h8
-rw-r--r--src/southbridge/intel/lynxpoint/smi.c9
3 files changed, 7 insertions, 14 deletions
diff --git a/src/southbridge/intel/common/smi.c b/src/southbridge/intel/common/smi.c
index dafb732d79..1348174389 100644
--- a/src/southbridge/intel/common/smi.c
+++ b/src/southbridge/intel/common/smi.c
@@ -34,7 +34,7 @@ u16 get_pmbase(void)
return lpc_get_pmbase();
}
-void southbridge_smm_init(void)
+void smm_southbridge_enable_smi(void)
{
u32 smi_en;
u16 pm1_en;
@@ -123,7 +123,7 @@ void smm_setup_structures(void *gnvs, void *tcg, void *smi1)
);
}
-void southbridge_smm_clear_state(void)
+void smm_southbridge_clear_state(void)
{
u32 smi_en;
diff --git a/src/southbridge/intel/lynxpoint/pch.h b/src/southbridge/intel/lynxpoint/pch.h
index 626d22d57f..540a4d3574 100644
--- a/src/southbridge/intel/lynxpoint/pch.h
+++ b/src/southbridge/intel/lynxpoint/pch.h
@@ -183,14 +183,6 @@ void pch_log_state(void);
void acpi_create_intel_hpet(acpi_hpet_t * hpet);
void acpi_create_serialio_ssdt(acpi_header_t *ssdt);
-/* These helpers are for performing SMM relocation. */
-void southbridge_trigger_smi(void);
-void southbridge_clear_smi_status(void);
-/* The initialization of the southbridge is split into 2 compoments. One is
- * for clearing the state in the SMM registers. The other is for enabling
- * SMIs. They are split so that other work between the 2 actions. */
-void southbridge_smm_clear_state(void);
-void southbridge_smm_enable_smi(void);
#else
void enable_smbus(void);
void enable_usb_bar(void);
diff --git a/src/southbridge/intel/lynxpoint/smi.c b/src/southbridge/intel/lynxpoint/smi.c
index 3a6c4038c8..4fb00b507a 100644
--- a/src/southbridge/intel/lynxpoint/smi.c
+++ b/src/southbridge/intel/lynxpoint/smi.c
@@ -19,12 +19,13 @@
#include <device/pci.h>
#include <console/console.h>
#include <arch/io.h>
+#include <cpu/intel/smm_reloc.h>
#include <cpu/x86/cache.h>
#include <cpu/x86/smm.h>
#include "pch.h"
-void southbridge_smm_clear_state(void)
+void smm_southbridge_clear_state(void)
{
u32 smi_en;
@@ -50,7 +51,7 @@ void southbridge_smm_clear_state(void)
clear_gpe_status();
}
-void southbridge_smm_enable_smi(void)
+void smm_southbridge_enable_smi(void)
{
printk(BIOS_DEBUG, "Enabling SMIs.\n");
/* Configure events */
@@ -68,7 +69,7 @@ void southbridge_smm_enable_smi(void)
enable_smi(APMC_EN | SLP_SMI_EN | GBL_SMI_EN | EOS);
}
-void southbridge_trigger_smi(void)
+static void __unused southbridge_trigger_smi(void)
{
/**
* There are several methods of raising a controlled SMI# via
@@ -88,7 +89,7 @@ void southbridge_trigger_smi(void)
outb(0x00, 0xb2);
}
-void southbridge_clear_smi_status(void)
+static void __unused southbridge_clear_smi_status(void)
{
/* Clear SMI status */
clear_smi_status();