diff options
author | Bin Meng <bmeng.cn@gmail.com> | 2017-04-21 14:24:44 (GMT) |
---|---|---|
committer | Bin Meng <bmeng.cn@gmail.com> | 2017-05-17 09:11:46 (GMT) |
commit | 0f4e25887dfb3b54b21430340c511f7fd54bc955 (patch) | |
tree | cd9f590e8e6a7f075f0c223a23d9467a4b6d3551 /arch/x86/include | |
parent | 995727850f8e54547bb26285ef9e2aa73a5c71a5 (diff) | |
download | u-boot-fsl-qoriq-0f4e25887dfb3b54b21430340c511f7fd54bc955.tar.xz |
x86: acpi: Refactor acpi_resume()
To do something more in acpi_resume() like turning on ACPI mode,
we need locate ACPI FADT table pointer first. But currently this
is done in acpi_find_wakeup_vector().
This changes acpi_resume() signature to accept ACPI FADT pointer
as the parameter. A new API acpi_find_fadt() is introduced, and
acpi_find_wakeup_vector() is updated to use FADT pointer as the
parameter as well.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'arch/x86/include')
-rw-r--r-- | arch/x86/include/asm/acpi_s3.h | 5 | ||||
-rw-r--r-- | arch/x86/include/asm/acpi_table.h | 11 |
2 files changed, 13 insertions, 3 deletions
diff --git a/arch/x86/include/asm/acpi_s3.h b/arch/x86/include/asm/acpi_s3.h index b8d14f4..1ad20f4 100644 --- a/arch/x86/include/asm/acpi_s3.h +++ b/arch/x86/include/asm/acpi_s3.h @@ -99,15 +99,16 @@ enum acpi_sleep_state chipset_prev_sleep_state(void); */ void chipset_clear_sleep_state(void); +struct acpi_fadt; /** * acpi_resume() - Do ACPI S3 resume * * This calls U-Boot wake up assembly stub and jumps to OS's wake up vector. * - * @wake_vec: OS wake up vector + * @fadt: FADT table pointer in the ACPI table * @return: Never returns */ -void acpi_resume(void *wake_vec); +void acpi_resume(struct acpi_fadt *fadt); #endif /* __ASSEMBLY__ */ diff --git a/arch/x86/include/asm/acpi_table.h b/arch/x86/include/asm/acpi_table.h index e96409b..dd7a946 100644 --- a/arch/x86/include/asm/acpi_table.h +++ b/arch/x86/include/asm/acpi_table.h @@ -328,6 +328,15 @@ void enter_acpi_mode(int pm1_cnt); ulong write_acpi_tables(ulong start); /** + * acpi_find_fadt() - find ACPI FADT table in the sytem memory + * + * This routine parses the ACPI table to locate the ACPI FADT table. + * + * @return: a pointer to the ACPI FADT table in the system memory + */ +struct acpi_fadt *acpi_find_fadt(void); + +/** * acpi_find_wakeup_vector() - find OS installed wake up vector address * * This routine parses the ACPI table to locate the wake up vector installed @@ -335,4 +344,4 @@ ulong write_acpi_tables(ulong start); * * @return: wake up vector address installed by the OS */ -void *acpi_find_wakeup_vector(void); +void *acpi_find_wakeup_vector(struct acpi_fadt *); |