diff options
| author | Fred Reitberger <reitbergerfred@gmail.com> | 2022-03-23 09:59:01 -0400 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2022-03-25 18:51:12 +0000 |
| commit | 8e3c6f8d33234ca5afff9ed3f40a0732fdc8ff2c (patch) | |
| tree | f69996dc6063c22251b447b31be56eda3fb08ebf /src/soc/amd | |
| parent | c35790012f837caf5edcaa0252448ef8b5bfdb02 (diff) | |
soc/amd/cezanne/cpu.c: Skip SMMINFO init in S3 resume
SMMINFO is already set up in S5, so it should be skipped in S3 resume
BUG=b:194990818
TEST=Build guybrush
Change-Id: I30ee6d7006ddac4dbdae9825bd4fa6eac7fd48cb
Signed-off-by: Fred Reitberger <reitbergerfred@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/63025
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Diffstat (limited to 'src/soc/amd')
| -rw-r--r-- | src/soc/amd/cezanne/cpu.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/soc/amd/cezanne/cpu.c b/src/soc/amd/cezanne/cpu.c index adc99d0ba6..818e4d8a83 100644 --- a/src/soc/amd/cezanne/cpu.c +++ b/src/soc/amd/cezanne/cpu.c @@ -11,6 +11,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> @@ -37,7 +38,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 = { |