diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2020-12-19 16:19:44 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2021-01-18 18:02:27 +0000 |
| commit | 66c6413c69abb7335efc4ea07f4c811c042704b6 (patch) | |
| tree | 06d58b85da4c779cca7b78e33a069ea03a4e69e4 /src/acpi/gnvs.c | |
| parent | c4a6628a6fe4f5400b7abe1478d0b0b21cb8200f (diff) | |
ACPI: Refactor ChromeOS specific ACPI GNVS
The layout of GNVS has expectation for a fixed size
array for chromeos_acpi_t. This allows us to reduce
the exposure of <chromeos/gnvs.h>.
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 <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48788
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src/acpi/gnvs.c')
| -rw-r--r-- | src/acpi/gnvs.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/acpi/gnvs.c b/src/acpi/gnvs.c index 10a77d39de..18a4d5d951 100644 --- a/src/acpi/gnvs.c +++ b/src/acpi/gnvs.c @@ -6,6 +6,7 @@ #include <console/console.h> #include <string.h> #include <types.h> +#include <vendorcode/google/chromeos/gnvs.h> static void *gnvs; @@ -53,6 +54,14 @@ void *gnvs_get_or_create(void) if (!gnvs_size) return NULL; + /* Match with OpRegion declared in global_nvs.asl. */ + if (gnvs_size < 0x100) + gnvs_size = 0x100; + if (gnvs_size > 0x1000) + gnvs_size = 0x2000; + else if (CONFIG(MAINBOARD_HAS_CHROMEOS)) + gnvs_size = 0x1000; + gnvs = cbmem_add(CBMEM_ID_ACPI_GNVS, gnvs_size); if (!gnvs) return NULL; @@ -63,7 +72,7 @@ void *gnvs_get_or_create(void) gnvs_assign_cbmc(); if (CONFIG(CHROMEOS)) - gnvs_assign_chromeos(); + gnvs_assign_chromeos((u8 *)gnvs + GNVS_CHROMEOS_ACPI_OFFSET); return gnvs; } |