Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/34127 )
Change subject: soc/amd/stoneyridge,picasso: Switch SMM lock condition ......................................................................
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 --- M src/soc/amd/picasso/finalize.c M src/soc/amd/stoneyridge/finalize.c 2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/27/34127/1
diff --git a/src/soc/amd/picasso/finalize.c b/src/soc/amd/picasso/finalize.c index 6572e1a..5a4627a 100644 --- a/src/soc/amd/picasso/finalize.c +++ b/src/soc/amd/picasso/finalize.c @@ -29,7 +29,7 @@ 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 6572e1a..5a4627a 100644 --- a/src/soc/amd/stoneyridge/finalize.c +++ b/src/soc/amd/stoneyridge/finalize.c @@ -29,7 +29,7 @@ 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);
Richard Spiegel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34127 )
Change subject: soc/amd/stoneyridge,picasso: Switch SMM lock condition ......................................................................
Patch Set 2: Code-Review+2
Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34127 )
Change subject: soc/amd/stoneyridge,picasso: Switch SMM lock condition ......................................................................
Patch Set 2: Code-Review+2
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34127 )
Change subject: soc/amd/stoneyridge,picasso: Switch SMM lock condition ......................................................................
Patch Set 2: Code-Review+2
Kyösti Mälkki has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34127 )
Change subject: soc/amd/stoneyridge,picasso: Switch SMM lock condition ......................................................................
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 --- M src/soc/amd/picasso/finalize.c M src/soc/amd/stoneyridge/finalize.c 2 files changed, 2 insertions(+), 2 deletions(-)
Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved Marshall Dawson: Looks good to me, approved Richard Spiegel: Looks good to me, approved
diff --git a/src/soc/amd/picasso/finalize.c b/src/soc/amd/picasso/finalize.c index 6572e1a..5a4627a 100644 --- a/src/soc/amd/picasso/finalize.c +++ b/src/soc/amd/picasso/finalize.c @@ -29,7 +29,7 @@ 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 6572e1a..5a4627a 100644 --- a/src/soc/amd/stoneyridge/finalize.c +++ b/src/soc/amd/stoneyridge/finalize.c @@ -29,7 +29,7 @@ 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);
-
Furquan Shaikh (Code Review) -
Kyösti Mälkki (Code Review)
-
Marshall Dawson (Code Review)
-
Richard Spiegel (Code Review)