sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ChromeOS: Separate NVS from global GNVS

Browse Source 
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>
This commit is contained in:
Kyösti Mälkki
2021-03-16 19:01:48 +02:00
parent 5c124a97aa
commit 3dc1792f1d
7 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/acpi/gnvs.c
View File

@ -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);