summaryrefslogtreecommitdiff
path: root/src/southbridge
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-07-08 23:25:05 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-07-10 09:21:32 +0000
commit571b7b211893e09c05287dda773579d367df548c (patch)
treea0e02006b79e84c127848d0789f6cf3320524b8f /src/southbridge
parenteac7023f848599f023cc07a95a32040da711a700 (diff)
downloadcoreboot-571b7b211893e09c05287dda773579d367df548c.tar.xz
intel/i82801ix: Rename smm_lock() prototype
This southbridge code may be built with either ASEG or TSEG. Fix minor collision in namespaces. Change-Id: I04f90fb308c280621a3037fee4bece1e5655480e Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34153 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Diffstat (limited to 'src/southbridge')
-rw-r--r--src/southbridge/intel/i82801ix/i82801ix.h2
-rw-r--r--src/southbridge/intel/i82801ix/lpc.c9
-rw-r--r--src/southbridge/intel/i82801ix/smi.c2
3 files changed, 6 insertions, 7 deletions
diff --git a/src/southbridge/intel/i82801ix/i82801ix.h b/src/southbridge/intel/i82801ix/i82801ix.h
index 421a101bdc..31eabb6e42 100644
--- a/src/southbridge/intel/i82801ix/i82801ix.h
+++ b/src/southbridge/intel/i82801ix/i82801ix.h
@@ -212,6 +212,8 @@ static inline int lpc_is_mobile(const u16 devid)
}
#define LPC_IS_MOBILE(dev) lpc_is_mobile(pci_read_config16(dev, PCI_DEVICE_ID))
+void aseg_smm_lock(void);
+
#if defined(__PRE_RAM__)
void enable_smbus(void);
int smbus_read_byte(unsigned device, unsigned address);
diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c
index c7de2a14df..546fbced77 100644
--- a/src/southbridge/intel/i82801ix/lpc.c
+++ b/src/southbridge/intel/i82801ix/lpc.c
@@ -366,7 +366,6 @@ static void enable_clock_gating(void)
RCBA32(0x38c0) |= 7;
}
-#if CONFIG(HAVE_SMI_HANDLER)
static void i82801ix_lock_smm(struct device *dev)
{
if (!acpi_is_wakeup_s3()) {
@@ -387,9 +386,8 @@ static void i82801ix_lock_smm(struct device *dev)
* userspace applications to deceive us:
*/
if (!CONFIG(PARALLEL_MP))
- smm_lock();
+ aseg_smm_lock();
}
-#endif
static void lpc_init(struct device *dev)
{
@@ -431,9 +429,8 @@ static void lpc_init(struct device *dev)
/* Interrupt 9 should be level triggered (SCI) */
i8259_configure_irq_trigger(9, 1);
-#if CONFIG(HAVE_SMI_HANDLER)
- i82801ix_lock_smm(dev);
-#endif
+ if (CONFIG(HAVE_SMI_HANDLER))
+ i82801ix_lock_smm(dev);
}
static void i82801ix_lpc_read_resources(struct device *dev)
diff --git a/src/southbridge/intel/i82801ix/smi.c b/src/southbridge/intel/i82801ix/smi.c
index a9d5e7dc08..5d898cc3c6 100644
--- a/src/southbridge/intel/i82801ix/smi.c
+++ b/src/southbridge/intel/i82801ix/smi.c
@@ -171,7 +171,7 @@ void smm_init_completion(void)
restore_default_smm_area(default_smm_area);
}
-void smm_lock(void)
+void aseg_smm_lock(void)
{
/* LOCK the SMM memory window and enable normal SMM.
* After running this function, only a full reset can