summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2019-10-13 23:04:19 +0200
committerNico Huber <nico.h@gmx.de>2019-11-10 22:41:33 +0000
commit5efee3a2c28aa7e53074288733632fa06ac66046 (patch)
tree2e8c18cb1d18cdbc9c833cf794caabac10e3ec1b /src/soc
parent95755dd65d18955e375345f06da7966f137e7d62 (diff)
downloadcoreboot-5efee3a2c28aa7e53074288733632fa06ac66046.tar.xz
soc/intel/broadwell: Don't reinitialize SPI after lockdown
With the common southbridge SPI code reinitialization after lockdown is not necessary, hence the SMM finalize call becomes a no-op. Change-Id: I4d7c6ba91dc9f0e0ce4e3228fdf859d5f3d5abf4 Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36004 Reviewed-by: Nico Huber <nico.h@gmx.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/broadwell/finalize.c6
-rw-r--r--src/soc/intel/broadwell/smihandler.c19
2 files changed, 0 insertions, 25 deletions
diff --git a/src/soc/intel/broadwell/finalize.c b/src/soc/intel/broadwell/finalize.c
index 06cc18d67a..10ba1d7c15 100644
--- a/src/soc/intel/broadwell/finalize.c
+++ b/src/soc/intel/broadwell/finalize.c
@@ -112,12 +112,6 @@ static void broadwell_finalize(void *unused)
MCHBAR32(0x6008) = MCHBAR32(0x6008);
RCBA32(0x21a4) = RCBA32(0x21a4);
- /* Re-init SPI after lockdown */
- spi_init();
-
- printk(BIOS_DEBUG, "Finalizing SMM.\n");
- outb(APM_CNT_FINALIZE, APM_CNT);
-
/* Indicate finalize step with post code */
post_code(POST_OS_BOOT);
}
diff --git a/src/soc/intel/broadwell/smihandler.c b/src/soc/intel/broadwell/smihandler.c
index d37f65a16f..ca99487eb5 100644
--- a/src/soc/intel/broadwell/smihandler.c
+++ b/src/soc/intel/broadwell/smihandler.c
@@ -312,22 +312,6 @@ static void southbridge_smi_gsmi(void)
*ret = gsmi_exec(sub_command, param);
}
-static void finalize(void)
-{
- static int finalize_done;
-
- if (finalize_done) {
- printk(BIOS_DEBUG, "SMM already finalized.\n");
- return;
- }
- finalize_done = 1;
-
-#if CONFIG(SPI_FLASH_SMM)
- /* Re-init SPI driver to handle locked BAR */
- spi_init();
-#endif
-}
-
static void southbridge_smi_apmc(void)
{
u8 reg8;
@@ -351,9 +335,6 @@ static void southbridge_smi_apmc(void)
enable_pm1_control(SCI_EN);
printk(BIOS_DEBUG, "SMI#: ACPI enabled.\n");
break;
- case APM_CNT_FINALIZE:
- finalize();
- break;
case APM_CNT_GNVS_UPDATE:
if (smm_initialized) {
printk(BIOS_DEBUG,