summaryrefslogtreecommitdiff
path: root/src/soc/amd
diff options
context:
space:
mode:
authorFred Reitberger <reitbergerfred@gmail.com>2022-03-24 07:43:17 -0400
committerFelix Held <felix-coreboot@felixheld.de>2022-03-25 18:51:31 +0000
commit135f9eb46acdf6ff8de332fd47967dd15128fdbf (patch)
tree33ce3ff338cde0a9504b20a00f6cd518a4aa8177 /src/soc/amd
parent81ee8e2f2e859ace24bf2ecd8977079b87a4429c (diff)
soc/amd/sabrina/cpu.c: Skip SMMINFO init in S3 resume
SMMINFO is already set up in S5, so it should be skipped in S3 resume TEST=builds Change-Id: I58e25075a007505e53962525ec4d9acd2ce6c7ae Signed-off-by: Fred Reitberger <reitbergerfred@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/63088 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Raul Rangel <rrangel@chromium.org>
Diffstat (limited to 'src/soc/amd')
-rw-r--r--src/soc/amd/sabrina/cpu.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/soc/amd/sabrina/cpu.c b/src/soc/amd/sabrina/cpu.c
index c355a704df..9893a8bb30 100644
--- a/src/soc/amd/sabrina/cpu.c
+++ b/src/soc/amd/sabrina/cpu.c
@@ -13,6 +13,7 @@
#include <cpu/x86/mp.h>
#include <cpu/x86/mtrr.h>
#include <cpu/x86/smm.h>
+#include <acpi/acpi.h>
#include <device/device.h>
#include <soc/cpu.h>
#include <soc/iomap.h>
@@ -39,7 +40,10 @@ static void pre_mp_init(void)
static void post_mp_init(void)
{
global_smi_enable();
- apm_control(APM_CNT_SMMINFO);
+
+ /* SMMINFO only needs to be set up when booting from S5 */
+ if (!acpi_is_wakeup_s3())
+ apm_control(APM_CNT_SMMINFO);
}
static const struct mp_ops mp_ops = {