Skip to content

Commit 36b5c1d

Browse files
jiaqingz-devrafaeljw
authored andcommitted
ACPICA: Allow setting waking vector on reduced hardware platforms
Allow setting waking vector in FACS table on reduced hardware platforms to support S3 wakeup. Link: acpica/acpica@ee53ed6 Signed-off-by: Jiaqing Zhao <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 36b531a commit 36b5c1d

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

drivers/acpi/acpica/hwxfsleep.c

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,11 @@
1616
ACPI_MODULE_NAME("hwxfsleep")
1717

1818
/* Local prototypes */
19-
#if (!ACPI_REDUCED_HARDWARE)
2019
static acpi_status
2120
acpi_hw_set_firmware_waking_vector(struct acpi_table_facs *facs,
2221
acpi_physical_address physical_address,
2322
acpi_physical_address physical_address64);
24-
#endif
25-
26-
/*
27-
* These functions are removed for the ACPI_REDUCED_HARDWARE case:
28-
* acpi_set_firmware_waking_vector
29-
* acpi_enter_sleep_state_s4bios
30-
*/
3123

32-
#if (!ACPI_REDUCED_HARDWARE)
3324
/*******************************************************************************
3425
*
3526
* FUNCTION: acpi_hw_set_firmware_waking_vector
@@ -115,6 +106,12 @@ acpi_set_firmware_waking_vector(acpi_physical_address physical_address,
115106

116107
ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector)
117108

109+
/*
110+
* These functions are removed for the ACPI_REDUCED_HARDWARE case:
111+
* acpi_enter_sleep_state_s4bios
112+
*/
113+
114+
#if (!ACPI_REDUCED_HARDWARE)
118115
/*******************************************************************************
119116
*
120117
* FUNCTION: acpi_enter_sleep_state_s4bios

include/acpi/acpixf.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -881,10 +881,10 @@ ACPI_EXTERNAL_RETURN_STATUS(acpi_status
881881
acpi_leave_sleep_state_prep(u8 sleep_state))
882882
ACPI_EXTERNAL_RETURN_STATUS(acpi_status acpi_leave_sleep_state(u8 sleep_state))
883883

884-
ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
885-
acpi_set_firmware_waking_vector
886-
(acpi_physical_address physical_address,
887-
acpi_physical_address physical_address64))
884+
ACPI_EXTERNAL_RETURN_STATUS(acpi_status
885+
acpi_set_firmware_waking_vector
886+
(acpi_physical_address physical_address,
887+
acpi_physical_address physical_address64))
888888
/*
889889
* ACPI Timer interfaces
890890
*/

0 commit comments

Comments
 (0)