[coreboot-gerrit] Change in coreboot[master]: [WIP] intel/i8280ix,i8280jx: Rename lock_smm()

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/34256 )

Change subject: [WIP] intel/i8280ix,i8280jx: Rename lock_smm()
......................................................................

[WIP] intel/i8280ix,i8280jx: Rename lock_smm()

Change-Id: I2db78fe99aa1d46c5e7bcef99a37619301c98914
Signed-off-by: Kyösti Mälkki 
---
M src/southbridge/intel/i82801gx/lpc.c
M src/southbridge/intel/i82801jx/lpc.c
2 files changed, 6 insertions(+), 12 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/56/34256/1

diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c
index 6236ebd..f13270b 100644
--- a/src/southbridge/intel/i82801gx/lpc.c
+++ b/src/southbridge/intel/i82801gx/lpc.c
@@ -331,10 +331,9 @@
    RCBA32(CG) = reg32;
 }

-#if CONFIG(HAVE_SMI_HANDLER)
 static void i82801gx_lock_smm(struct device *dev)
 {
-	if (!acpi_is_wakeup_s3()) {
+	if (CONFIG(HAVE_SMI_HANDLER) && !acpi_is_wakeup_s3()) {
 #if ENABLE_ACPI_MODE_IN_COREBOOT
    	printk(BIOS_DEBUG, "Enabling ACPI via APMC:\n");
    	outb(APM_CNT_ACPI_ENABLE, APM_CNT); // Enable ACPI mode
@@ -349,7 +348,6 @@
    	outb(APM_CNT_ACPI_ENABLE, APM_CNT);
    }
 }
-#endif

#define SPIBASE 0x3020
 static void i82801gx_spi_init(void)
@@ -415,9 +413,8 @@
    /* Interrupt 9 should be level triggered (SCI) */
    i8259_configure_irq_trigger(9, 1);

-#if CONFIG(HAVE_SMI_HANDLER)
-	i82801gx_lock_smm(dev);
-#endif
+	if (CONFIG(HAVE_SMI_HANDLER))
+		i82801gx_lock_smm(dev);

i82801gx_spi_init();

diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c
index 5373ba2..c894d56 100644
--- a/src/southbridge/intel/i82801jx/lpc.c
+++ b/src/southbridge/intel/i82801jx/lpc.c
@@ -371,10 +371,9 @@
    RCBA32(0x38c0) |= 7;
 }

-#if CONFIG(HAVE_SMI_HANDLER)
 static void i82801jx_lock_smm(struct device *dev)
 {
-	if (!acpi_is_wakeup_s3()) {
+	if (CONFIG(HAVE_SMI_HANDLER) && !acpi_is_wakeup_s3()) {
 #if ENABLE_ACPI_MODE_IN_COREBOOT
    	printk(BIOS_DEBUG, "Enabling ACPI via APMC:\n");
    	outb(APM_CNT_ACPI_ENABLE, APM_CNT); // Enable ACPI mode
@@ -389,7 +388,6 @@
    	outb(APM_CNT_ACPI_ENABLE, APM_CNT);
    }
 }
-#endif

static void lpc_init(struct device *dev)
 {
@@ -431,9 +429,8 @@
    /* Interrupt 9 should be level triggered (SCI) */
    i8259_configure_irq_trigger(9, 1);

-#if CONFIG(HAVE_SMI_HANDLER)
-	i82801jx_lock_smm(dev);
-#endif
+	if (CONFIG(HAVE_SMI_HANDLER))
+		i82801jx_lock_smm(dev);
 }

unsigned long acpi_fill_madt(unsigned long current)