Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/34153 )
Change subject: intel/i82801ix: Rename smm_lock() prototype ......................................................................
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 --- M src/southbridge/intel/i82801ix/i82801ix.h M src/southbridge/intel/i82801ix/lpc.c M src/southbridge/intel/i82801ix/smi.c 3 files changed, 6 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/53/34153/1
diff --git a/src/southbridge/intel/i82801ix/i82801ix.h b/src/southbridge/intel/i82801ix/i82801ix.h index 421a101..31eabb6 100644 --- a/src/southbridge/intel/i82801ix/i82801ix.h +++ b/src/southbridge/intel/i82801ix/i82801ix.h @@ -212,6 +212,8 @@ } #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 c7de2a1..546fbce 100644 --- a/src/southbridge/intel/i82801ix/lpc.c +++ b/src/southbridge/intel/i82801ix/lpc.c @@ -366,7 +366,6 @@ 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 @@ * 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 @@ /* 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 a9d5e7d..5d898cc 100644 --- a/src/southbridge/intel/i82801ix/smi.c +++ b/src/southbridge/intel/i82801ix/smi.c @@ -171,7 +171,7 @@ 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
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34153 )
Change subject: intel/i82801ix: Rename smm_lock() prototype ......................................................................
Patch Set 1: Code-Review+1
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34153 )
Change subject: intel/i82801ix: Rename smm_lock() prototype ......................................................................
Patch Set 1: Code-Review+2
Kyösti Mälkki has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34153 )
Change subject: intel/i82801ix: Rename smm_lock() prototype ......................................................................
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 --- M src/southbridge/intel/i82801ix/i82801ix.h M src/southbridge/intel/i82801ix/lpc.c M src/southbridge/intel/i82801ix/smi.c 3 files changed, 6 insertions(+), 7 deletions(-)
Approvals: build bot (Jenkins): Verified Paul Menzel: Looks good to me, but someone else must approve Arthur Heymans: Looks good to me, approved
diff --git a/src/southbridge/intel/i82801ix/i82801ix.h b/src/southbridge/intel/i82801ix/i82801ix.h index 421a101..31eabb6 100644 --- a/src/southbridge/intel/i82801ix/i82801ix.h +++ b/src/southbridge/intel/i82801ix/i82801ix.h @@ -212,6 +212,8 @@ } #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 c7de2a1..546fbce 100644 --- a/src/southbridge/intel/i82801ix/lpc.c +++ b/src/southbridge/intel/i82801ix/lpc.c @@ -366,7 +366,6 @@ 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 @@ * 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 @@ /* 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 a9d5e7d..5d898cc 100644 --- a/src/southbridge/intel/i82801ix/smi.c +++ b/src/southbridge/intel/i82801ix/smi.c @@ -171,7 +171,7 @@ 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
-
Arthur Heymans (Code Review) -
Kyösti Mälkki (Code Review)
-
Paul Menzel (Code Review)