[coreboot-gerrit] [S] Change in coreboot[master]: soc/intel/apollolake: Skip SMI lockdown on Apollolake

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/68549 )

Change subject: soc/intel/apollolake: Skip SMI lockdown on Apollolake
......................................................................

soc/intel/apollolake: Skip SMI lockdown on Apollolake

Commit d9ef02ce (soc/intel/apollolake: Lock down Global SMI) breaks
SMM/SMI on Apollolake (but not Geminilake), so guard it accordingly.

TEST=build/boot google/reef, verify SMM/SMI/SMMSTORE functional.

Change-Id: I00cbe046b61e6c342f7961670478d0ca8d365c2e
Signed-off-by: Matt DeVillier 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/68549
Tested-by: build bot (Jenkins) 
Reviewed-by: Sean Rhodes 
Reviewed-by: Angel Pons 
---
M src/soc/intel/apollolake/lockdown.c
1 file changed, 21 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Angel Pons: Looks good to me, but someone else must approve
  Sean Rhodes: Looks good to me, approved

diff --git a/src/soc/intel/apollolake/lockdown.c b/src/soc/intel/apollolake/lockdown.c
index e11778b..5de4bdd 100644
--- a/src/soc/intel/apollolake/lockdown.c
+++ b/src/soc/intel/apollolake/lockdown.c
@@ -18,5 +18,6 @@
 void soc_lockdown_config(int chipset_lockdown)
 {
    /* APL only supports CHIPSET_LOCKDOWN_COREBOOT */
-	pmc_lock_smi();
+	if (CONFIG(SOC_INTEL_GEMINILAKE))
+		pmc_lock_smi();
 }