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/+/42924 )

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/facebook/fbg1701/acpi_tables.c
M src/mainboard/google/auron/acpi_tables.c
M src/mainboard/google/cyan/acpi_tables.c
M src/mainboard/google/jecht/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/intel/wtm2/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/purism/librem_bdw/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/acpi.c
M src/soc/intel/broadwell/lpc.c
M src/soc/intel/denverton_ns/acpi.c
M src/soc/intel/xeon_sp/skx/acpi.c
21 files changed, 10 insertions(+), 39 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/24/42924/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/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/auron/acpi_tables.c b/src/mainboard/google/auron/acpi_tables.c
index 79c9fc6..1277a23 100644
--- a/src/mainboard/google/auron/acpi_tables.c
+++ b/src/mainboard/google/auron/acpi_tables.c
@@ -9,8 +9,6 @@

void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-
    /* Enable USB ports in S3 */
    gnvs->s3u0 = 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/jecht/acpi_tables.c b/src/mainboard/google/jecht/acpi_tables.c
index 52233bd..359edb5 100644
--- a/src/mainboard/google/jecht/acpi_tables.c
+++ b/src/mainboard/google/jecht/acpi_tables.c
@@ -11,8 +11,6 @@

void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-
    /* Enable USB ports in S3 */
    gnvs->s3u0 = 1;

diff --git a/src/mainboard/google/rambi/acpi_tables.c b/src/mainboard/google/rambi/acpi_tables.c
index 766b581..698eee9 100644
--- a/src/mainboard/google/rambi/acpi_tables.c
+++ b/src/mainboard/google/rambi/acpi_tables.c
@@ -11,8 +11,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 80d1db1..30d028c 100644
--- a/src/mainboard/intel/harcuvar/acpi_tables.c
+++ b/src/mainboard/intel/harcuvar/acpi_tables.c
@@ -12,8 +12,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 76771cb..863bfae 100644
--- a/src/mainboard/intel/strago/acpi_tables.c
+++ b/src/mainboard/intel/strago/acpi_tables.c
@@ -13,8 +13,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/wtm2/acpi_tables.c b/src/mainboard/intel/wtm2/acpi_tables.c
index fad31df..1e7b2b7 100644
--- a/src/mainboard/intel/wtm2/acpi_tables.c
+++ b/src/mainboard/intel/wtm2/acpi_tables.c
@@ -11,8 +11,6 @@

void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-
    /* Enable USB ports in S3 */
    gnvs->s3u0 = 1;

diff --git a/src/mainboard/ocp/tiogapass/acpi_tables.c b/src/mainboard/ocp/tiogapass/acpi_tables.c
index 20f83e3..4d0e88d 100644
--- a/src/mainboard/ocp/tiogapass/acpi_tables.c
+++ b/src/mainboard/ocp/tiogapass/acpi_tables.c
@@ -3,11 +3,6 @@
 #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)
 {
    fadt->preferred_pm_profile = PM_ENTERPRISE_SERVER;
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/purism/librem_bdw/acpi_tables.c b/src/mainboard/purism/librem_bdw/acpi_tables.c
index 9bec071..f4df438 100644
--- a/src/mainboard/purism/librem_bdw/acpi_tables.c
+++ b/src/mainboard/purism/librem_bdw/acpi_tables.c
@@ -6,11 +6,6 @@
 #include <soc/acpi.h>
 #include <soc/nvs.h>

-void mainboard_fill_gnvs(struct global_nvs *gnvs)
-{
-	acpi_init_gnvs(gnvs);
-}
-
 unsigned long acpi_fill_madt(unsigned long current)
 {
    /* Local APICs */
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 c6a543c..1805b6e 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 516e7d9..3ad0d271 100644
--- a/src/soc/intel/baytrail/southcluster.c
+++ b/src/soc/intel/baytrail/southcluster.c
@@ -486,6 +486,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 5834a6f..7bd895c 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;
@@ -485,6 +485,7 @@
    if (!gnvs)
    	return;

+	soc_fill_gnvs(gnvs);
    mainboard_fill_gnvs(gnvs);

acpi_inject_nvsa();
diff --git a/src/soc/intel/broadwell/acpi.c b/src/soc/intel/broadwell/acpi.c
index a119f9a..6e28c61 100644
--- a/src/soc/intel/broadwell/acpi.c
+++ b/src/soc/intel/broadwell/acpi.c
@@ -147,7 +147,7 @@
    return cores;
 }

-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/broadwell/lpc.c b/src/soc/intel/broadwell/lpc.c
index a3c51a2..34aa9d2 100644
--- a/src/soc/intel/broadwell/lpc.c
+++ b/src/soc/intel/broadwell/lpc.c
@@ -569,6 +569,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 88c5269..ef10d77 100644
--- a/src/soc/intel/denverton_ns/acpi.c
+++ b/src/soc/intel/denverton_ns/acpi.c
@@ -58,7 +58,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();
@@ -280,6 +280,7 @@
    if (!gnvs)
    	return;

+	soc_fill_gnvs(gnvs);
    mainboard_fill_gnvs(gnvs);
    acpi_inject_nvsa();
 }
diff --git a/src/soc/intel/xeon_sp/skx/acpi.c b/src/soc/intel/xeon_sp/skx/acpi.c
index dd5fc46..e107cf8 100644
--- a/src/soc/intel/xeon_sp/skx/acpi.c
+++ b/src/soc/intel/xeon_sp/skx/acpi.c
@@ -48,7 +48,7 @@
    return sci_irq;
 }

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

+	soc_fill_gnvs(gnvs);
    mainboard_fill_gnvs(gnvs);
    acpi_inject_nvsa();

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42924 )

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

Patch Set 1: Code-Review+2

(1 comment)

https://review.coreboot.org/c/coreboot/+/42924/1/src/mainboard/ocp/tiogapass... 
File src/mainboard/ocp/tiogapass/acpi_tables.c:

https://review.coreboot.org/c/coreboot/+/42924/1/src/mainboard/ocp/tiogapass... 
PS1, Line 4: #include <acpi/acpi_gnvs.h>
now unused

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

Hello build bot (Jenkins), Michał Żygowski, David Guckian, Frans Hendriks, Vanessa Eusebio, Angel Pons, Patrick Rudolph, Wim Vervoorn, Piotr Król,

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

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

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

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/facebook/fbg1701/acpi_tables.c
M src/mainboard/google/auron/acpi_tables.c
M src/mainboard/google/cyan/acpi_tables.c
M src/mainboard/google/jecht/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/intel/wtm2/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/purism/librem_bdw/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/acpi.c
M src/soc/intel/broadwell/lpc.c
M src/soc/intel/denverton_ns/acpi.c
M src/soc/intel/xeon_sp/skx/acpi.c
21 files changed, 10 insertions(+), 42 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/24/42924/2

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42924 )

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

Patch Set 2: Code-Review+2

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

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

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

Abandoned