Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/42925 )
Change subject: soc/intel: Rename to soc_fill_gnvs() ......................................................................
soc/intel: Rename to soc_fill_gnvs()
Replace acpi_create_gnvs() under soc/ to reflect their changed funcionality.
Change-Id: I7bdbe0d6f795252e713e9785ada2b6320e6604b9 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/soc/intel/apollolake/acpi.c M src/soc/intel/cannonlake/acpi.c M src/soc/intel/common/block/acpi/acpi.c M src/soc/intel/icelake/acpi.c M src/soc/intel/jasperlake/acpi.c M src/soc/intel/skylake/acpi.c M src/soc/intel/tigerlake/acpi.c M src/soc/intel/xeon_sp/cpx/acpi.c 8 files changed, 12 insertions(+), 14 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/25/42925/1
diff --git a/src/soc/intel/apollolake/acpi.c b/src/soc/intel/apollolake/acpi.c index c30da13..396b67c 100644 --- a/src/soc/intel/apollolake/acpi.c +++ b/src/soc/intel/apollolake/acpi.c @@ -71,7 +71,7 @@ return cstate_map; }
-void acpi_create_gnvs(struct global_nvs *gnvs) +void soc_fill_gnvs(struct global_nvs *gnvs) { struct soc_intel_apollolake_config *cfg; cfg = config_of_soc(); diff --git a/src/soc/intel/cannonlake/acpi.c b/src/soc/intel/cannonlake/acpi.c index 31b5a51..7f7c445 100644 --- a/src/soc/intel/cannonlake/acpi.c +++ b/src/soc/intel/cannonlake/acpi.c @@ -181,7 +181,7 @@ return read32((void *)pmc_bar + IRQ_REG); }
-void acpi_create_gnvs(struct global_nvs *gnvs) +void soc_fill_gnvs(struct global_nvs *gnvs) { const struct soc_intel_cannonlake_config *config; config = config_of_soc(); diff --git a/src/soc/intel/common/block/acpi/acpi.c b/src/soc/intel/common/block/acpi/acpi.c index 6a18c07..6b35e69 100644 --- a/src/soc/intel/common/block/acpi/acpi.c +++ b/src/soc/intel/common/block/acpi/acpi.c @@ -222,17 +222,15 @@ } #endif
-__weak void acpi_create_gnvs(struct global_nvs *gnvs) -{ -} - void southbridge_inject_dsdt(const struct device *device) { struct global_nvs *gnvs = acpi_get_gnvs(); if (!gnvs) return;
- acpi_create_gnvs(gnvs); + soc_fill_gnvs(gnvs); + mainboard_fill_gnvs(gnvs); + acpi_inject_nvsa(); }
diff --git a/src/soc/intel/icelake/acpi.c b/src/soc/intel/icelake/acpi.c index 5008d09..f7d00b3 100644 --- a/src/soc/intel/icelake/acpi.c +++ b/src/soc/intel/icelake/acpi.c @@ -177,7 +177,7 @@ return read32((void *)pmc_bar + IRQ_REG); }
-void acpi_create_gnvs(struct global_nvs *gnvs) +void soc_fill_gnvs(struct global_nvs *gnvs) { config_t *config = config_of_soc();
diff --git a/src/soc/intel/jasperlake/acpi.c b/src/soc/intel/jasperlake/acpi.c index 1c783a2..b22cb9b 100644 --- a/src/soc/intel/jasperlake/acpi.c +++ b/src/soc/intel/jasperlake/acpi.c @@ -272,7 +272,7 @@ return current; }
-void acpi_create_gnvs(struct global_nvs *gnvs) +void soc_fill_gnvs(struct global_nvs *gnvs) { config_t *config = config_of_soc();
diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c index 9c5661a..99c053c 100644 --- a/src/soc/intel/skylake/acpi.c +++ b/src/soc/intel/skylake/acpi.c @@ -154,7 +154,7 @@ return cores; }
-void acpi_create_gnvs(struct global_nvs *gnvs) +void soc_fill_gnvs(struct global_nvs *gnvs) { const struct soc_intel_skylake_config *config = config_of_soc();
@@ -630,7 +630,7 @@ if (!gnvs) return;
- acpi_create_gnvs(gnvs); + soc_fill_gnvs(gnvs); acpi_inject_nvsa(); }
diff --git a/src/soc/intel/tigerlake/acpi.c b/src/soc/intel/tigerlake/acpi.c index 8228b1c..0da96b8 100644 --- a/src/soc/intel/tigerlake/acpi.c +++ b/src/soc/intel/tigerlake/acpi.c @@ -272,7 +272,7 @@ return current; }
-void acpi_create_gnvs(struct global_nvs *gnvs) +void soc_fill_gnvs(struct global_nvs *gnvs) { config_t *config = config_of_soc();
diff --git a/src/soc/intel/xeon_sp/cpx/acpi.c b/src/soc/intel/xeon_sp/cpx/acpi.c index 88181f7..6274029 100644 --- a/src/soc/intel/xeon_sp/cpx/acpi.c +++ b/src/soc/intel/xeon_sp/cpx/acpi.c @@ -112,14 +112,14 @@ if (!gnvs) return;
- acpi_create_gnvs(gnvs); + soc_fill_gnvs(gnvs); acpi_inject_nvsa();
/* Add IIOStack ACPI Resource Templates */ uncore_inject_dsdt(); }
-void acpi_create_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 has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42925 )
Change subject: soc/intel: Rename to soc_fill_gnvs() ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/42925/1/src/soc/intel/common/block/... File src/soc/intel/common/block/acpi/acpi.c:
https://review.coreboot.org/c/coreboot/+/42925/1/src/soc/intel/common/block/... PS1, Line 232: mainboard_fill_gnvs(gnvs); DO not add mainboard_fill_gnvs() here
Kyösti Mälkki has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/42925 )
Change subject: soc/intel: Rename to soc_fill_gnvs() ......................................................................
Abandoned
-
Kyösti Mälkki (Code Review)