summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2019-10-13 23:14:08 +0200
committerPatrick Georgi <pgeorgi@google.com>2019-11-29 09:38:39 +0000
commit91eb2816faa4b2689f30ca47ff2585cf79ac53f3 (patch)
tree884a89ddf4fee54cdf1e6df1a0845482b5ee6554 /src
parent56d913eedb2f4f0df0b2210f139d857a829bdf96 (diff)
soc/intel/braswell: 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: I9fae28185470f4d25ef1818627eb76ac38cf100b Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36006 Reviewed-by: Nico Huber <nico.h@gmx.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
-rw-r--r--src/soc/intel/braswell/smihandler.c19
-rw-r--r--src/soc/intel/braswell/southcluster.c4
2 files changed, 0 insertions, 23 deletions
diff --git a/src/soc/intel/braswell/smihandler.c b/src/soc/intel/braswell/smihandler.c
index b94fe653ad..d0306caaa3 100644
--- a/src/soc/intel/braswell/smihandler.c
+++ b/src/soc/intel/braswell/smihandler.c
@@ -280,22 +280,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)
{
uint8_t reg8;
@@ -347,9 +331,6 @@ static void southbridge_smi_apmc(void)
if (CONFIG(ELOG_GSMI))
southbridge_smi_gsmi();
break;
- case APM_CNT_FINALIZE:
- finalize();
- break;
}
mainboard_smi_apmc(reg8);
diff --git a/src/soc/intel/braswell/southcluster.c b/src/soc/intel/braswell/southcluster.c
index 9118f00a66..c233dc8172 100644
--- a/src/soc/intel/braswell/southcluster.c
+++ b/src/soc/intel/braswell/southcluster.c
@@ -650,10 +650,6 @@ static void finalize_chipset(void *unused)
write32(spi + UVSCC, cfg.uvscc);
write32(spi + LVSCC, cfg.lvscc | VCL);
}
- spi_init();
-
- printk(BIOS_DEBUG, "Finalizing SMM.\n");
- outb(APM_CNT_FINALIZE, APM_CNT);
}
BOOT_STATE_INIT_ENTRY(BS_POST_DEVICE, BS_ON_EXIT, finalize_chipset, NULL);