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> Reviewed-on: https://review.coreboot.org/c/coreboot/+/48717 Reviewed-by: Arthur Heymans <arthur@aheymans.xyz> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
committed by
Nico Huber
parent
999e441338
commit
c2b0a4fa32
@@ -278,7 +278,7 @@ unsigned long sa_write_acpi_tables(const struct device *dev, unsigned long curre
|
|||||||
return current;
|
return current;
|
||||||
}
|
}
|
||||||
|
|
||||||
void acpi_create_gnvs(struct global_nvs *gnvs)
|
void soc_fill_gnvs(struct global_nvs *gnvs)
|
||||||
{
|
{
|
||||||
config_t *config = config_of_soc();
|
config_t *config = config_of_soc();
|
||||||
|
|
||||||
|
@@ -72,7 +72,7 @@ acpi_cstate_t *soc_get_cstate_map(size_t *entries)
|
|||||||
return cstate_map;
|
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;
|
struct soc_intel_apollolake_config *cfg;
|
||||||
cfg = config_of_soc();
|
cfg = config_of_soc();
|
||||||
|
@@ -181,7 +181,7 @@ uint32_t soc_read_sci_irq_select(void)
|
|||||||
return read32((void *)pmc_bar + IRQ_REG);
|
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;
|
const struct soc_intel_cannonlake_config *config;
|
||||||
config = config_of_soc();
|
config = config_of_soc();
|
||||||
|
@@ -235,17 +235,15 @@ static int acpi_fill_wake(uint32_t *pm1, uint32_t **gpe0)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
__weak void acpi_create_gnvs(struct global_nvs *gnvs)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void southbridge_inject_dsdt(const struct device *device)
|
void southbridge_inject_dsdt(const struct device *device)
|
||||||
{
|
{
|
||||||
struct global_nvs *gnvs = acpi_get_gnvs();
|
struct global_nvs *gnvs = acpi_get_gnvs();
|
||||||
if (!gnvs)
|
if (!gnvs)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
acpi_create_gnvs(gnvs);
|
soc_fill_gnvs(gnvs);
|
||||||
|
mainboard_fill_gnvs(gnvs);
|
||||||
|
|
||||||
acpi_inject_nvsa();
|
acpi_inject_nvsa();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -246,7 +246,7 @@ unsigned long sa_write_acpi_tables(const struct device *dev, unsigned long curre
|
|||||||
return current;
|
return current;
|
||||||
}
|
}
|
||||||
|
|
||||||
void acpi_create_gnvs(struct global_nvs *gnvs)
|
void soc_fill_gnvs(struct global_nvs *gnvs)
|
||||||
{
|
{
|
||||||
config_t *config = config_of_soc();
|
config_t *config = config_of_soc();
|
||||||
|
|
||||||
|
@@ -177,7 +177,7 @@ uint32_t soc_read_sci_irq_select(void)
|
|||||||
return read32((void *)pmc_bar + IRQ_REG);
|
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();
|
config_t *config = config_of_soc();
|
||||||
|
|
||||||
|
@@ -273,7 +273,7 @@ unsigned long sa_write_acpi_tables(const struct device *dev, unsigned long curre
|
|||||||
return current;
|
return current;
|
||||||
}
|
}
|
||||||
|
|
||||||
void acpi_create_gnvs(struct global_nvs *gnvs)
|
void soc_fill_gnvs(struct global_nvs *gnvs)
|
||||||
{
|
{
|
||||||
config_t *config = config_of_soc();
|
config_t *config = config_of_soc();
|
||||||
|
|
||||||
|
@@ -156,7 +156,7 @@ static int get_cores_per_package(void)
|
|||||||
return cores;
|
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();
|
const struct soc_intel_skylake_config *config = config_of_soc();
|
||||||
|
|
||||||
@@ -528,7 +528,7 @@ void southbridge_inject_dsdt(const struct device *device)
|
|||||||
if (!gnvs)
|
if (!gnvs)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
acpi_create_gnvs(gnvs);
|
soc_fill_gnvs(gnvs);
|
||||||
acpi_inject_nvsa();
|
acpi_inject_nvsa();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -273,7 +273,7 @@ unsigned long sa_write_acpi_tables(const struct device *dev, unsigned long curre
|
|||||||
return current;
|
return current;
|
||||||
}
|
}
|
||||||
|
|
||||||
void acpi_create_gnvs(struct global_nvs *gnvs)
|
void soc_fill_gnvs(struct global_nvs *gnvs)
|
||||||
{
|
{
|
||||||
config_t *config = config_of_soc();
|
config_t *config = config_of_soc();
|
||||||
|
|
||||||
|
@@ -28,7 +28,7 @@ unsigned long acpi_fill_mcfg(unsigned long current)
|
|||||||
return current;
|
return current;
|
||||||
}
|
}
|
||||||
|
|
||||||
void acpi_create_gnvs(struct global_nvs *gnvs)
|
void soc_fill_gnvs(struct global_nvs *gnvs)
|
||||||
{
|
{
|
||||||
/* CPU core count */
|
/* CPU core count */
|
||||||
gnvs->pcnt = dev_count_cpu();
|
gnvs->pcnt = dev_count_cpu();
|
||||||
|
Reference in New Issue
Block a user