[coreboot-gerrit] Change in coreboot[master]: sb/intel: Use acpi_inject_nvsa()

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

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

Change subject: sb/intel: Use acpi_inject_nvsa()
......................................................................

sb/intel: Use acpi_inject_nvsa()

Change-Id: I5f1762c4a25631af9d29a2cb038620d9e9698f8b
Signed-off-by: Kyösti Mälkki 
---
M src/southbridge/intel/i82801ix/lpc.c
M src/southbridge/intel/i82801jx/lpc.c
2 files changed, 8 insertions(+), 20 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/15/48715/1

diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c
index f587d01..064d79e 100644
--- a/src/southbridge/intel/i82801ix/lpc.c
+++ b/src/southbridge/intel/i82801ix/lpc.c
@@ -15,7 +15,6 @@
 #include <acpi/acpi_gnvs.h>
 #include <cpu/x86/smm.h>
 #include <acpi/acpigen.h>
-#include <cbmem.h>
 #include <string.h>
 #include "chip.h"
 #include "i82801ix.h"
@@ -456,16 +455,11 @@
 void southbridge_inject_dsdt(const struct device *dev)
 {
    struct global_nvs *gnvs = acpi_get_gnvs();
+	if (!gnvs)
+		return;

-	if (gnvs) {
-		acpi_create_gnvs(gnvs);
-
-
-		/* Add it to SSDT.  */
-		acpigen_write_scope("\");
-		acpigen_write_name_dword("NVSA", (uintptr_t)gnvs);
-		acpigen_pop_len();
-	}
+	acpi_create_gnvs(gnvs);
+	acpi_inject_nvsa();
 }

static const char *lpc_acpi_name(const struct device *dev)
diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c
index 75cc7f4..d959120 100644
--- a/src/southbridge/intel/i82801jx/lpc.c
+++ b/src/southbridge/intel/i82801jx/lpc.c
@@ -16,7 +16,6 @@
 #include <cpu/x86/smm.h>
 #include <acpi/acpigen.h>
 #include <arch/smp/mpspec.h>
-#include <cbmem.h>
 #include <string.h>
 #include "chip.h"
 #include "i82801jx.h"
@@ -480,16 +479,11 @@
 void southbridge_inject_dsdt(const struct device *dev)
 {
    struct global_nvs *gnvs = acpi_get_gnvs();
+	if (!gnvs)
+		return;

-	if (gnvs) {
-		acpi_create_gnvs(gnvs);
-
-
-		/* Add it to SSDT.  */
-		acpigen_write_scope("\");
-		acpigen_write_name_dword("NVSA", (u32) gnvs);
-		acpigen_pop_len();
-	}
+	acpi_create_gnvs(gnvs);
+	acpi_inject_nvsa();
 }

static const char *lpc_acpi_name(const struct device *dev)