Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/42926 )
Change subject: ACPI: Call mainboard_fill_gnvs() early ......................................................................
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/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/cpx/acpi.c M src/soc/intel/xeon_sp/skx/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 15 files changed, 3 insertions(+), 86 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/42926/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 3ad0d271..75eacd2 100644 --- a/src/soc/intel/baytrail/southcluster.c +++ b/src/soc/intel/baytrail/southcluster.c @@ -482,13 +482,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 7bd895c..065c37a 100644 --- a/src/soc/intel/braswell/acpi.c +++ b/src/soc/intel/braswell/acpi.c @@ -481,13 +481,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/lpc.c b/src/soc/intel/broadwell/lpc.c index 34aa9d2..cf5d0fb 100644 --- a/src/soc/intel/broadwell/lpc.c +++ b/src/soc/intel/broadwell/lpc.c @@ -565,12 +565,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 6b35e69..3e4418e 100644 --- a/src/soc/intel/common/block/acpi/acpi.c +++ b/src/soc/intel/common/block/acpi/acpi.c @@ -224,13 +224,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 ef10d77..7c0a846 100644 --- a/src/soc/intel/denverton_ns/acpi.c +++ b/src/soc/intel/denverton_ns/acpi.c @@ -276,12 +276,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 99c053c..43a2371 100644 --- a/src/soc/intel/skylake/acpi.c +++ b/src/soc/intel/skylake/acpi.c @@ -626,11 +626,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/cpx/acpi.c b/src/soc/intel/xeon_sp/cpx/acpi.c index 6274029..6d0d062 100644 --- a/src/soc/intel/xeon_sp/cpx/acpi.c +++ b/src/soc/intel/xeon_sp/cpx/acpi.c @@ -108,11 +108,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();
/* Add IIOStack ACPI Resource Templates */ diff --git a/src/soc/intel/xeon_sp/skx/acpi.c b/src/soc/intel/xeon_sp/skx/acpi.c index e107cf8..89d3b7c 100644 --- a/src/soc/intel/xeon_sp/skx/acpi.c +++ b/src/soc/intel/xeon_sp/skx/acpi.c @@ -954,12 +954,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();
// Add IIOStack ACPI Resource Templates diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c index 6b0ad83..1f13b89 100644 --- a/src/southbridge/intel/bd82x6x/lpc.c +++ b/src/southbridge/intel/bd82x6x/lpc.c @@ -656,13 +656,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 c39820a..14c1579 100644 --- a/src/southbridge/intel/i82801gx/lpc.c +++ b/src/southbridge/intel/i82801gx/lpc.c @@ -617,12 +617,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 9f9058f..485aaef 100644 --- a/src/southbridge/intel/i82801ix/lpc.c +++ b/src/southbridge/intel/i82801ix/lpc.c @@ -457,11 +457,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 e2462c7..adacc4d 100644 --- a/src/southbridge/intel/i82801jx/lpc.c +++ b/src/southbridge/intel/i82801jx/lpc.c @@ -616,11 +616,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 8e32f78..3b67463 100644 --- a/src/southbridge/intel/ibexpeak/lpc.c +++ b/src/southbridge/intel/ibexpeak/lpc.c @@ -561,13 +561,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 ead33ce..fe19650 100644 --- a/src/southbridge/intel/lynxpoint/lpc.c +++ b/src/southbridge/intel/lynxpoint/lpc.c @@ -697,13 +697,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 has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42926 )
Change subject: ACPI: Call mainboard_fill_gnvs() early ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/42926/1/src/acpi/gnvs.c File src/acpi/gnvs.c:
https://review.coreboot.org/c/coreboot/+/42926/1/src/acpi/gnvs.c@60 PS1, Line 60: soc_fill_gnvs(gnvs); soc_fill_gnvs() calls dev_count_cpu(), too early for that to be filled here
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42926 )
Change subject: ACPI: Call mainboard_fill_gnvs() early ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/42926/1/src/soc/intel/baytrail/sout... File src/soc/intel/baytrail/southcluster.c:
https://review.coreboot.org/c/coreboot/+/42926/1/src/soc/intel/baytrail/sout... PS1, Line 485: acpi_inject_nvsa(); This is called everywhere, isn't it?
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42926 )
Change subject: ACPI: Call mainboard_fill_gnvs() early ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/42926/1/src/soc/intel/baytrail/sout... File src/soc/intel/baytrail/southcluster.c:
https://review.coreboot.org/c/coreboot/+/42926/1/src/soc/intel/baytrail/sout... PS1, Line 485: acpi_inject_nvsa();
This is called everywhere, isn't it?
Oh, needs to happen right here.
Kyösti Mälkki has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/42926 )
Change subject: ACPI: Call mainboard_fill_gnvs() early ......................................................................
Abandoned
-
Angel Pons (Code Review) -
Kyösti Mälkki (Code Review)