GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Arthur Heymans 2019-10-13 23:04:19 +02:00 committed by Nico Huber
parent 95755dd65d
commit 5efee3a2c2
2 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/soc/intel/broadwell/finalize.c
View File

@ -112,12 +112,6 @@ static void broadwell_finalize(void *unused)
MCHBAR32(0x6008) = MCHBAR32(0x6008); MCHBAR32(0x6008) = MCHBAR32(0x6008);
RCBA32(0x21a4) = RCBA32(0x21a4); 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 */ /* Indicate finalize step with post code */
post_code(POST_OS_BOOT); post_code(POST_OS_BOOT);
} }

19
src/soc/intel/broadwell/smihandler.c
View File

@ -312,22 +312,6 @@ static void southbridge_smi_gsmi(void)
*ret = gsmi_exec(sub_command, param); *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) static void southbridge_smi_apmc(void)
{ {
u8 reg8; u8 reg8;
@ -351,9 +335,6 @@ static void southbridge_smi_apmc(void)
enable_pm1_control(SCI_EN); enable_pm1_control(SCI_EN);
printk(BIOS_DEBUG, "SMI#: ACPI enabled.\n"); printk(BIOS_DEBUG, "SMI#: ACPI enabled.\n");
break; break;
case APM_CNT_FINALIZE:
finalize();
break;
case APM_CNT_GNVS_UPDATE: case APM_CNT_GNVS_UPDATE:
if (smm_initialized) { if (smm_initialized) {
printk(BIOS_DEBUG, printk(BIOS_DEBUG,