diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2021-03-16 19:01:48 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2021-06-14 19:44:08 +0000 |
| commit | 3dc1792f1df9a9cd982bb63d3b29cc16c08bd7f6 (patch) | |
| tree | ca58c0c5d8ace4df40fa68adf9bf22c55b00a522 /src/acpi | |
| parent | 5c124a97aaea675bdff1d690993e17bcbd901a2f (diff) | |
ChromeOS: Separate NVS from global GNVS
Allocate chromeos_acpi in CBMEM separately from GNVS.
Change-Id: Ide55964ed53ea1d5b3c1c4e3ebd67286b7d568e4
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/51638
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Diffstat (limited to 'src/acpi')
| -rw-r--r-- | src/acpi/acpi.c | 2 | ||||
| -rw-r--r-- | src/acpi/gnvs.c | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/acpi/acpi.c b/src/acpi/acpi.c index 12fa2133ac..5f9767e818 100644 --- a/src/acpi/acpi.c +++ b/src/acpi/acpi.c @@ -1704,6 +1704,8 @@ unsigned long write_acpi_tables(unsigned long start) if (CONFIG(ACPI_SOC_NVS)) acpi_fill_gnvs(); + if (CONFIG(CHROMEOS_NVS)) + acpi_fill_cnvs(); for (dev = all_devices; dev; dev = dev->next) if (dev->ops && dev->ops->acpi_inject_dsdt) diff --git a/src/acpi/gnvs.c b/src/acpi/gnvs.c index 856c105cfe..d7fe380729 100644 --- a/src/acpi/gnvs.c +++ b/src/acpi/gnvs.c @@ -37,11 +37,6 @@ void acpi_create_gnvs(void) if (CONFIG(CONSOLE_CBMEM)) gnvs->cbmc = (uintptr_t)cbmem_find(CBMEM_ID_CONSOLE); - - if (CONFIG(CHROMEOS_NVS)) { - chromeos_acpi_t *init = (void *)((u8 *)gnvs + GNVS_CHROMEOS_ACPI_OFFSET); - chromeos_init_chromeos_acpi(init); - } } void *acpi_get_gnvs(void) @@ -70,8 +65,6 @@ __weak void mainboard_fill_gnvs(struct global_nvs *gnvs_) { } void acpi_fill_gnvs(void) { const struct opregion gnvs_op = OPREGION("GNVS", SYSTEMMEMORY, (uintptr_t)gnvs, 0x100); - const struct opregion cnvs_op = OPREGION("CNVS", SYSTEMMEMORY, - (uintptr_t)gnvs + GNVS_CHROMEOS_ACPI_OFFSET, 0xf00); const struct opregion dnvs_op = OPREGION("DNVS", SYSTEMMEMORY, (uintptr_t)gnvs + GNVS_DEVICE_NVS_OFFSET, 0x1000); @@ -84,9 +77,6 @@ void acpi_fill_gnvs(void) acpigen_write_scope("\\"); acpigen_write_opregion(&gnvs_op); - if (CONFIG(CHROMEOS_NVS)) - acpigen_write_opregion(&cnvs_op); - if (CONFIG(ACPI_HAS_DEVICE_NVS)) acpigen_write_opregion(&dnvs_op); |