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

intel/i82801gx,i82801jx: Rename lock_smm()

Browse Source 
With PARALLEL_MP the lock has been moved elsewhere.

Change-Id: I2db78fe99aa1d46c5e7bcef99a37619301c98914
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34256
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Kyösti Mälkki
2019-07-12 08:16:53 +03:00
parent f44f331e16
commit 83d6a8a30c
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/southbridge/intel/i82801gx/lpc.c
View File

@ -331,8 +331,7 @@ static void enable_clock_gating(void)
RCBA32(CG) = reg32; RCBA32(CG) = reg32;
} }
#if CONFIG(HAVE_SMI_HANDLER) static void i82801gx_set_acpi_mode(struct device *dev)
static void i82801gx_lock_smm(struct device *dev)
{ {
if (!acpi_is_wakeup_s3()) { if (!acpi_is_wakeup_s3()) {
#if ENABLE_ACPI_MODE_IN_COREBOOT #if ENABLE_ACPI_MODE_IN_COREBOOT
@ -349,7 +348,6 @@ static void i82801gx_lock_smm(struct device *dev)
outb(APM_CNT_ACPI_ENABLE, APM_CNT); outb(APM_CNT_ACPI_ENABLE, APM_CNT);
} }
} }
#endif
#define SPIBASE 0x3020 #define SPIBASE 0x3020
static void i82801gx_spi_init(void) static void i82801gx_spi_init(void)
@ -415,9 +413,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))
i82801gx_lock_smm(dev); i82801gx_set_acpi_mode(dev);
#endif
i82801gx_spi_init(); i82801gx_spi_init();

9
src/southbridge/intel/i82801jx/lpc.c
View File

@ -371,8 +371,7 @@ static void enable_clock_gating(void)
RCBA32(0x38c0) |= 7; RCBA32(0x38c0) |= 7;
} }
#if CONFIG(HAVE_SMI_HANDLER) static void i82801jx_set_acpi_mode(struct device *dev)
static void i82801jx_lock_smm(struct device *dev)
{ {
if (!acpi_is_wakeup_s3()) { if (!acpi_is_wakeup_s3()) {
#if ENABLE_ACPI_MODE_IN_COREBOOT #if ENABLE_ACPI_MODE_IN_COREBOOT
@ -389,7 +388,6 @@ static void i82801jx_lock_smm(struct device *dev)
outb(APM_CNT_ACPI_ENABLE, APM_CNT); outb(APM_CNT_ACPI_ENABLE, APM_CNT);
} }
} }
#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))
i82801jx_lock_smm(dev); i82801jx_set_acpi_mode(dev);
#endif
} }
unsigned long acpi_fill_madt(unsigned long current) unsigned long acpi_fill_madt(unsigned long current)