GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ACPI: Use acpigen for NVS OperationRegions 

The intermediate base and length are not required in ASL.

Change-Id: I0c72e2e4f7ec597adc16dbdec1fd7bbe4e41bfd6
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/51637
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Lance Zhao
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Kyösti Mälkki 2021-03-16 13:02:34 +02:00 committed by Patrick Georgi
parent bc441c72ce
commit 2ad598f3db
2 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/acpi/acpigen_extern.asl
View File

@ -8,19 +8,13 @@
*/ */
#if CONFIG(ACPI_SOC_NVS) #if CONFIG(ACPI_SOC_NVS)
External (NVB0, IntObj) External (GNVS, OpRegionObj)
External (NVS0, IntObj)
OperationRegion (GNVS, SystemMemory, NVB0, NVS0)
#endif #endif
#if CONFIG(ACPI_HAS_DEVICE_NVS) #if CONFIG(ACPI_HAS_DEVICE_NVS)
External (NVB1, IntObj) External (DNVS, OpRegionObj)
External (NVS1, IntObj)
OperationRegion (DNVS, SystemMemory, NVB1, NVS1)
#endif #endif
#if CONFIG(CHROMEOS_NVS) #if CONFIG(CHROMEOS_NVS)
External (NVB2, IntObj) External (CNVS, OpRegionObj)
External (NVS2, IntObj)
OperationRegion (CNVS, SystemMemory, NVB2, NVS2)
#endif #endif

30
src/acpi/gnvs.c
View File

@ -69,6 +69,12 @@ __weak void mainboard_fill_gnvs(struct global_nvs *gnvs_) { }
/* Called from write_acpi_tables() only on normal boot path. */ /* Called from write_acpi_tables() only on normal boot path. */
void acpi_fill_gnvs(void) 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);
if (!gnvs) if (!gnvs)
return; return;
@ -76,23 +82,15 @@ void acpi_fill_gnvs(void)
mainboard_fill_gnvs(gnvs); mainboard_fill_gnvs(gnvs);
acpigen_write_scope("\\"); acpigen_write_scope("\\");
acpigen_write_name_dword("NVB0", (uintptr_t)gnvs); acpigen_write_opregion(&gnvs_op);
acpigen_write_name_dword("NVS0", 0x100);
if (CONFIG(CHROMEOS_NVS))
acpigen_write_opregion(&cnvs_op);
if (CONFIG(ACPI_HAS_DEVICE_NVS))
acpigen_write_opregion(&dnvs_op);
acpigen_pop_len(); acpigen_pop_len();
if (CONFIG(CHROMEOS_NVS)) {
acpigen_write_scope("\\");
acpigen_write_name_dword("NVB2", (uintptr_t)gnvs + GNVS_CHROMEOS_ACPI_OFFSET);
acpigen_write_name_dword("NVS2", 0xf00);
acpigen_pop_len();
}
if (CONFIG(ACPI_HAS_DEVICE_NVS)) {
acpigen_write_scope("\\");
acpigen_write_name_dword("NVB1", (uintptr_t)gnvs + GNVS_DEVICE_NVS_OFFSET);
acpigen_write_name_dword("NVS1", 0x1000);
acpigen_pop_len();
}
} }
int acpi_reset_gnvs_for_wake(struct global_nvs **gnvs_) int acpi_reset_gnvs_for_wake(struct global_nvs **gnvs_)