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

[Nico Huber (Code Review)]

Nico Huber has submitted this change. ( https://review.coreboot.org/c/coreboot/+/36004 )

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

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

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

diff --git a/src/soc/intel/broadwell/finalize.c b/src/soc/intel/broadwell/finalize.c
index 06cc18d..10ba1d7 100644
--- a/src/soc/intel/broadwell/finalize.c
+++ b/src/soc/intel/broadwell/finalize.c
@@ -112,12 +112,6 @@
    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 d37f65a..ca99487 100644
--- a/src/soc/intel/broadwell/smihandler.c
+++ b/src/soc/intel/broadwell/smihandler.c
@@ -312,22 +312,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)
 {
    u8 reg8;
@@ -351,9 +335,6 @@
    	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,