summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-07-08 09:16:13 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-07-09 12:44:39 +0000
commit8f076f2be8ed0671c226fed1403183e6ad9fb83e (patch)
tree1bda09ad5c534df60217b79a7ce261ed0e8ec213 /src/soc
parent60012ac64e4b1ecc0d9a1b6fd497020dfd70a31e (diff)
downloadcoreboot-8f076f2be8ed0671c226fed1403183e6ad9fb83e.tar.xz
soc/amd/stoneyridge,picasso: Switch SMM lock condition
SMM_TSEG is a qualifier between TSEG and ASEG memory region. ASEG is deprecated and not supported for this platform in coreboot codebase. The SMM lock should be set based on whether SMM is installed or not, HAVE_SMI_HANDLER currently tells that. Change-Id: I9756f8a59ccfedd59d5b997b35313452dd0c4f46 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34127 Reviewed-by: Richard Spiegel <richard.spiegel@silverbackltd.com> Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com> Reviewed-by: Furquan Shaikh <furquan@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/amd/picasso/finalize.c2
-rw-r--r--src/soc/amd/stoneyridge/finalize.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/soc/amd/picasso/finalize.c b/src/soc/amd/picasso/finalize.c
index 6572e1a201..5a4627a432 100644
--- a/src/soc/amd/picasso/finalize.c
+++ b/src/soc/amd/picasso/finalize.c
@@ -29,7 +29,7 @@ static void per_core_finalize(void *unused)
if (hwcr.lo & SMM_LOCK) /* Skip if already locked, avoid GPF */
return;
- if (CONFIG(SMM_TSEG)) {
+ if (CONFIG(HAVE_SMI_HANDLER)) {
mask = rdmsr(SMM_MASK_MSR);
mask.lo |= SMM_TSEG_VALID;
wrmsr(SMM_MASK_MSR, mask);
diff --git a/src/soc/amd/stoneyridge/finalize.c b/src/soc/amd/stoneyridge/finalize.c
index 6572e1a201..5a4627a432 100644
--- a/src/soc/amd/stoneyridge/finalize.c
+++ b/src/soc/amd/stoneyridge/finalize.c
@@ -29,7 +29,7 @@ static void per_core_finalize(void *unused)
if (hwcr.lo & SMM_LOCK) /* Skip if already locked, avoid GPF */
return;
- if (CONFIG(SMM_TSEG)) {
+ if (CONFIG(HAVE_SMI_HANDLER)) {
mask = rdmsr(SMM_MASK_MSR);
mask.lo |= SMM_TSEG_VALID;
wrmsr(SMM_MASK_MSR, mask);