ACPI S3: Split arch-agnostic parts
Change-Id: I9fc2d1cdbb280f781045882bc4ac98c67946953e
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42614
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
diff --git a/src/acpi/Makefile.inc b/src/acpi/Makefile.inc
index f70b23f..2f06be1 100644
--- a/src/acpi/Makefile.inc
+++ b/src/acpi/Makefile.inc
@@ -3,6 +3,7 @@
ifeq ($(CONFIG_HAVE_ACPI_TABLES),y)
ramstage-y += acpi.c
+ramstage-y += acpi_pm.c
ramstage-y += acpigen.c
ramstage-y += acpigen_dptf.c
ramstage-y += acpigen_dsm.c
@@ -15,6 +16,8 @@
ramstage-y += sata.c
ramstage-y += soundwire.c
+postcar-y += acpi_pm.c
+
ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/acpi_tables.c),)
ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/acpi_tables.c
endif
diff --git a/src/acpi/acpi_pm.c b/src/acpi/acpi_pm.c
new file mode 100644
index 0000000..cecf878
--- /dev/null
+++ b/src/acpi/acpi_pm.c
@@ -0,0 +1,31 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <acpi/acpi.h>
+#include <console/console.h>
+#include <romstage_handoff.h>
+
+/* This is filled with acpi_handoff_wakeup_s3() call early in ramstage. */
+static int acpi_slp_type = -1;
+
+static void acpi_handoff_wakeup(void)
+{
+ if (acpi_slp_type < 0) {
+ if (romstage_handoff_is_resume()) {
+ printk(BIOS_DEBUG, "S3 Resume\n");
+ acpi_slp_type = ACPI_S3;
+ } else {
+ printk(BIOS_DEBUG, "Normal boot\n");
+ acpi_slp_type = ACPI_S0;
+ }
+ }
+}
+
+int acpi_handoff_wakeup_s3(void)
+{
+ acpi_handoff_wakeup();
+ return (acpi_slp_type == ACPI_S3);
+}
+
+void __weak mainboard_suspend_resume(void)
+{
+}
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index a5c3309..5157564 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -158,7 +158,6 @@
ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32)$(CONFIG_ARCH_ROMSTAGE_X86_64),y)
-romstage-$(CONFIG_HAVE_ACPI_RESUME) += acpi_s3.c
romstage-y += boot.c
romstage-y += post.c
# gdt_init.S is included by entry32.inc when romstage is the first C
@@ -202,7 +201,6 @@
endif
postcar-generic-ccopts += -D__POSTCAR__
-postcar-$(CONFIG_HAVE_ACPI_RESUME) += acpi_s3.c
postcar-y += boot.c
postcar-y += post.c
postcar-y += gdt_init.S
diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c
index 1c30432..43a68f9 100644
--- a/src/arch/x86/acpi_s3.c
+++ b/src/arch/x86/acpi_s3.c
@@ -8,33 +8,6 @@
#include <cpu/x86/smm.h>
#include <fallback.h>
#include <timestamp.h>
-#include <romstage_handoff.h>
-
-#if ENV_RAMSTAGE || ENV_POSTCAR
-
-/* This is filled with acpi_is_wakeup_s3() call early in ramstage. */
-static int acpi_slp_type = -1;
-
-static void acpi_handoff_wakeup(void)
-{
- if (acpi_slp_type < 0) {
- if (romstage_handoff_is_resume()) {
- printk(BIOS_DEBUG, "S3 Resume\n");
- acpi_slp_type = ACPI_S3;
- } else {
- printk(BIOS_DEBUG, "Normal boot\n");
- acpi_slp_type = ACPI_S0;
- }
- }
-}
-
-int acpi_is_wakeup_s3(void)
-{
- acpi_handoff_wakeup();
- return (acpi_slp_type == ACPI_S3);
-}
-
-#endif /* ENV_RAMSTAGE */
#define WAKEUP_BASE 0x600
@@ -43,10 +16,6 @@
extern unsigned char __wakeup;
extern unsigned int __wakeup_size;
-void __weak mainboard_suspend_resume(void)
-{
-}
-
void __noreturn acpi_resume(void *wake_vec)
{
/* Restore GNVS pointer in SMM if found. */
diff --git a/src/include/acpi/acpi.h b/src/include/acpi/acpi.h
index bdea467..839d485 100644
--- a/src/include/acpi/acpi.h
+++ b/src/include/acpi/acpi.h
@@ -1017,6 +1017,7 @@
void __noreturn acpi_resume(void *wake_vec);
void mainboard_suspend_resume(void);
void *acpi_find_wakeup_vector(void);
+int acpi_handoff_wakeup_s3(void);
/* ACPI_Sn assignments are defined to always equal the sleep state numbers */
enum {
@@ -1062,20 +1063,16 @@
return CONFIG(HAVE_ACPI_RESUME);
}
-#if CONFIG(HAVE_ACPI_RESUME)
-
-#if ENV_ROMSTAGE_OR_BEFORE
static inline int acpi_is_wakeup_s3(void)
{
- return (acpi_get_sleep_type() == ACPI_S3);
-}
-#else
-int acpi_is_wakeup_s3(void);
-#endif
+ if (!acpi_s3_resume_allowed())
+ return 0;
-#else
-static inline int acpi_is_wakeup_s3(void) { return 0; }
-#endif
+ if (ENV_ROMSTAGE_OR_BEFORE)
+ return (acpi_get_sleep_type() == ACPI_S3);
+
+ return acpi_handoff_wakeup_s3();
+}
static inline uintptr_t acpi_align_current(uintptr_t current)
{