[coreboot-gerrit] Change in coreboot[master]: soc/amd/picasso,stoneyridge: Refactor acpi_create_gnvs()

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/44024 )

Change subject: soc/amd/picasso,stoneyridge: Refactor acpi_create_gnvs()
......................................................................

soc/amd/picasso,stoneyridge: Refactor acpi_create_gnvs()

Add default_inject_dsdt().

Change-Id: I61010f64a4a935f238e6dcd0f8c1340a6cc68eb4
Signed-off-by: Kyösti Mälkki 
---
M src/include/acpi/acpi_gnvs.h
M src/soc/amd/common/block/lpc/lpc.c
M src/soc/amd/picasso/acpi.c
M src/soc/amd/stoneyridge/acpi.c
4 files changed, 3 insertions(+), 39 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/24/44024/1

diff --git a/src/include/acpi/acpi_gnvs.h b/src/include/acpi/acpi_gnvs.h
index b8e2a37..08778ad 100644
--- a/src/include/acpi/acpi_gnvs.h
+++ b/src/include/acpi/acpi_gnvs.h
@@ -25,8 +25,6 @@
  */
 struct global_nvs;

-void acpi_create_gnvs(struct global_nvs *gnvs);
-
 void soc_fill_gnvs(struct global_nvs *gnvs);
 void mainboard_fill_gnvs(struct global_nvs *gnvs);

diff --git a/src/soc/amd/common/block/lpc/lpc.c b/src/soc/amd/common/block/lpc/lpc.c
index 4a0ed85..6ce1f6b 100644
--- a/src/soc/amd/common/block/lpc/lpc.c
+++ b/src/soc/amd/common/block/lpc/lpc.c
@@ -324,7 +324,7 @@
    .read_resources = lpc_read_resources,
    .set_resources = lpc_set_resources,
    .enable_resources = lpc_enable_resources,
-	.acpi_inject_dsdt = southbridge_inject_dsdt,
+	.acpi_inject_dsdt = default_inject_dsdt,
    .write_acpi_tables = southbridge_write_acpi_tables,
    .init = lpc_init,
    .scan_bus = scan_static_bus,
diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c
index 2cecd36..d57e924 100644
--- a/src/soc/amd/picasso/acpi.c
+++ b/src/soc/amd/picasso/acpi.c
@@ -13,7 +13,6 @@
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
 #include <cpu/x86/smm.h>
-#include <cbmem.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <amdblocks/acpimmio.h>
@@ -189,7 +188,7 @@
    return acpi_write_hpet(device, current, rsdp);
 }

-void acpi_create_gnvs(struct global_nvs *gnvs)
+void soc_fill_gnvs(struct global_nvs *gnvs)
 {
    /* Set unknown wake source */
    gnvs->pm1i = ~0ULL;
@@ -199,22 +198,6 @@
    gnvs->pcnt = dev_count_cpu();
 }

-void southbridge_inject_dsdt(const struct device *device)
-{
-	struct global_nvs *gnvs;
-
-	gnvs = cbmem_find(CBMEM_ID_ACPI_GNVS);
-
-	if (gnvs) {
-		acpi_create_gnvs(gnvs);
-
-		/* Add it to DSDT */
-		acpigen_write_scope("\");
-		acpigen_write_name_dword("NVSA", (uintptr_t)gnvs);
-		acpigen_pop_len();
-	}
-}
-
 static void acpigen_soc_get_gpio_in_local5(uintptr_t addr)
 {
    /*
diff --git a/src/soc/amd/stoneyridge/acpi.c b/src/soc/amd/stoneyridge/acpi.c
index f6a5f8b..d5db81b 100644
--- a/src/soc/amd/stoneyridge/acpi.c
+++ b/src/soc/amd/stoneyridge/acpi.c
@@ -12,7 +12,6 @@
 #include <device/pci_ops.h>
 #include <arch/ioapic.h>
 #include <cpu/x86/smm.h>
-#include <cbmem.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <amdblocks/acpimmio.h>
@@ -164,7 +163,7 @@
    return acpi_write_hpet(device, current, rsdp);
 }

-void acpi_create_gnvs(struct global_nvs *gnvs)
+void soc_fill_gnvs(struct global_nvs *gnvs)
 {
    /* Set unknown wake source */
    gnvs->pm1i = ~0ULL;
@@ -174,22 +173,6 @@
    gnvs->pcnt = dev_count_cpu();
 }

-void southbridge_inject_dsdt(const struct device *device)
-{
-	struct global_nvs *gnvs;
-
-	gnvs = cbmem_find(CBMEM_ID_ACPI_GNVS);
-
-	if (gnvs) {
-		acpi_create_gnvs(gnvs);
-
-		/* Add it to DSDT */
-		acpigen_write_scope("\");
-		acpigen_write_name_dword("NVSA", (uintptr_t)gnvs);
-		acpigen_pop_len();
-	}
-}
-
 static void acpigen_soc_get_gpio_in_local5(uintptr_t addr)
 {
    /*