summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-09-12 21:03:39 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-09-14 10:55:34 +0000
commit2491d790d2eacf688ac75aeebc32964658feb02e (patch)
tree28ebf152c52436f60e7e0a6a704509fadc381480 /src
parent66d875a143ac4e520eb5e9b6bb79bea9adb6d7e8 (diff)
downloadcoreboot-2491d790d2eacf688ac75aeebc32964658feb02e.tar.xz
arch/x86: Remove acpi_fail_wakeup() and cbmem_fail_resume()
Unused since commit d46b8d5. Change-Id: If0f1e0381dd7698f842dc1288ff222a4d5d4783c Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/35389 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Furquan Shaikh <furquan@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
-rw-r--r--src/arch/x86/acpi_s3.c6
-rw-r--r--src/arch/x86/cbmem.c11
-rw-r--r--src/arch/x86/include/arch/acpi.h1
-rw-r--r--src/include/cbmem.h1
-rw-r--r--src/lib/cbmem_common.c4
5 files changed, 0 insertions, 23 deletions
diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c
index 5553b2cc41..52f8a201f7 100644
--- a/src/arch/x86/acpi_s3.c
+++ b/src/arch/x86/acpi_s3.c
@@ -60,12 +60,6 @@ int acpi_is_wakeup_s4(void)
acpi_handoff_wakeup();
return (acpi_slp_type == ACPI_S4);
}
-
-void acpi_fail_wakeup(void)
-{
- if (acpi_slp_type == ACPI_S3 || acpi_slp_type == ACPI_S2)
- acpi_slp_type = ACPI_S0;
-}
#endif /* ENV_RAMSTAGE */
#define WAKEUP_BASE 0x600
diff --git a/src/arch/x86/cbmem.c b/src/arch/x86/cbmem.c
index 648633f070..16c35b5dea 100644
--- a/src/arch/x86/cbmem.c
+++ b/src/arch/x86/cbmem.c
@@ -13,7 +13,6 @@
#include <stdlib.h>
#include <cbmem.h>
-#include <arch/acpi.h>
#if CONFIG(CBMEM_TOP_BACKUP)
@@ -35,13 +34,3 @@ void *cbmem_top(void)
}
#endif /* CBMEM_TOP_BACKUP */
-
-/* Something went wrong, our high memory area got wiped */
-void cbmem_fail_resume(void)
-{
-#if !defined(__PRE_RAM__) && CONFIG(HAVE_ACPI_RESUME)
- /* ACPI resume needs to be cleared in the fail-to-recover case, but that
- * condition is only handled during ramstage. */
- acpi_fail_wakeup();
-#endif
-}
diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h
index 14f0cdf9ab..42e45fb32f 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -932,7 +932,6 @@ unsigned long acpi_create_hest_error_source(acpi_hest_t *hest,
acpi_hest_esd_t *esd, u16 type, void *data, u16 len);
/* For ACPI S3 support. */
-void acpi_fail_wakeup(void);
void acpi_resume(void *wake_vec);
void mainboard_suspend_resume(void);
void *acpi_find_wakeup_vector(void);
diff --git a/src/include/cbmem.h b/src/include/cbmem.h
index f3df21d430..f972ba6503 100644
--- a/src/include/cbmem.h
+++ b/src/include/cbmem.h
@@ -106,7 +106,6 @@ void *cbmem_find(u32 id);
/* Indicate to each hook if cbmem is being recovered or not. */
typedef void (* const cbmem_init_hook_t)(int is_recovery);
void cbmem_run_init_hooks(int is_recovery);
-void cbmem_fail_resume(void);
/* Ramstage only functions. */
/* Add the cbmem memory used to the memory map at boot. */
diff --git a/src/lib/cbmem_common.c b/src/lib/cbmem_common.c
index d86edf013a..b018acb4fa 100644
--- a/src/lib/cbmem_common.c
+++ b/src/lib/cbmem_common.c
@@ -32,7 +32,3 @@ void cbmem_run_init_hooks(int is_recovery)
init_hook_ptr++;
}
}
-
-void __weak cbmem_fail_resume(void)
-{
-}