diff options
| author | Joel Kitching <kitching@google.com> | 2018-08-17 15:15:02 +0800 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2018-08-22 15:32:30 +0000 |
| commit | 5846d5727a05e395d13317daba049e0e56e15d33 (patch) | |
| tree | 51f9e3027b8708891dabd9351bd45092de3f3581 /src/arch | |
| parent | 8f560d9b9c20c7e72b031e60cf0e828d7d27ec8e (diff) | |
acpi: remove CBMEM_ID_ACPI_GNVS_PTR entry
Since we can retrieve the address of ACPI GNVS directly
from CBMEM_ID_ACPI_GNVS, there is no need to store and
update a pointer separately.
TEST=Compile and run on Eve
Signed-off-by: Joel Kitching <kitching@google.com>
Change-Id: I59f3d0547a4a724e66617c791ad82c9f504cadea
Reviewed-on: https://review.coreboot.org/28189
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/x86/acpi.c | 7 | ||||
| -rw-r--r-- | src/arch/x86/acpi_s3.c | 10 | ||||
| -rw-r--r-- | src/arch/x86/include/arch/acpi.h | 2 |
3 files changed, 5 insertions, 14 deletions
diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c index 8d7579d41c..78eeaa7649 100644 --- a/src/arch/x86/acpi.c +++ b/src/arch/x86/acpi.c @@ -1252,13 +1252,6 @@ void *acpi_find_wakeup_vector(void) return wake_vec; } -void acpi_save_gnvs(u32 gnvs_address) -{ - u32 *gnvs = cbmem_add(CBMEM_ID_ACPI_GNVS_PTR, sizeof(*gnvs)); - if (gnvs) - *gnvs = gnvs_address; -} - __weak int acpi_get_gpe(int gpe) { return -1; /* implemented by SOC */ diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c index f6ed1089cf..ebf291cdce 100644 --- a/src/arch/x86/acpi_s3.c +++ b/src/arch/x86/acpi_s3.c @@ -226,13 +226,13 @@ void __weak mainboard_suspend_resume(void) void acpi_resume(void *wake_vec) { if (IS_ENABLED(CONFIG_HAVE_SMI_HANDLER)) { - u32 *gnvs_address = cbmem_find(CBMEM_ID_ACPI_GNVS_PTR); + void *gnvs_address = cbmem_find(CBMEM_ID_ACPI_GNVS); /* Restore GNVS pointer in SMM if found */ - if (gnvs_address && *gnvs_address) { - printk(BIOS_DEBUG, "Restore GNVS pointer to 0x%08x\n", - *gnvs_address); - smm_setup_structures((void *)*gnvs_address, NULL, NULL); + if (gnvs_address) { + printk(BIOS_DEBUG, "Restore GNVS pointer to %p\n", + gnvs_address); + smm_setup_structures(gnvs_address, NULL, NULL); } } diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h index 1811965963..40fbd548d8 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -771,8 +771,6 @@ void acpi_write_hest(acpi_hest_t *hest, unsigned long acpi_create_hest_error_source(acpi_hest_t *hest, acpi_hest_esd_t *esd, u16 type, void *data, u16 len); -void acpi_save_gnvs(u32 gnvs_address); - /* For ACPI S3 support. */ void acpi_fail_wakeup(void); void acpi_resume(void *wake_vec); |