GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Kyösti Mälkki 2019-09-12 21:03:39 +03:00
parent 66d875a143
commit 2491d790d2
5 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/arch/x86/acpi_s3.c
View File

@ -60,12 +60,6 @@ int acpi_is_wakeup_s4(void)
acpi_handoff_wakeup(); acpi_handoff_wakeup();
return (acpi_slp_type == ACPI_S4); 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 */ #endif /* ENV_RAMSTAGE */
#define WAKEUP_BASE 0x600 #define WAKEUP_BASE 0x600

11
src/arch/x86/cbmem.c
View File

@ -13,7 +13,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <cbmem.h> #include <cbmem.h>
#include <arch/acpi.h>
#if CONFIG(CBMEM_TOP_BACKUP) #if CONFIG(CBMEM_TOP_BACKUP)
@ -35,13 +34,3 @@ void *cbmem_top(void)
} }
#endif /* CBMEM_TOP_BACKUP */ #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
}

1
src/arch/x86/include/arch/acpi.h
View File

@ -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); acpi_hest_esd_t *esd, u16 type, void *data, u16 len);
/* For ACPI S3 support. */ /* For ACPI S3 support. */
void acpi_fail_wakeup(void);
void acpi_resume(void *wake_vec); void acpi_resume(void *wake_vec);
void mainboard_suspend_resume(void); void mainboard_suspend_resume(void);
void *acpi_find_wakeup_vector(void); void *acpi_find_wakeup_vector(void);

1
src/include/cbmem.h
View File

@ -106,7 +106,6 @@ void *cbmem_find(u32 id);
/* Indicate to each hook if cbmem is being recovered or not. */ /* Indicate to each hook if cbmem is being recovered or not. */
typedef void (* const cbmem_init_hook_t)(int is_recovery); typedef void (* const cbmem_init_hook_t)(int is_recovery);
void cbmem_run_init_hooks(int is_recovery); void cbmem_run_init_hooks(int is_recovery);
void cbmem_fail_resume(void);
/* Ramstage only functions. */ /* Ramstage only functions. */
/* Add the cbmem memory used to the memory map at boot. */ /* Add the cbmem memory used to the memory map at boot. */

4
src/lib/cbmem_common.c
View File

@ -32,7 +32,3 @@ void cbmem_run_init_hooks(int is_recovery)
init_hook_ptr++; init_hook_ptr++;
} }
} }
void __weak cbmem_fail_resume(void)
{
}