Star Labs has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/52796 )
Change subject: Added LOCKDIS to mark SPI as writable in SKL ......................................................................
Added LOCKDIS to mark SPI as writable in SKL
Signed-off-by: Sean Rhodes sean@starlabs.systems Change-Id: I712972428dd22373d8655ce72d36c0957ee9a900 --- M src/soc/intel/common/pch/include/intelpch/lockdown.h M src/soc/intel/common/pch/lockdown/lockdown.c M src/soc/intel/skylake/chip.c 3 files changed, 3 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/96/52796/1
diff --git a/src/soc/intel/common/pch/include/intelpch/lockdown.h b/src/soc/intel/common/pch/include/intelpch/lockdown.h index 22d7147..32f9ef2 100644 --- a/src/soc/intel/common/pch/include/intelpch/lockdown.h +++ b/src/soc/intel/common/pch/include/intelpch/lockdown.h @@ -9,6 +9,7 @@ * Return values: * 0 = CHIPSET_LOCKDOWN_FSP = use FSP's lockdown functionality to lockdown IPs * 1 = CHIPSET_LOCKDOWN_COREBOOT = Use coreboot to lockdown IPs + * 2 = CHIPSET_LOCKDOWN_COREBOOT_LOCKDIS = Use coreboot but leave lock disabled */ int get_lockdown_config(void);
diff --git a/src/soc/intel/common/pch/lockdown/lockdown.c b/src/soc/intel/common/pch/lockdown/lockdown.c index d9495a4..865233a 100644 --- a/src/soc/intel/common/pch/lockdown/lockdown.c +++ b/src/soc/intel/common/pch/lockdown/lockdown.c @@ -16,6 +16,7 @@ * Return values: * 0 = CHIPSET_LOCKDOWN_FSP = use FSP's lockdown functionality to lockdown IPs * 1 = CHIPSET_LOCKDOWN_COREBOOT = Use coreboot to lockdown IPs + * 2 = CHIPSET_LOCKDOWN_COREBOOT_LOCKDIS = Use coreboot but leave lock disable */ int get_lockdown_config(void) { diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c index d4e8341..aba14e0 100644 --- a/src/soc/intel/skylake/chip.c +++ b/src/soc/intel/skylake/chip.c @@ -420,7 +420,7 @@ * do the changes and then lock it back in coreboot during finalize. */ tconfig->PchSbAccessUnlock = (config->HeciEnabled == 0) ? 1 : 0; - if (get_lockdown_config() == CHIPSET_LOCKDOWN_COREBOOT) { + if (get_lockdown_config() >= CHIPSET_LOCKDOWN_COREBOOT) { tconfig->PchLockDownBiosInterface = 0; params->PchLockDownBiosLock = 0; params->PchLockDownSpiEiss = 0;