Change in coreboot[master]: soc/intel: Replace acpi_init_gnvs()

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

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

Change subject: soc/intel: Replace acpi_init_gnvs()
......................................................................

soc/intel: Replace acpi_init_gnvs()

Rename these to soc_fill_gnvs() and move the callsite away
from mb/.

Change-Id: I760c36f65c6122103f2be98fc11ee13832c2772e
Signed-off-by: Kyösti Mälkki 
---
M src/include/acpi/acpi_gnvs.h
M src/mainboard/bostentech/gbyt4/acpi_tables.c
M src/mainboard/facebook/fbg1701/acpi_tables.c
M src/mainboard/google/cyan/acpi_tables.c
M src/mainboard/google/rambi/acpi_tables.c
M src/mainboard/intel/harcuvar/acpi_tables.c
M src/mainboard/intel/strago/acpi_tables.c
M src/mainboard/ocp/tiogapass/acpi_tables.c
M src/mainboard/portwell/m107/acpi_tables.c
M src/mainboard/protectli/vault_bsw/acpi_tables.c
M src/mainboard/scaleway/tagada/acpi_tables.c
M src/soc/intel/baytrail/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/denverton_ns/acpi.c
M src/soc/intel/xeon_sp/skx/soc_acpi.c
17 files changed, 8 insertions(+), 30 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/48716/1

diff --git a/src/include/acpi/acpi_gnvs.h b/src/include/acpi/acpi_gnvs.h
index e006349..1a4813a 100644
--- a/src/include/acpi/acpi_gnvs.h
+++ b/src/include/acpi/acpi_gnvs.h
@@ -31,7 +31,6 @@
 struct global_nvs;

void acpi_create_gnvs(struct global_nvs *gnvs);
-void acpi_init_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/mainboard/bostentech/gbyt4/acpi_tables.c b/src/mainboard/bostentech/gbyt4/acpi_tables.c
index 175975e..dc0d7a2 100644
--- a/src/mainboard/bostentech/gbyt4/acpi_tables.c
+++ b/src/mainboard/bostentech/gbyt4/acpi_tables.c
@@ -7,8 +7,6 @@

void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-
    /* Enable USB ports in S3 */
    gnvs->s3u0 = 1;
    gnvs->s3u1 = 1;
diff --git a/src/mainboard/facebook/fbg1701/acpi_tables.c b/src/mainboard/facebook/fbg1701/acpi_tables.c
index 999fd1e..7538af0 100644
--- a/src/mainboard/facebook/fbg1701/acpi_tables.c
+++ b/src/mainboard/facebook/fbg1701/acpi_tables.c
@@ -8,8 +8,6 @@

void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-
    /* Enable USB ports in S3 */
    gnvs->s3u0 = 1;
    gnvs->s3u1 = 1;
diff --git a/src/mainboard/google/cyan/acpi_tables.c b/src/mainboard/google/cyan/acpi_tables.c
index e9e3f6cab..a30cd6a 100644
--- a/src/mainboard/google/cyan/acpi_tables.c
+++ b/src/mainboard/google/cyan/acpi_tables.c
@@ -8,8 +8,6 @@

void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-
    /* Enable USB ports in S3 */
    gnvs->s3u0 = 1;
    gnvs->s3u1 = 1;
diff --git a/src/mainboard/google/rambi/acpi_tables.c b/src/mainboard/google/rambi/acpi_tables.c
index a853ca6..161f68d 100644
--- a/src/mainboard/google/rambi/acpi_tables.c
+++ b/src/mainboard/google/rambi/acpi_tables.c
@@ -7,8 +7,6 @@

void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-
    /* Enable USB ports in S3 */
    gnvs->s3u0 = 1;
    gnvs->s3u1 = 1;
diff --git a/src/mainboard/intel/harcuvar/acpi_tables.c b/src/mainboard/intel/harcuvar/acpi_tables.c
index 20b4c2d..c3f90da 100644
--- a/src/mainboard/intel/harcuvar/acpi_tables.c
+++ b/src/mainboard/intel/harcuvar/acpi_tables.c
@@ -10,8 +10,6 @@

void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-
    /* Disable USB ports in S5 */
    gnvs->s5u0 = 0;
    gnvs->s5u1 = 0;
diff --git a/src/mainboard/intel/strago/acpi_tables.c b/src/mainboard/intel/strago/acpi_tables.c
index 4fec915..97795cd 100644
--- a/src/mainboard/intel/strago/acpi_tables.c
+++ b/src/mainboard/intel/strago/acpi_tables.c
@@ -12,8 +12,6 @@

void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-
    /* Enable USB ports in S3 */
    gnvs->s3u0 = 1;
    gnvs->s3u1 = 1;
diff --git a/src/mainboard/ocp/tiogapass/acpi_tables.c b/src/mainboard/ocp/tiogapass/acpi_tables.c
index 20f83e3..b6e3846 100644
--- a/src/mainboard/ocp/tiogapass/acpi_tables.c
+++ b/src/mainboard/ocp/tiogapass/acpi_tables.c
@@ -1,12 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */

#include <acpi/acpi.h>
-#include <acpi/acpi_gnvs.h>
-
-void mainboard_fill_gnvs(struct global_nvs *gnvs)
-{
-	acpi_init_gnvs(gnvs);
-}

void mainboard_fill_fadt(acpi_fadt_t *fadt)
 {
diff --git a/src/mainboard/portwell/m107/acpi_tables.c b/src/mainboard/portwell/m107/acpi_tables.c
index 999fd1e..7538af0 100644
--- a/src/mainboard/portwell/m107/acpi_tables.c
+++ b/src/mainboard/portwell/m107/acpi_tables.c
@@ -8,8 +8,6 @@

void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-
    /* Enable USB ports in S3 */
    gnvs->s3u0 = 1;
    gnvs->s3u1 = 1;
diff --git a/src/mainboard/protectli/vault_bsw/acpi_tables.c b/src/mainboard/protectli/vault_bsw/acpi_tables.c
index aaa886d..42ee438 100644
--- a/src/mainboard/protectli/vault_bsw/acpi_tables.c
+++ b/src/mainboard/protectli/vault_bsw/acpi_tables.c
@@ -7,9 +7,6 @@

void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-
-	acpi_init_gnvs(gnvs);
-
    /* Enable USB ports in S3 */
    gnvs->s3u0 = 1;
    gnvs->s3u1 = 1;
diff --git a/src/mainboard/scaleway/tagada/acpi_tables.c b/src/mainboard/scaleway/tagada/acpi_tables.c
index 1c0061f..cfaffe3 100644
--- a/src/mainboard/scaleway/tagada/acpi_tables.c
+++ b/src/mainboard/scaleway/tagada/acpi_tables.c
@@ -6,8 +6,6 @@

void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-
    /* Disable USB ports in S5 */
    gnvs->s5u0 = 0;
    gnvs->s5u1 = 0;
diff --git a/src/soc/intel/baytrail/acpi.c b/src/soc/intel/baytrail/acpi.c
index e8ef46f..1413dcb 100644
--- a/src/soc/intel/baytrail/acpi.c
+++ b/src/soc/intel/baytrail/acpi.c
@@ -55,7 +55,7 @@
    }
 };

-void acpi_init_gnvs(struct global_nvs *gnvs)
+void soc_fill_gnvs(struct global_nvs *gnvs)
 {
    /* Set unknown wake source */
    gnvs->pm1i = -1;
diff --git a/src/soc/intel/baytrail/southcluster.c b/src/soc/intel/baytrail/southcluster.c
index 60047b9..aeb3775 100644
--- a/src/soc/intel/baytrail/southcluster.c
+++ b/src/soc/intel/baytrail/southcluster.c
@@ -489,6 +489,7 @@
    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 ef4a339..10fe185 100644
--- a/src/soc/intel/braswell/acpi.c
+++ b/src/soc/intel/braswell/acpi.c
@@ -58,7 +58,7 @@
    }
 };

-void acpi_init_gnvs(struct global_nvs *gnvs)
+void soc_fill_gnvs(struct global_nvs *gnvs)
 {
    /* Set unknown wake source */
    gnvs->pm1i = -1;
@@ -369,6 +369,7 @@
    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 ec5d109..7bfa68f 100644
--- a/src/soc/intel/broadwell/pch/lpc.c
+++ b/src/soc/intel/broadwell/pch/lpc.c
@@ -614,6 +614,7 @@
    gnvs->pcnt = dev_count_cpu();
 #endif

+	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 9243110..11da8cd 100644
--- a/src/soc/intel/denverton_ns/acpi.c
+++ b/src/soc/intel/denverton_ns/acpi.c
@@ -59,7 +59,7 @@
    }
 };

-void acpi_init_gnvs(struct global_nvs *gnvs)
+void soc_fill_gnvs(struct global_nvs *gnvs)
 {
    /* CPU core count */
    gnvs->pcnt = dev_count_cpu();
@@ -246,6 +246,7 @@
    if (!gnvs)
    	return;

+	soc_fill_gnvs(gnvs);
    mainboard_fill_gnvs(gnvs);
    acpi_inject_nvsa();
 }
diff --git a/src/soc/intel/xeon_sp/skx/soc_acpi.c b/src/soc/intel/xeon_sp/skx/soc_acpi.c
index e98ee08..703ec21 100644
--- a/src/soc/intel/xeon_sp/skx/soc_acpi.c
+++ b/src/soc/intel/xeon_sp/skx/soc_acpi.c
@@ -26,7 +26,7 @@
    return current;
 }

-void acpi_init_gnvs(struct global_nvs *gnvs)
+void soc_fill_gnvs(struct global_nvs *gnvs)
 {
    /* CPU core count */
    gnvs->pcnt = dev_count_cpu();

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

Hello build bot (Jenkins), Frans Hendriks, Mariusz Szafrański, Jonathan Zhang, Patrick Rudolph, Piotr Król, Anjaneya "Reddy" Chagam, Michał Żygowski, Johnny Lin, Suresh Bellampalli, Vanessa Eusebio, Morgan Jang, Michal Motyl, Wim Vervoorn,

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

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

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

Change subject: soc/intel: Replace acpi_init_gnvs()
......................................................................

soc/intel: Replace acpi_init_gnvs()

Rename these to soc_fill_gnvs() and move the callsite away
from mb/.

Change-Id: I760c36f65c6122103f2be98fc11ee13832c2772e
Signed-off-by: Kyösti Mälkki 
---
M src/include/acpi/acpi_gnvs.h
M src/mainboard/bostentech/gbyt4/acpi_tables.c
M src/mainboard/facebook/fbg1701/acpi_tables.c
M src/mainboard/google/cyan/acpi_tables.c
M src/mainboard/google/rambi/acpi_tables.c
M src/mainboard/intel/harcuvar/acpi_tables.c
M src/mainboard/intel/strago/acpi_tables.c
M src/mainboard/ocp/tiogapass/acpi_tables.c
M src/mainboard/portwell/m107/acpi_tables.c
M src/mainboard/protectli/vault_bsw/acpi_tables.c
M src/mainboard/scaleway/tagada/acpi_tables.c
M src/soc/intel/baytrail/acpi.c
M src/soc/intel/baytrail/southcluster.c
M src/soc/intel/braswell/acpi.c
M src/soc/intel/denverton_ns/acpi.c
M src/soc/intel/xeon_sp/skx/soc_acpi.c
16 files changed, 7 insertions(+), 30 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/48716/3

[Frans Hendriks (Code Review)]

Frans Hendriks has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48716 )

Change subject: soc/intel: Replace acpi_init_gnvs()
......................................................................

Patch Set 3: Code-Review+2

[Arthur Heymans (Code Review)]

Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48716 )

Change subject: soc/intel: Replace acpi_init_gnvs()
......................................................................

Patch Set 7: Code-Review+2

[Wim Vervoorn (Code Review)]

Wim Vervoorn has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48716 )

Change subject: soc/intel: Replace acpi_init_gnvs()
......................................................................

Patch Set 7: Code-Review+2

[Nico Huber (Code Review)]

Nico Huber has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48716 )

Change subject: soc/intel: Replace acpi_init_gnvs()
......................................................................

soc/intel: Replace acpi_init_gnvs()

Rename these to soc_fill_gnvs() and move the callsite away
from mb/.

Change-Id: I760c36f65c6122103f2be98fc11ee13832c2772e
Signed-off-by: Kyösti Mälkki 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48716
Reviewed-by: Arthur Heymans 
Reviewed-by: Wim Vervoorn 
Reviewed-by: Frans Hendriks 
Tested-by: build bot (Jenkins) 
---
M src/include/acpi/acpi_gnvs.h
M src/mainboard/bostentech/gbyt4/acpi_tables.c
M src/mainboard/facebook/fbg1701/acpi_tables.c
M src/mainboard/google/cyan/acpi_tables.c
M src/mainboard/google/rambi/acpi_tables.c
M src/mainboard/intel/harcuvar/acpi_tables.c
M src/mainboard/intel/strago/acpi_tables.c
M src/mainboard/ocp/tiogapass/acpi_tables.c
M src/mainboard/portwell/m107/acpi_tables.c
M src/mainboard/protectli/vault_bsw/acpi_tables.c
M src/mainboard/scaleway/tagada/acpi_tables.c
M src/soc/intel/baytrail/acpi.c
M src/soc/intel/baytrail/southcluster.c
M src/soc/intel/braswell/acpi.c
M src/soc/intel/denverton_ns/acpi.c
M src/soc/intel/xeon_sp/skx/soc_acpi.c
16 files changed, 7 insertions(+), 30 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Wim Vervoorn: Looks good to me, approved
  Arthur Heymans: Looks good to me, approved
  Frans Hendriks: Looks good to me, approved

diff --git a/src/include/acpi/acpi_gnvs.h b/src/include/acpi/acpi_gnvs.h
index d2a8970..b5f65ca 100644
--- a/src/include/acpi/acpi_gnvs.h
+++ b/src/include/acpi/acpi_gnvs.h
@@ -32,7 +32,6 @@
  */

void acpi_create_gnvs(struct global_nvs *gnvs);
-void acpi_init_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/mainboard/bostentech/gbyt4/acpi_tables.c b/src/mainboard/bostentech/gbyt4/acpi_tables.c
index 175975e..dc0d7a2 100644
--- a/src/mainboard/bostentech/gbyt4/acpi_tables.c
+++ b/src/mainboard/bostentech/gbyt4/acpi_tables.c
@@ -7,8 +7,6 @@

void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-
    /* Enable USB ports in S3 */
    gnvs->s3u0 = 1;
    gnvs->s3u1 = 1;
diff --git a/src/mainboard/facebook/fbg1701/acpi_tables.c b/src/mainboard/facebook/fbg1701/acpi_tables.c
index 999fd1e..7538af0 100644
--- a/src/mainboard/facebook/fbg1701/acpi_tables.c
+++ b/src/mainboard/facebook/fbg1701/acpi_tables.c
@@ -8,8 +8,6 @@

void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-
    /* Enable USB ports in S3 */
    gnvs->s3u0 = 1;
    gnvs->s3u1 = 1;
diff --git a/src/mainboard/google/cyan/acpi_tables.c b/src/mainboard/google/cyan/acpi_tables.c
index e9e3f6cab..a30cd6a 100644
--- a/src/mainboard/google/cyan/acpi_tables.c
+++ b/src/mainboard/google/cyan/acpi_tables.c
@@ -8,8 +8,6 @@

void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-
    /* Enable USB ports in S3 */
    gnvs->s3u0 = 1;
    gnvs->s3u1 = 1;
diff --git a/src/mainboard/google/rambi/acpi_tables.c b/src/mainboard/google/rambi/acpi_tables.c
index a853ca6..161f68d 100644
--- a/src/mainboard/google/rambi/acpi_tables.c
+++ b/src/mainboard/google/rambi/acpi_tables.c
@@ -7,8 +7,6 @@

void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-
    /* Enable USB ports in S3 */
    gnvs->s3u0 = 1;
    gnvs->s3u1 = 1;
diff --git a/src/mainboard/intel/harcuvar/acpi_tables.c b/src/mainboard/intel/harcuvar/acpi_tables.c
index 20b4c2d..c3f90da 100644
--- a/src/mainboard/intel/harcuvar/acpi_tables.c
+++ b/src/mainboard/intel/harcuvar/acpi_tables.c
@@ -10,8 +10,6 @@

void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-
    /* Disable USB ports in S5 */
    gnvs->s5u0 = 0;
    gnvs->s5u1 = 0;
diff --git a/src/mainboard/intel/strago/acpi_tables.c b/src/mainboard/intel/strago/acpi_tables.c
index 4fec915..97795cd 100644
--- a/src/mainboard/intel/strago/acpi_tables.c
+++ b/src/mainboard/intel/strago/acpi_tables.c
@@ -12,8 +12,6 @@

void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-
    /* Enable USB ports in S3 */
    gnvs->s3u0 = 1;
    gnvs->s3u1 = 1;
diff --git a/src/mainboard/ocp/tiogapass/acpi_tables.c b/src/mainboard/ocp/tiogapass/acpi_tables.c
index 20f83e3..b6e3846 100644
--- a/src/mainboard/ocp/tiogapass/acpi_tables.c
+++ b/src/mainboard/ocp/tiogapass/acpi_tables.c
@@ -1,12 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */

#include <acpi/acpi.h>
-#include <acpi/acpi_gnvs.h>
-
-void mainboard_fill_gnvs(struct global_nvs *gnvs)
-{
-	acpi_init_gnvs(gnvs);
-}

void mainboard_fill_fadt(acpi_fadt_t *fadt)
 {
diff --git a/src/mainboard/portwell/m107/acpi_tables.c b/src/mainboard/portwell/m107/acpi_tables.c
index 999fd1e..7538af0 100644
--- a/src/mainboard/portwell/m107/acpi_tables.c
+++ b/src/mainboard/portwell/m107/acpi_tables.c
@@ -8,8 +8,6 @@

void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-
    /* Enable USB ports in S3 */
    gnvs->s3u0 = 1;
    gnvs->s3u1 = 1;
diff --git a/src/mainboard/protectli/vault_bsw/acpi_tables.c b/src/mainboard/protectli/vault_bsw/acpi_tables.c
index b794840..6fc71fe 100644
--- a/src/mainboard/protectli/vault_bsw/acpi_tables.c
+++ b/src/mainboard/protectli/vault_bsw/acpi_tables.c
@@ -8,9 +8,6 @@

void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-
-	acpi_init_gnvs(gnvs);
-
    /* Enable USB ports in S3 */
    gnvs->s3u0 = 1;
    gnvs->s3u1 = 1;
diff --git a/src/mainboard/scaleway/tagada/acpi_tables.c b/src/mainboard/scaleway/tagada/acpi_tables.c
index 1c0061f..cfaffe3 100644
--- a/src/mainboard/scaleway/tagada/acpi_tables.c
+++ b/src/mainboard/scaleway/tagada/acpi_tables.c
@@ -6,8 +6,6 @@

void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-
    /* Disable USB ports in S5 */
    gnvs->s5u0 = 0;
    gnvs->s5u1 = 0;
diff --git a/src/soc/intel/baytrail/acpi.c b/src/soc/intel/baytrail/acpi.c
index 35b26d3..cf031b9 100644
--- a/src/soc/intel/baytrail/acpi.c
+++ b/src/soc/intel/baytrail/acpi.c
@@ -56,7 +56,7 @@
    }
 };

-void acpi_init_gnvs(struct global_nvs *gnvs)
+void soc_fill_gnvs(struct global_nvs *gnvs)
 {
    /* Set unknown wake source */
    gnvs->pm1i = -1;
diff --git a/src/soc/intel/baytrail/southcluster.c b/src/soc/intel/baytrail/southcluster.c
index 60047b9..aeb3775 100644
--- a/src/soc/intel/baytrail/southcluster.c
+++ b/src/soc/intel/baytrail/southcluster.c
@@ -489,6 +489,7 @@
    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 2899888..caeae39 100644
--- a/src/soc/intel/braswell/acpi.c
+++ b/src/soc/intel/braswell/acpi.c
@@ -59,7 +59,7 @@
    }
 };

-void acpi_init_gnvs(struct global_nvs *gnvs)
+void soc_fill_gnvs(struct global_nvs *gnvs)
 {
    /* Set unknown wake source */
    gnvs->pm1i = -1;
@@ -370,6 +370,7 @@
    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 6730bff..8ef2faa 100644
--- a/src/soc/intel/denverton_ns/acpi.c
+++ b/src/soc/intel/denverton_ns/acpi.c
@@ -60,7 +60,7 @@
    }
 };

-void acpi_init_gnvs(struct global_nvs *gnvs)
+void soc_fill_gnvs(struct global_nvs *gnvs)
 {
    /* CPU core count */
    gnvs->pcnt = dev_count_cpu();
@@ -247,6 +247,7 @@
    if (!gnvs)
    	return;

+	soc_fill_gnvs(gnvs);
    mainboard_fill_gnvs(gnvs);
    acpi_inject_nvsa();
 }
diff --git a/src/soc/intel/xeon_sp/skx/soc_acpi.c b/src/soc/intel/xeon_sp/skx/soc_acpi.c
index af52674..a7050f0 100644
--- a/src/soc/intel/xeon_sp/skx/soc_acpi.c
+++ b/src/soc/intel/xeon_sp/skx/soc_acpi.c
@@ -28,7 +28,7 @@
    return current;
 }

-void acpi_init_gnvs(struct global_nvs *gnvs)
+void soc_fill_gnvs(struct global_nvs *gnvs)
 {
    /* CPU core count */
    gnvs->pcnt = dev_count_cpu();