diff options
| author | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2012-04-03 23:28:22 +0200 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2012-04-04 19:10:28 +0200 |
| commit | cb91e1525eb0b81f9bc2e24e3404d6a9efc1cce3 (patch) | |
| tree | 49ca4daf654bbead5df8532967c64532ee8e2696 | |
| parent | ec207630a50a61c98816b2a65183a064b230eda6 (diff) | |
| download | coreboot-cb91e1525eb0b81f9bc2e24e3404d6a9efc1cce3.tar.xz | |
Add support for mainboard specific suspend/resume handler
Some mainboards (most likely laptops) will need mainboard specific functions
called upon a resume from suspend.
Change-Id: If1518a4b016bba776643adaef0ae64ff49f57e51
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/852
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
| -rw-r--r-- | src/arch/x86/boot/acpi.c | 6 | ||||
| -rw-r--r-- | src/arch/x86/include/arch/acpi.h | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c index f81127a02f..f17e73e3f6 100644 --- a/src/arch/x86/boot/acpi.c +++ b/src/arch/x86/boot/acpi.c @@ -474,8 +474,12 @@ void suspend_resume(void) /* If we happen to be resuming find wakeup vector and jump to OS. */ wake_vec = acpi_find_wakeup_vector(); - if (wake_vec) + if (wake_vec) { + /* Call mainboard resume handler first, if defined. */ + if (mainboard_suspend_resume) + mainboard_suspend_resume(); acpi_jump_to_wakeup(wake_vec); + } } /* This is to be filled by SB code - startup value what was found. */ diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h index 504d71b4f5..8c521af0b2 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -417,6 +417,7 @@ void acpi_write_rsdp(acpi_rsdp_t *rsdp, acpi_rsdt_t *rsdt, acpi_xsdt_t *xsdt); extern u8 acpi_slp_type; void suspend_resume(void); +void __attribute__((weak)) mainboard_suspend_resume(void); void *acpi_find_wakeup_vector(void); void *acpi_get_wakeup_rsdp(void); void acpi_jump_to_wakeup(void *wakeup_addr); |