summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-07-12 08:02:35 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-07-13 13:22:15 +0000
commitb4905625eb863b0d3263ec3e2ea3dfe61d11d49d (patch)
treeef4c4222939a231408d8245a6901bbd3bbaeaaf1 /src/soc
parent09e2f6e1ba10b5d75385541266117f2e6b6b975b (diff)
downloadcoreboot-b4905625eb863b0d3263ec3e2ea3dfe61d11d49d.tar.xz
soc,southbridge/intel: Avoid preprocessor with HAVE_SMI_HANDLER
Change-Id: Id375999adad71d95d4968398e90bc3c07f65ea83 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34254 Reviewed-by: Furquan Shaikh <furquan@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/broadwell/lpc.c4
-rw-r--r--src/soc/intel/denverton_ns/romstage.c13
-rw-r--r--src/soc/intel/skylake/cpu.c5
3 files changed, 8 insertions, 14 deletions
diff --git a/src/soc/intel/broadwell/lpc.c b/src/soc/intel/broadwell/lpc.c
index 7679724ece..df1d857a2d 100644
--- a/src/soc/intel/broadwell/lpc.c
+++ b/src/soc/intel/broadwell/lpc.c
@@ -428,13 +428,11 @@ static void pch_cg_init(struct device *dev)
static void pch_set_acpi_mode(void)
{
-#if CONFIG(HAVE_SMI_HANDLER)
- if (!acpi_is_wakeup_s3()) {
+ if (CONFIG(HAVE_SMI_HANDLER) && !acpi_is_wakeup_s3()) {
printk(BIOS_DEBUG, "Disabling ACPI via APMC:\n");
outb(APM_CNT_ACPI_DISABLE, APM_CNT);
printk(BIOS_DEBUG, "done.\n");
}
-#endif /* CONFIG_HAVE_SMI_HANDLER */
}
static void lpc_init(struct device *dev)
diff --git a/src/soc/intel/denverton_ns/romstage.c b/src/soc/intel/denverton_ns/romstage.c
index 6d8eaab9b1..2ad78a02df 100644
--- a/src/soc/intel/denverton_ns/romstage.c
+++ b/src/soc/intel/denverton_ns/romstage.c
@@ -141,12 +141,9 @@ asmlinkage void car_stage_entry(void)
struct postcar_frame pcf;
uintptr_t top_of_ram;
-
-#if CONFIG(HAVE_SMI_HANDLER)
void *smm_base;
size_t smm_size;
uintptr_t tseg_base;
-#endif
console_init();
@@ -177,7 +174,6 @@ asmlinkage void car_stage_entry(void)
/* Cache the memory-mapped boot media. */
postcar_frame_add_romcache(&pcf, MTRR_TYPE_WRPROT);
-#if CONFIG(HAVE_SMI_HANDLER)
/*
* Cache the TSEG region at the top of ram. This region is
* not restricted to SMM mode until SMM has been relocated.
@@ -185,10 +181,11 @@ asmlinkage void car_stage_entry(void)
* when relocating the SMM handler as well as using the TSEG
* region for other purposes.
*/
- smm_region(&smm_base, &smm_size);
- tseg_base = (uintptr_t)smm_base;
- postcar_frame_add_mtrr(&pcf, tseg_base, smm_size, MTRR_TYPE_WRBACK);
-#endif
+ if (CONFIG(HAVE_SMI_HANDLER)) {
+ smm_region(&smm_base, &smm_size);
+ tseg_base = (uintptr_t)smm_base;
+ postcar_frame_add_mtrr(&pcf, tseg_base, smm_size, MTRR_TYPE_WRBACK);
+ }
run_postcar_phase(&pcf);
}
diff --git a/src/soc/intel/skylake/cpu.c b/src/soc/intel/skylake/cpu.c
index a63809bd7e..df08959cc8 100644
--- a/src/soc/intel/skylake/cpu.c
+++ b/src/soc/intel/skylake/cpu.c
@@ -487,9 +487,8 @@ static void post_mp_init(void)
smm_southbridge_enable(GBL_EN);
/* Lock down the SMRAM space. */
-#if CONFIG(HAVE_SMI_HANDLER)
- smm_lock();
-#endif
+ if (CONFIG(HAVE_SMI_HANDLER))
+ smm_lock();
mp_run_on_all_cpus(vmx_configure, NULL, 2 * USECS_PER_MSEC);