Kyösti Mälkki has uploaded this change for review.
ACPI: Call mainboard_fill_gnvs() early
Change-Id: I515e830808a95eee3ce72b16fd26da6ec79dac85
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
---
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();
}
To view, visit change 48718. To unsubscribe, or for help writing mail filters, visit settings.