summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorFelix Held <felix-coreboot@felixheld.de>2021-01-29 16:14:57 +0100
committerFelix Held <felix-coreboot@felixheld.de>2021-01-30 17:17:24 +0000
commitffc87e9cbe1a811332de6a87186e9c3ad3755709 (patch)
tree1ea23e66825463d202777d7dc3c09c31427f62a3 /src/soc
parentac86cf33bf9ff29cbf77a38cd1f0c7e2ba1d1c1e (diff)
soc/amd/cezanne: add use result of acpi_is_wakeup_s3() in FSP calls
Cezanne doesn't have ACPI support yet, but in this case the function always returns 0, so it can already be used. Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Change-Id: I1f5e1f31bf1e52988fcef90daf7b93169e21cbb1 Reviewed-on: https://review.coreboot.org/c/coreboot/+/50126 Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/amd/cezanne/chip.c3
-rw-r--r--src/soc/amd/cezanne/romstage.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/soc/amd/cezanne/chip.c b/src/soc/amd/cezanne/chip.c
index fd930896a7..4a39024b1b 100644
--- a/src/soc/amd/cezanne/chip.c
+++ b/src/soc/amd/cezanne/chip.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
+#include <acpi/acpi.h>
#include <device/device.h>
#include <fsp/api.h>
#include <soc/southbridge.h>
@@ -12,7 +13,7 @@ static void enable_dev(struct device *dev)
static void soc_init(void *chip_info)
{
- fsp_silicon_init(false); /* no S3 support yet */
+ fsp_silicon_init(acpi_is_wakeup_s3());
fch_init(chip_info);
}
diff --git a/src/soc/amd/cezanne/romstage.c b/src/soc/amd/cezanne/romstage.c
index 509addfa52..f790def747 100644
--- a/src/soc/amd/cezanne/romstage.c
+++ b/src/soc/amd/cezanne/romstage.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
+#include <acpi/acpi.h>
#include <arch/cpu.h>
#include <console/console.h>
#include <fsp/api.h>
@@ -19,7 +20,7 @@ asmlinkage void car_stage_entry(void)
u32 val = cpuid_eax(1);
printk(BIOS_DEBUG, "Family_Model: %08x\n", val);
- fsp_memory_init(false); /* no S3 resume yet */
+ fsp_memory_init(acpi_is_wakeup_s3());
run_ramstage();
}