sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intel/i82801ix: Rename smm_lock() prototype

Browse Source 
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>
This commit is contained in:
Kyösti Mälkki
2019-07-08 23:25:05 +03:00
parent eac7023f84
commit 571b7b2118
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/southbridge/intel/i82801ix/i82801ix.h
View File

@@ -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)) #define LPC_IS_MOBILE(dev) lpc_is_mobile(pci_read_config16(dev, PCI_DEVICE_ID))
void aseg_smm_lock(void);
#if defined(__PRE_RAM__) #if defined(__PRE_RAM__)
void enable_smbus(void); void enable_smbus(void);
int smbus_read_byte(unsigned device, unsigned address); int smbus_read_byte(unsigned device, unsigned address);

7
src/southbridge/intel/i82801ix/lpc.c
View File

@@ -366,7 +366,6 @@ static void enable_clock_gating(void)
RCBA32(0x38c0) |= 7; RCBA32(0x38c0) |= 7;
} }
#if CONFIG(HAVE_SMI_HANDLER)
static void i82801ix_lock_smm(struct device *dev) static void i82801ix_lock_smm(struct device *dev)
{ {
if (!acpi_is_wakeup_s3()) { if (!acpi_is_wakeup_s3()) {
@@ -387,9 +386,8 @@ static void i82801ix_lock_smm(struct device *dev)
* userspace applications to deceive us: * userspace applications to deceive us:
*/ */
if (!CONFIG(PARALLEL_MP)) if (!CONFIG(PARALLEL_MP))
smm_lock(); aseg_smm_lock();
} }
#endif
static void lpc_init(struct device *dev) 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) */ /* Interrupt 9 should be level triggered (SCI) */
i8259_configure_irq_trigger(9, 1); i8259_configure_irq_trigger(9, 1);
#if CONFIG(HAVE_SMI_HANDLER) if (CONFIG(HAVE_SMI_HANDLER))
i82801ix_lock_smm(dev); i82801ix_lock_smm(dev);
#endif
} }
static void i82801ix_lpc_read_resources(struct device *dev) static void i82801ix_lpc_read_resources(struct device *dev)

2
src/southbridge/intel/i82801ix/smi.c
View File

@@ -171,7 +171,7 @@ void smm_init_completion(void)
restore_default_smm_area(default_smm_area); 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. /* LOCK the SMM memory window and enable normal SMM.
* After running this function, only a full reset can * After running this function, only a full reset can