Change in coreboot[master]: intel/i82801ix: Refactor lock_smm()

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

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

Change subject: intel/i82801ix: Refactor lock_smm()
......................................................................

intel/i82801ix: Refactor lock_smm()

Move the SMM lock outside the function as it is renamed.
Replace conditional !PARALLEL_MP with SMM_ASEG to better
reflect the use.

Change-Id: I93bf0d2f711f94a5bb741bdcd92c1e0fec228684
Signed-off-by: Kyösti Mälkki 
---
M src/southbridge/intel/i82801ix/lpc.c
1 file changed, 8 insertions(+), 7 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/02/34302/1

diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c
index 546fbce..ba2b028 100644
--- a/src/southbridge/intel/i82801ix/lpc.c
+++ b/src/southbridge/intel/i82801ix/lpc.c
@@ -366,7 +366,7 @@
    RCBA32(0x38c0) |= 7;
 }

-static void i82801ix_lock_smm(struct device *dev)
+static void i82801ix_set_acpi_mode(struct device *dev)
 {
    if (!acpi_is_wakeup_s3()) {
 #if ENABLE_ACPI_MODE_IN_COREBOOT
@@ -382,11 +382,6 @@
    	printk(BIOS_DEBUG, "S3 wakeup, enabling ACPI via APMC\n");
    	outb(APM_CNT_ACPI_ENABLE, APM_CNT);
    }
-	/* Don't allow evil boot loaders, kernels, or
-	 * userspace applications to deceive us:
-	 */
-	if (!CONFIG(PARALLEL_MP))
-		aseg_smm_lock();
 }

static void lpc_init(struct device *dev)
@@ -430,7 +425,13 @@
    i8259_configure_irq_trigger(9, 1);

if (CONFIG(HAVE_SMI_HANDLER))
-		i82801ix_lock_smm(dev);
+		i82801ix_set_acpi_mode(dev);
+
+	/* Don't allow evil boot loaders, kernels, or
+	 * userspace applications to deceive us:
+	 */
+	if (CONFIG(HAVE_SMI_HANDLER) && CONFIG(SMM_ASEG))
+		aseg_smm_lock();
 }

static void i82801ix_lpc_read_resources(struct device *dev)

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34302 )

Change subject: intel/i82801ix: Refactor lock_smm()
......................................................................

Patch Set 1: Code-Review+1

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34302 )

Change subject: intel/i82801ix: Refactor lock_smm()
......................................................................

Patch Set 1: Code-Review+2

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

Kyösti Mälkki has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34302 )

Change subject: intel/i82801ix: Refactor lock_smm()
......................................................................

intel/i82801ix: Refactor lock_smm()

Move the SMM lock outside the function as it is renamed.
Replace conditional !PARALLEL_MP with SMM_ASEG to better
reflect the use.

Change-Id: I93bf0d2f711f94a5bb741bdcd92c1e0fec228684
Signed-off-by: Kyösti Mälkki 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34302
Tested-by: build bot (Jenkins) 
Reviewed-by: Paul Menzel 
Reviewed-by: Angel Pons 
---
M src/southbridge/intel/i82801ix/lpc.c
1 file changed, 8 insertions(+), 7 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Paul Menzel: Looks good to me, but someone else must approve
  Angel Pons: Looks good to me, approved

diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c
index 546fbce..ba2b028 100644
--- a/src/southbridge/intel/i82801ix/lpc.c
+++ b/src/southbridge/intel/i82801ix/lpc.c
@@ -366,7 +366,7 @@
    RCBA32(0x38c0) |= 7;
 }

-static void i82801ix_lock_smm(struct device *dev)
+static void i82801ix_set_acpi_mode(struct device *dev)
 {
    if (!acpi_is_wakeup_s3()) {
 #if ENABLE_ACPI_MODE_IN_COREBOOT
@@ -382,11 +382,6 @@
    	printk(BIOS_DEBUG, "S3 wakeup, enabling ACPI via APMC\n");
    	outb(APM_CNT_ACPI_ENABLE, APM_CNT);
    }
-	/* Don't allow evil boot loaders, kernels, or
-	 * userspace applications to deceive us:
-	 */
-	if (!CONFIG(PARALLEL_MP))
-		aseg_smm_lock();
 }

static void lpc_init(struct device *dev)
@@ -430,7 +425,13 @@
    i8259_configure_irq_trigger(9, 1);

if (CONFIG(HAVE_SMI_HANDLER))
-		i82801ix_lock_smm(dev);
+		i82801ix_set_acpi_mode(dev);
+
+	/* Don't allow evil boot loaders, kernels, or
+	 * userspace applications to deceive us:
+	 */
+	if (CONFIG(HAVE_SMI_HANDLER) && CONFIG(SMM_ASEG))
+		aseg_smm_lock();
 }

static void i82801ix_lpc_read_resources(struct device *dev)