Change in coreboot[master]: ACPI: Call mainboard_fill_gnvs() early

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

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

Change subject: ACPI: Call mainboard_fill_gnvs() early
......................................................................

ACPI: Call mainboard_fill_gnvs() early

Change-Id: I515e830808a95eee3ce72b16fd26da6ec79dac85
Signed-off-by: Kyösti Mälkki 
---
M src/acpi/gnvs.c
M src/soc/intel/baytrail/southcluster.c
M src/soc/intel/braswell/acpi.c
M src/soc/intel/broadwell/pch/lpc.c
M src/soc/intel/common/block/acpi/acpi.c
M src/soc/intel/denverton_ns/acpi.c
M src/soc/intel/skylake/acpi.c
M src/soc/intel/xeon_sp/acpi.c
M src/southbridge/intel/bd82x6x/lpc.c
M src/southbridge/intel/i82801gx/lpc.c
M src/southbridge/intel/i82801ix/lpc.c
M src/southbridge/intel/i82801jx/lpc.c
M src/southbridge/intel/ibexpeak/lpc.c
M src/southbridge/intel/lynxpoint/lpc.c
14 files changed, 3 insertions(+), 90 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/18/48718/1

diff --git a/src/acpi/gnvs.c b/src/acpi/gnvs.c
index b5f2ad2..671afbd 100644
--- a/src/acpi/gnvs.c
+++ b/src/acpi/gnvs.c
@@ -57,6 +57,9 @@
    if (CONFIG(CHROMEOS))
    	gnvs_assign_chromeos();

+	soc_fill_gnvs(gnvs);
+	mainboard_fill_gnvs(gnvs);
+
    return gnvs;
 }

diff --git a/src/soc/intel/baytrail/southcluster.c b/src/soc/intel/baytrail/southcluster.c
index aeb3775..ba03389 100644
--- a/src/soc/intel/baytrail/southcluster.c
+++ b/src/soc/intel/baytrail/southcluster.c
@@ -485,13 +485,6 @@

static void southcluster_inject_dsdt(const struct device *device)
 {
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-	soc_fill_gnvs(gnvs);
-	mainboard_fill_gnvs(gnvs);
-
    acpi_inject_nvsa();
 }

diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c
index 10fe185..720f3f7 100644
--- a/src/soc/intel/braswell/acpi.c
+++ b/src/soc/intel/braswell/acpi.c
@@ -365,13 +365,6 @@

void southcluster_inject_dsdt(const struct device *device)
 {
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-	soc_fill_gnvs(gnvs);
-	mainboard_fill_gnvs(gnvs);
-
    acpi_inject_nvsa();
 }

diff --git a/src/soc/intel/broadwell/pch/lpc.c b/src/soc/intel/broadwell/pch/lpc.c
index 7bfa68f..220ffc7 100644
--- a/src/soc/intel/broadwell/pch/lpc.c
+++ b/src/soc/intel/broadwell/pch/lpc.c
@@ -602,20 +602,6 @@

static void southcluster_inject_dsdt(const struct device *device)
 {
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-#if 0
-	/* Set unknown wake source */
-	gnvs->pm1i = -1;
-
-	/* CPU core count */
-	gnvs->pcnt = dev_count_cpu();
-#endif
-
-	soc_fill_gnvs(gnvs);
-	mainboard_fill_gnvs(gnvs);
    acpi_inject_nvsa();
 }

diff --git a/src/soc/intel/common/block/acpi/acpi.c b/src/soc/intel/common/block/acpi/acpi.c
index b95ffcd..f2dc651 100644
--- a/src/soc/intel/common/block/acpi/acpi.c
+++ b/src/soc/intel/common/block/acpi/acpi.c
@@ -217,13 +217,6 @@

void southbridge_inject_dsdt(const struct device *device)
 {
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-	soc_fill_gnvs(gnvs);
-	mainboard_fill_gnvs(gnvs);
-
    acpi_inject_nvsa();
 }

diff --git a/src/soc/intel/denverton_ns/acpi.c b/src/soc/intel/denverton_ns/acpi.c
index 11da8cd..c07cdbb 100644
--- a/src/soc/intel/denverton_ns/acpi.c
+++ b/src/soc/intel/denverton_ns/acpi.c
@@ -242,12 +242,6 @@

void southcluster_inject_dsdt(const struct device *device)
 {
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-	soc_fill_gnvs(gnvs);
-	mainboard_fill_gnvs(gnvs);
    acpi_inject_nvsa();
 }

diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c
index 024fce3..3ac9950 100644
--- a/src/soc/intel/skylake/acpi.c
+++ b/src/soc/intel/skylake/acpi.c
@@ -523,11 +523,6 @@

void southbridge_inject_dsdt(const struct device *device)
 {
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-	soc_fill_gnvs(gnvs);
    acpi_inject_nvsa();
 }

diff --git a/src/soc/intel/xeon_sp/acpi.c b/src/soc/intel/xeon_sp/acpi.c
index 45b0ade..41b4bb3 100644
--- a/src/soc/intel/xeon_sp/acpi.c
+++ b/src/soc/intel/xeon_sp/acpi.c
@@ -205,13 +205,6 @@

void southbridge_inject_dsdt(const struct device *device)
 {
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-	soc_fill_gnvs(gnvs);
-	mainboard_fill_gnvs();
-
    acpi_inject_nvsa();
 }

diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c
index cc57daf..fc93aa3 100644
--- a/src/southbridge/intel/bd82x6x/lpc.c
+++ b/src/southbridge/intel/bd82x6x/lpc.c
@@ -650,13 +650,6 @@

void southbridge_inject_dsdt(const struct device *dev)
 {
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-	soc_fill_gnvs(gnvs);
-	mainboard_fill_gnvs(gnvs);
-
    acpi_inject_nvsa();
 }

diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c
index 649578f..b460267 100644
--- a/src/southbridge/intel/i82801gx/lpc.c
+++ b/src/southbridge/intel/i82801gx/lpc.c
@@ -486,12 +486,6 @@

void southbridge_inject_dsdt(const struct device *dev)
 {
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-	soc_fill_gnvs(gnvs);
-	mainboard_fill_gnvs(gnvs);
    acpi_inject_nvsa();
 }

diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c
index 67c8797..ebd8303 100644
--- a/src/southbridge/intel/i82801ix/lpc.c
+++ b/src/southbridge/intel/i82801ix/lpc.c
@@ -454,11 +454,6 @@

void southbridge_inject_dsdt(const struct device *dev)
 {
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-	mainboard_fill_gnvs(gnvs);
    acpi_inject_nvsa();
 }

diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c
index db3e42d..cf45ff4 100644
--- a/src/southbridge/intel/i82801jx/lpc.c
+++ b/src/southbridge/intel/i82801jx/lpc.c
@@ -478,11 +478,6 @@

void southbridge_inject_dsdt(const struct device *dev)
 {
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-	mainboard_fill_gnvs(gnvs);
    acpi_inject_nvsa();
 }

diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c
index 030119b..951ef87 100644
--- a/src/southbridge/intel/ibexpeak/lpc.c
+++ b/src/southbridge/intel/ibexpeak/lpc.c
@@ -550,13 +550,6 @@

void southbridge_inject_dsdt(const struct device *dev)
 {
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-	soc_fill_gnvs(gnvs);
-	mainboard_fill_gnvs(gnvs);
-
    acpi_inject_nvsa();
 }

diff --git a/src/southbridge/intel/lynxpoint/lpc.c b/src/southbridge/intel/lynxpoint/lpc.c
index a3666ba..a4fbed4 100644
--- a/src/southbridge/intel/lynxpoint/lpc.c
+++ b/src/southbridge/intel/lynxpoint/lpc.c
@@ -688,13 +688,6 @@

void southbridge_inject_dsdt(const struct device *dev)
 {
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-	soc_fill_gnvs(gnvs);
-	mainboard_fill_gnvs(gnvs);
-
    acpi_inject_nvsa();
 }

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

Hello build bot (Jenkins), Mariusz Szafrański, Suresh Bellampalli, Vanessa Eusebio, Michal Motyl, Patrick Rudolph,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/48718

to look at the new patch set (#2).

Change subject: ACPI: Call mainboard_fill_gnvs() early
......................................................................

ACPI: Call mainboard_fill_gnvs() early

Change-Id: I515e830808a95eee3ce72b16fd26da6ec79dac85
Signed-off-by: Kyösti Mälkki 
---
M src/acpi/gnvs.c
M src/soc/intel/baytrail/southcluster.c
M src/soc/intel/braswell/acpi.c
M src/soc/intel/broadwell/pch/lpc.c
M src/soc/intel/common/block/acpi/acpi.c
M src/soc/intel/denverton_ns/acpi.c
M src/soc/intel/skylake/acpi.c
M src/soc/intel/xeon_sp/acpi.c
M src/southbridge/intel/bd82x6x/lpc.c
M src/southbridge/intel/i82801gx/lpc.c
M src/southbridge/intel/i82801ix/lpc.c
M src/southbridge/intel/i82801jx/lpc.c
M src/southbridge/intel/ibexpeak/lpc.c
M src/southbridge/intel/lynxpoint/lpc.c
14 files changed, 3 insertions(+), 90 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/18/48718/2

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

Hello build bot (Jenkins), Mariusz Szafrański, Suresh Bellampalli, Vanessa Eusebio, Michal Motyl, Patrick Rudolph,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/48718

to look at the new patch set (#3).

Change subject: ACPI: Call mainboard_fill_gnvs() early
......................................................................

ACPI: Call mainboard_fill_gnvs() early

Change-Id: I515e830808a95eee3ce72b16fd26da6ec79dac85
Signed-off-by: Kyösti Mälkki 
---
M src/acpi/gnvs.c
M src/soc/intel/baytrail/southcluster.c
M src/soc/intel/braswell/acpi.c
M src/soc/intel/broadwell/pch/lpc.c
M src/soc/intel/common/block/acpi/acpi.c
M src/soc/intel/denverton_ns/acpi.c
M src/soc/intel/skylake/acpi.c
M src/soc/intel/xeon_sp/acpi.c
M src/southbridge/intel/bd82x6x/lpc.c
M src/southbridge/intel/i82801gx/lpc.c
M src/southbridge/intel/i82801ix/lpc.c
M src/southbridge/intel/i82801jx/lpc.c
M src/southbridge/intel/ibexpeak/lpc.c
M src/southbridge/intel/lynxpoint/lpc.c
14 files changed, 3 insertions(+), 83 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/18/48718/3

Change in coreboot[master]: ACPI: Call fill_gnvs() early

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

Hello build bot (Jenkins), Mariusz Szafrański, Suresh Bellampalli, Vanessa Eusebio, Michal Motyl, Patrick Rudolph,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/48718

to look at the new patch set (#4).

Change subject: ACPI: Call fill_gnvs() early
......................................................................

ACPI: Call fill_gnvs() early

TBD: soc_fill_gnvs() has non-static dev_count_cpu()

Change-Id: I515e830808a95eee3ce72b16fd26da6ec79dac85
Signed-off-by: Kyösti Mälkki 
---
M src/acpi/gnvs.c
M src/soc/intel/baytrail/southcluster.c
M src/soc/intel/braswell/acpi.c
M src/soc/intel/broadwell/pch/lpc.c
M src/soc/intel/common/block/acpi/acpi.c
M src/soc/intel/denverton_ns/acpi.c
M src/soc/intel/skylake/acpi.c
M src/soc/intel/xeon_sp/acpi.c
M src/southbridge/intel/bd82x6x/lpc.c
M src/southbridge/intel/i82801gx/lpc.c
M src/southbridge/intel/i82801ix/lpc.c
M src/southbridge/intel/i82801jx/lpc.c
M src/southbridge/intel/ibexpeak/lpc.c
M src/southbridge/intel/lynxpoint/lpc.c
14 files changed, 3 insertions(+), 83 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/18/48718/4

Change in coreboot[master]: ACPI: Call fill_gnvs() early

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

Hello build bot (Jenkins), Mariusz Szafrański, Suresh Bellampalli, Vanessa Eusebio, Michal Motyl, Patrick Rudolph,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/48718

to look at the new patch set (#5).

Change subject: ACPI: Call fill_gnvs() early
......................................................................

ACPI: Call fill_gnvs() early

TBD: soc_fill_gnvs() has non-static dev_count_cpu()

Change-Id: I515e830808a95eee3ce72b16fd26da6ec79dac85
Signed-off-by: Kyösti Mälkki 
---
M src/acpi/gnvs.c
M src/soc/intel/baytrail/southcluster.c
M src/soc/intel/braswell/acpi.c
M src/soc/intel/broadwell/pch/lpc.c
M src/soc/intel/common/block/acpi/acpi.c
M src/soc/intel/denverton_ns/acpi.c
M src/soc/intel/skylake/acpi.c
M src/southbridge/intel/bd82x6x/lpc.c
M src/southbridge/intel/i82801gx/lpc.c
M src/southbridge/intel/i82801ix/lpc.c
M src/southbridge/intel/i82801jx/lpc.c
M src/southbridge/intel/ibexpeak/lpc.c
M src/southbridge/intel/lynxpoint/lpc.c
13 files changed, 3 insertions(+), 76 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/18/48718/5

Change in coreboot[master]: [WIP] ACPI: Call fill_gnvs() early

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

Hello build bot (Jenkins), Mariusz Szafrański, Suresh Bellampalli, Vanessa Eusebio, Michal Motyl, Patrick Rudolph,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/48718

to look at the new patch set (#6).

Change subject: [WIP] ACPI: Call fill_gnvs() early
......................................................................

[WIP] ACPI: Call fill_gnvs() early

TBD: Some non-static initialisations need to be fixed first.

Change-Id: I515e830808a95eee3ce72b16fd26da6ec79dac85
Signed-off-by: Kyösti Mälkki 
---
M src/acpi/gnvs.c
M src/soc/intel/baytrail/southcluster.c
M src/soc/intel/braswell/acpi.c
M src/soc/intel/broadwell/pch/lpc.c
M src/soc/intel/common/block/acpi/acpi.c
M src/soc/intel/denverton_ns/acpi.c
M src/soc/intel/skylake/acpi.c
M src/southbridge/intel/bd82x6x/lpc.c
M src/southbridge/intel/i82801gx/lpc.c
M src/southbridge/intel/i82801ix/lpc.c
M src/southbridge/intel/i82801jx/lpc.c
M src/southbridge/intel/ibexpeak/lpc.c
M src/southbridge/intel/lynxpoint/lpc.c
13 files changed, 3 insertions(+), 77 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/18/48718/6

Change in coreboot[master]: ACPI: Add common acpi_fill_gnvs()

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

Attention is currently required from: Lance Zhao.
Hello Lance Zhao, build bot (Jenkins), Mariusz Szafrański, Suresh Bellampalli, Vanessa Eusebio, Michal Motyl, Patrick Rudolph,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/48718

to look at the new patch set (#7).

Change subject: ACPI: Add common acpi_fill_gnvs()
......................................................................

ACPI: Add common acpi_fill_gnvs()

Change-Id: I515e830808a95eee3ce72b16fd26da6ec79dac85
Signed-off-by: Kyösti Mälkki 
---
M src/acpi/acpi.c
M src/acpi/gnvs.c
M src/include/acpi/acpi.h
M src/soc/amd/picasso/acpi.c
M src/soc/amd/stoneyridge/acpi.c
M src/soc/intel/baytrail/southcluster.c
M src/soc/intel/braswell/acpi.c
M src/soc/intel/broadwell/pch/lpc.c
M src/soc/intel/common/block/acpi/acpi.c
M src/soc/intel/denverton_ns/acpi.c
M src/soc/intel/skylake/acpi.c
M src/southbridge/intel/bd82x6x/lpc.c
M src/southbridge/intel/i82801gx/lpc.c
M src/southbridge/intel/i82801ix/lpc.c
M src/southbridge/intel/i82801jx/lpc.c
M src/southbridge/intel/ibexpeak/lpc.c
M src/southbridge/intel/lynxpoint/lpc.c
17 files changed, 14 insertions(+), 87 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/18/48718/7

Change in coreboot[master]: ACPI: Add common acpi_fill_gnvs()

[Lance Zhao (Code Review)]

Attention is currently required from: Jason Glenesk, Marshall Dawson, Kyösti Mälkki, Felix Held.
Lance Zhao has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48718 )

Change subject: ACPI: Add common acpi_fill_gnvs()
......................................................................

Patch Set 7:

(1 comment)

File src/acpi/gnvs.c:

https://review.coreboot.org/c/coreboot/+/48718/comment/09a327e0_3707dd46 
PS7, Line 83: gnvs
who set the gnvs here? What about the soc they don't have gnvs at all?

Change in coreboot[master]: ACPI: Add common acpi_fill_gnvs()

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

Attention is currently required from: Lance Zhao, Jason Glenesk, Marshall Dawson, Felix Held.
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48718 )

Change subject: ACPI: Add common acpi_fill_gnvs()
......................................................................

Patch Set 7:

(1 comment)

File src/acpi/gnvs.c:

https://review.coreboot.org/c/coreboot/+/48718/comment/2e02101b_483acbb9 
PS7, Line 83: gnvs
> who set the gnvs here? What about the soc they don't have gnvs at all?

For normal boot path it is get_or_create_gnvs() above. For S3 resume it could be acpi_get_gnvs() instead. Currently gnvs_size_of_array() returning 0 disables GNVS.

With CB:49344 it's ACPI_SOC_NVS to determine if GNVS is created. I have some overlapping works with Angel about this at the moment.

Change in coreboot[master]: ACPI: Add common acpi_fill_gnvs()

[Angel Pons (Code Review)]

Attention is currently required from: Lance Zhao, Jason Glenesk, Marshall Dawson, Kyösti Mälkki, Felix Held.
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48718 )

Change subject: ACPI: Add common acpi_fill_gnvs()
......................................................................

Patch Set 7: Code-Review+2

(1 comment)

File src/acpi/gnvs.c:

https://review.coreboot.org/c/coreboot/+/48718/comment/8ae804d9_00806b38 
PS7, Line 83: gnvs
> For normal boot path it is get_or_create_gnvs() above. […]

GNVS is initialized in early ramstage, so this pointer should be valid by then. Can this be marked as resolved?

Change in coreboot[master]: ACPI: Add common acpi_fill_gnvs()

[Lance Zhao (Code Review)]

Attention is currently required from: Jason Glenesk, Marshall Dawson, Kyösti Mälkki, Felix Held.
Lance Zhao has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48718 )

Change subject: ACPI: Add common acpi_fill_gnvs()
......................................................................

Patch Set 8: Code-Review+2

(1 comment)

File src/acpi/gnvs.c:

https://review.coreboot.org/c/coreboot/+/48718/comment/96c27396_efc3daef 
PS7, Line 83: gnvs
> GNVS is initialized in early ramstage, so this pointer should be valid by then. […]

Done

Change in coreboot[master]: ACPI: Add common acpi_fill_gnvs()

[Angel Pons (Code Review)]

Angel Pons has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48718 )

Change subject: ACPI: Add common acpi_fill_gnvs()
......................................................................

ACPI: Add common acpi_fill_gnvs()

Change-Id: I515e830808a95eee3ce72b16fd26da6ec79dac85
Signed-off-by: Kyösti Mälkki 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48718
Reviewed-by: Lance Zhao
Reviewed-by: Angel Pons 
Tested-by: build bot (Jenkins) 
---
M src/acpi/acpi.c
M src/acpi/gnvs.c
M src/include/acpi/acpi.h
M src/soc/amd/picasso/acpi.c
M src/soc/amd/stoneyridge/acpi.c
M src/soc/intel/baytrail/southcluster.c
M src/soc/intel/braswell/acpi.c
M src/soc/intel/broadwell/pch/lpc.c
M src/soc/intel/common/block/acpi/acpi.c
M src/soc/intel/denverton_ns/acpi.c
M src/soc/intel/skylake/acpi.c
M src/southbridge/intel/bd82x6x/lpc.c
M src/southbridge/intel/i82801gx/lpc.c
M src/southbridge/intel/i82801ix/lpc.c
M src/southbridge/intel/i82801jx/lpc.c
M src/southbridge/intel/ibexpeak/lpc.c
M src/southbridge/intel/lynxpoint/lpc.c
17 files changed, 14 insertions(+), 87 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Lance Zhao: Looks good to me, approved
  Angel Pons: Looks good to me, approved

diff --git a/src/acpi/acpi.c b/src/acpi/acpi.c
index ee30391..6f64d10 100644
--- a/src/acpi/acpi.c
+++ b/src/acpi/acpi.c
@@ -1472,6 +1472,9 @@
    	current += sizeof(acpi_header_t);

acpigen_set_current((char *) current);
+
+		acpi_fill_gnvs();
+
    	for (dev = all_devices; dev; dev = dev->next)
    		if (dev->ops && dev->ops->acpi_inject_dsdt)
    			dev->ops->acpi_inject_dsdt(dev);
diff --git a/src/acpi/gnvs.c b/src/acpi/gnvs.c
index c8478ee..27b4b8e 100644
--- a/src/acpi/gnvs.c
+++ b/src/acpi/gnvs.c
@@ -77,3 +77,12 @@
    acpigen_write_name_dword("NVSA", (uintptr_t)gnvs);
    acpigen_pop_len();
 }
+
+void acpi_fill_gnvs(void)
+{
+	if (!gnvs)
+		return;
+
+	soc_fill_gnvs(gnvs);
+	mainboard_fill_gnvs(gnvs);
+}
diff --git a/src/include/acpi/acpi.h b/src/include/acpi/acpi.h
index e266a2d..3b9e977 100644
--- a/src/include/acpi/acpi.h
+++ b/src/include/acpi/acpi.h
@@ -961,6 +961,8 @@
 void soc_fill_fadt(acpi_fadt_t *fadt);
 void mainboard_fill_fadt(acpi_fadt_t *fadt);

+void acpi_fill_gnvs(void);
+
 void update_ssdt(void *ssdt);
 void update_ssdtx(void *ssdtx, int i);

diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c
index e0a29a4..7108722 100644
--- a/src/soc/amd/picasso/acpi.c
+++ b/src/soc/amd/picasso/acpi.c
@@ -405,11 +405,6 @@

void southbridge_inject_dsdt(const struct device *device)
 {
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-	soc_fill_gnvs(gnvs);
    acpi_inject_nvsa();
 }

diff --git a/src/soc/amd/stoneyridge/acpi.c b/src/soc/amd/stoneyridge/acpi.c
index edbebad..03acf86 100644
--- a/src/soc/amd/stoneyridge/acpi.c
+++ b/src/soc/amd/stoneyridge/acpi.c
@@ -173,11 +173,6 @@

void southbridge_inject_dsdt(const struct device *device)
 {
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-	soc_fill_gnvs(gnvs);
    acpi_inject_nvsa();
 }

diff --git a/src/soc/intel/baytrail/southcluster.c b/src/soc/intel/baytrail/southcluster.c
index aeb3775..16e4ea4 100644
--- a/src/soc/intel/baytrail/southcluster.c
+++ b/src/soc/intel/baytrail/southcluster.c
@@ -19,7 +19,6 @@
 #include <soc/iomap.h>
 #include <soc/irq.h>
 #include <soc/lpc.h>
-#include <soc/nvs.h>
 #include <soc/pci_devs.h>
 #include <soc/pm.h>
 #include <soc/ramstage.h>
@@ -485,13 +484,6 @@

static void southcluster_inject_dsdt(const struct device *device)
 {
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-	soc_fill_gnvs(gnvs);
-	mainboard_fill_gnvs(gnvs);
-
    acpi_inject_nvsa();
 }

diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c
index caeae39..1849d7d 100644
--- a/src/soc/intel/braswell/acpi.c
+++ b/src/soc/intel/braswell/acpi.c
@@ -366,13 +366,6 @@

void southcluster_inject_dsdt(const struct device *device)
 {
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-	soc_fill_gnvs(gnvs);
-	mainboard_fill_gnvs(gnvs);
-
    acpi_inject_nvsa();
 }

diff --git a/src/soc/intel/broadwell/pch/lpc.c b/src/soc/intel/broadwell/pch/lpc.c
index 03a6872..1fac25e 100644
--- a/src/soc/intel/broadwell/pch/lpc.c
+++ b/src/soc/intel/broadwell/pch/lpc.c
@@ -611,13 +611,6 @@

static void southcluster_inject_dsdt(const struct device *device)
 {
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-	soc_fill_gnvs(gnvs);
-	mainboard_fill_gnvs(gnvs);
-
    acpi_inject_nvsa();
 }

diff --git a/src/soc/intel/common/block/acpi/acpi.c b/src/soc/intel/common/block/acpi/acpi.c
index 1a18cfc..1c31cd1 100644
--- a/src/soc/intel/common/block/acpi/acpi.c
+++ b/src/soc/intel/common/block/acpi/acpi.c
@@ -238,13 +238,6 @@

void southbridge_inject_dsdt(const struct device *device)
 {
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-	soc_fill_gnvs(gnvs);
-	mainboard_fill_gnvs(gnvs);
-
    acpi_inject_nvsa();
 }

diff --git a/src/soc/intel/denverton_ns/acpi.c b/src/soc/intel/denverton_ns/acpi.c
index 8ef2faa..794dae9 100644
--- a/src/soc/intel/denverton_ns/acpi.c
+++ b/src/soc/intel/denverton_ns/acpi.c
@@ -243,12 +243,6 @@

void southcluster_inject_dsdt(const struct device *device)
 {
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-	soc_fill_gnvs(gnvs);
-	mainboard_fill_gnvs(gnvs);
    acpi_inject_nvsa();
 }

diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c
index 2406dc5..07d7601 100644
--- a/src/soc/intel/skylake/acpi.c
+++ b/src/soc/intel/skylake/acpi.c
@@ -524,11 +524,6 @@

void southbridge_inject_dsdt(const struct device *device)
 {
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-	soc_fill_gnvs(gnvs);
    acpi_inject_nvsa();
 }

diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c
index bb1ab6b..bcdc75b 100644
--- a/src/southbridge/intel/bd82x6x/lpc.c
+++ b/src/southbridge/intel/bd82x6x/lpc.c
@@ -660,13 +660,6 @@

void southbridge_inject_dsdt(const struct device *dev)
 {
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-	soc_fill_gnvs(gnvs);
-	mainboard_fill_gnvs(gnvs);
-
    acpi_inject_nvsa();
 }

diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c
index 5438b00..f07497c 100644
--- a/src/southbridge/intel/i82801gx/lpc.c
+++ b/src/southbridge/intel/i82801gx/lpc.c
@@ -491,12 +491,6 @@

void southbridge_inject_dsdt(const struct device *dev)
 {
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-	soc_fill_gnvs(gnvs);
-	mainboard_fill_gnvs(gnvs);
    acpi_inject_nvsa();
 }

diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c
index cefc30c..fbe4af7 100644
--- a/src/southbridge/intel/i82801ix/lpc.c
+++ b/src/southbridge/intel/i82801ix/lpc.c
@@ -465,11 +465,6 @@

void southbridge_inject_dsdt(const struct device *dev)
 {
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-	mainboard_fill_gnvs(gnvs);
    acpi_inject_nvsa();
 }

diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c
index 86478fa..6c1c318 100644
--- a/src/southbridge/intel/i82801jx/lpc.c
+++ b/src/southbridge/intel/i82801jx/lpc.c
@@ -483,11 +483,6 @@

void southbridge_inject_dsdt(const struct device *dev)
 {
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-	mainboard_fill_gnvs(gnvs);
    acpi_inject_nvsa();
 }

diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c
index 3f59a19..4db22f0 100644
--- a/src/southbridge/intel/ibexpeak/lpc.c
+++ b/src/southbridge/intel/ibexpeak/lpc.c
@@ -555,13 +555,6 @@

void southbridge_inject_dsdt(const struct device *dev)
 {
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-	soc_fill_gnvs(gnvs);
-	mainboard_fill_gnvs(gnvs);
-
    acpi_inject_nvsa();
 }

diff --git a/src/southbridge/intel/lynxpoint/lpc.c b/src/southbridge/intel/lynxpoint/lpc.c
index 05593b1..a17dfa4 100644
--- a/src/southbridge/intel/lynxpoint/lpc.c
+++ b/src/southbridge/intel/lynxpoint/lpc.c
@@ -703,13 +703,6 @@

void southbridge_inject_dsdt(const struct device *dev)
 {
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-	soc_fill_gnvs(gnvs);
-	mainboard_fill_gnvs(gnvs);
-
    acpi_inject_nvsa();
 }