From 9f441dfc702b5c99ad466b9ada4e462a1b350bc7 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Sun, 28 Jun 2020 12:29:13 +0300 Subject: ACPI: Replace uses of CBMEM_ID_ACPI_GNVS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I45a2d9cb7f07609a1ff03fd70f17c3f2d4f013b9 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/48705 Reviewed-by: Arthur Heymans Reviewed-by: Angel Pons Tested-by: build bot (Jenkins) --- src/soc/intel/broadwell/pch/lpc.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) (limited to 'src/soc/intel/broadwell') diff --git a/src/soc/intel/broadwell/pch/lpc.c b/src/soc/intel/broadwell/pch/lpc.c index 8feae0f0a1..60c65cbaaa 100644 --- a/src/soc/intel/broadwell/pch/lpc.c +++ b/src/soc/intel/broadwell/pch/lpc.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -603,24 +602,18 @@ static void pch_lpc_read_resources(struct device *dev) static void southcluster_inject_dsdt(const struct device *device) { - struct global_nvs *gnvs; - - gnvs = cbmem_find(CBMEM_ID_ACPI_GNVS); - - if (gnvs) { - acpi_create_gnvs(gnvs); + struct global_nvs *gnvs = acpi_get_gnvs(); + if (!gnvs) + return; - /* Set unknown wake source */ - gnvs->pm1i = -1; + /* Set unknown wake source */ + gnvs->pm1i = -1; - /* CPU core count */ - gnvs->pcnt = dev_count_cpu(); + /* CPU core count */ + gnvs->pcnt = dev_count_cpu(); - /* Add it to DSDT. */ - acpigen_write_scope("\\"); - acpigen_write_name_dword("NVSA", (u32) gnvs); - acpigen_pop_len(); - } + acpi_create_gnvs(gnvs); + acpi_inject_nvsa(); } static unsigned long broadwell_write_acpi_tables(const struct device *device, -- cgit v1.2.3