From 94464474756f0cacdf04a70b95ec4a0462516a63 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Sat, 13 Jun 2020 13:45:42 +0300 Subject: sb/intel: Clean up some SMI enables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I191ad709fd3c6f906cd34b0053eeaebdb80d410d Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/42354 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Rudolph Reviewed-by: Angel Pons --- src/southbridge/intel/i82801ix/lpc.c | 8 ++------ src/southbridge/intel/i82801ix/smi.c | 9 ++------- 2 files changed, 4 insertions(+), 13 deletions(-) (limited to 'src/southbridge/intel/i82801ix') diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c index 11c153f4e7..732e69a385 100644 --- a/src/southbridge/intel/i82801ix/lpc.c +++ b/src/southbridge/intel/i82801ix/lpc.c @@ -228,12 +228,8 @@ static void i82801ix_power_options(struct device *dev) // another laptop wants this? // reg16 &= ~(1 << 10); // BIOS_PCI_EXP_EN - Desktop/Mobile only reg16 |= (1 << 10); // BIOS_PCI_EXP_EN - Desktop/Mobile only -#if DEBUG_PERIODIC_SMIS - /* Set DEBUG_PERIODIC_SMIS in i82801ix.h to debug using - * periodic SMIs. - */ - reg16 |= (3 << 0); // Periodic SMI every 8s -#endif + if (CONFIG(DEBUG_PERIODIC_SMI)) + reg16 |= (3 << 0); // Periodic SMI every 8s if (config->c5_enable) reg16 |= (1 << 11); /* Enable C5, C6 and PMSYNC# */ pci_write_config16(dev, D31F0_GEN_PMCON_1, reg16); diff --git a/src/southbridge/intel/i82801ix/smi.c b/src/southbridge/intel/i82801ix/smi.c index b8611d0fec..2bbac886ce 100644 --- a/src/southbridge/intel/i82801ix/smi.c +++ b/src/southbridge/intel/i82801ix/smi.c @@ -69,15 +69,10 @@ static void aseg_smm_relocate(void) */ smi_en = 0; /* reset SMI enables */ - smi_en |= TCO_EN; smi_en |= APMC_EN; -#if DEBUG_PERIODIC_SMIS - /* Set DEBUG_PERIODIC_SMIS in i82801ix.h to debug using - * periodic SMIs. - */ - smi_en |= PERIODIC_EN; -#endif + if (CONFIG(DEBUG_PERIODIC_SMI)) + smi_en |= PERIODIC_EN; smi_en |= BIOS_EN; /* The following need to be on for SMIs to happen */ -- cgit v1.2.3