diff options
| author | Fred Reitberger <reitbergerfred@gmail.com> | 2022-03-24 07:42:40 -0400 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2022-03-25 18:51:22 +0000 |
| commit | 81ee8e2f2e859ace24bf2ecd8977079b87a4429c (patch) | |
| tree | c2e4f60df445da5dfe0580f5599bd23529a394e8 /src/soc/amd | |
| parent | 8e3c6f8d33234ca5afff9ed3f40a0732fdc8ff2c (diff) | |
soc/amd/picasso/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: Ia58000ce9dac5ecb69ca39354f7775524e439bd0
Signed-off-by: Fred Reitberger <reitbergerfred@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/63087
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/picasso/cpu.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/soc/amd/picasso/cpu.c b/src/soc/amd/picasso/cpu.c index de6e9c035b..f14ee49648 100644 --- a/src/soc/amd/picasso/cpu.c +++ b/src/soc/amd/picasso/cpu.c @@ -10,6 +10,7 @@ #include <cpu/x86/mtrr.h> #include <cpu/x86/msr.h> #include <cpu/x86/smm.h> +#include <acpi/acpi.h> #include <device/device.h> #include <device/pci_ops.h> #include <soc/pci_devs.h> @@ -41,7 +42,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 = { |