From 66c6413c69abb7335efc4ea07f4c811c042704b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Sat, 19 Dec 2020 16:19:44 +0200 Subject: ACPI: Refactor ChromeOS specific ACPI GNVS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The layout of GNVS has expectation for a fixed size array for chromeos_acpi_t. This allows us to reduce the exposure of . If chromeos_acpi_t was the last entry in struct global_nvs padding at the end is also removed. If device_nvs_t exists, place a properly sized reserve for chromeos_acpi_t in the middle. Allocation from cbmem is adjusted such that it matches exactly the OperationRegion size defined inside the ASL. Change-Id: If234075e11335ce958ce136dd3fe162f7e5afdf7 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/48788 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- src/acpi/chromeos-gnvs.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/acpi/chromeos-gnvs.c') diff --git a/src/acpi/chromeos-gnvs.c b/src/acpi/chromeos-gnvs.c index 81c652ad3f..060d56d44b 100644 --- a/src/acpi/chromeos-gnvs.c +++ b/src/acpi/chromeos-gnvs.c @@ -5,11 +5,9 @@ #include #include -void gnvs_assign_chromeos(void) +void gnvs_assign_chromeos(void *gnvs_section) { - chromeos_acpi_t *gnvs_chromeos = gnvs_chromeos_ptr(acpi_get_gnvs()); - if (!gnvs_chromeos) - return; + chromeos_acpi_t *gnvs_chromeos = gnvs_section; chromeos_init_chromeos_acpi(gnvs_chromeos); @@ -22,7 +20,7 @@ void gnvs_assign_chromeos(void) void gnvs_set_ecfw_rw(void) { - chromeos_acpi_t *gnvs_chromeos = gnvs_chromeos_ptr(acpi_get_gnvs()); + chromeos_acpi_t *gnvs_chromeos = chromeos_get_chromeos_acpi(); if (!gnvs_chromeos) return; @@ -31,7 +29,7 @@ void gnvs_set_ecfw_rw(void) void smbios_type0_bios_version(uintptr_t address) { - chromeos_acpi_t *gnvs_chromeos = gnvs_chromeos_ptr(acpi_get_gnvs()); + chromeos_acpi_t *gnvs_chromeos = chromeos_get_chromeos_acpi(); if (!gnvs_chromeos) return; -- cgit v1.2.3