Change in coreboot[master]: soc/intel/braswell: Don't reinitialize SPI after lockdown

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/36006 )

Change subject: soc/intel/braswell: Don't reinitialize SPI after lockdown
......................................................................

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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36006
Reviewed-by: Nico Huber 
Tested-by: build bot (Jenkins) 
---
M src/soc/intel/braswell/smihandler.c
M src/soc/intel/braswell/southcluster.c
2 files changed, 0 insertions(+), 23 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Nico Huber: Looks good to me, approved

diff --git a/src/soc/intel/braswell/smihandler.c b/src/soc/intel/braswell/smihandler.c
index b94fe65..d0306ca 100644
--- a/src/soc/intel/braswell/smihandler.c
+++ b/src/soc/intel/braswell/smihandler.c
@@ -280,22 +280,6 @@
    *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 @@
    	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 9118f00..c233dc8 100644
--- a/src/soc/intel/braswell/southcluster.c
+++ b/src/soc/intel/braswell/southcluster.c
@@ -650,10 +650,6 @@
    	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);