diff options
| author | Raul E Rangel <rrangel@chromium.org> | 2021-02-11 10:10:57 -0700 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2021-02-12 20:45:17 +0000 |
| commit | 0e560e7015fffa209a3a5e5db0f8d786030cf2c0 (patch) | |
| tree | 167c7b4c894e0ec08884757526f092f446bbfa76 | |
| parent | 0f3bc81210f364a6e96edd090d9310844aa30aa2 (diff) | |
soc/amd: Move acpi_fill_mcfg into common/blocks/acpi
This is common between stoney, picasso, and cezanne.
Signed-off-by: Raul E Rangel <rrangel@chromium.org>
Change-Id: I5fb40e8c6817773212c5fbd66c5c06bd2bae1eda
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50556
Reviewed-by: Mathew King <mathewk@chromium.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/soc/amd/common/block/acpi/tables.c | 12 | ||||
| -rw-r--r-- | src/soc/amd/picasso/acpi.c | 12 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/northbridge.c | 12 |
3 files changed, 12 insertions, 24 deletions
diff --git a/src/soc/amd/common/block/acpi/tables.c b/src/soc/amd/common/block/acpi/tables.c index fd1f37f872..f941bc94a0 100644 --- a/src/soc/amd/common/block/acpi/tables.c +++ b/src/soc/amd/common/block/acpi/tables.c @@ -11,3 +11,15 @@ unsigned long southbridge_write_acpi_tables(const struct device *device, { return acpi_write_hpet(device, current, rsdp); } + +unsigned long acpi_fill_mcfg(unsigned long current) +{ + + current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *)current, + CONFIG_MMCONF_BASE_ADDRESS, + 0, + 0, + CONFIG_MMCONF_BUS_NUMBER - 1); + + return current; +} diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c index f1698442fa..5cee2039e8 100644 --- a/src/soc/amd/picasso/acpi.c +++ b/src/soc/amd/picasso/acpi.c @@ -29,18 +29,6 @@ #include <version.h> #include "chip.h" -unsigned long acpi_fill_mcfg(unsigned long current) -{ - - current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *)current, - CONFIG_MMCONF_BASE_ADDRESS, - 0, - 0, - CONFIG_MMCONF_BUS_NUMBER - 1); - - return current; -} - unsigned long acpi_fill_madt(unsigned long current) { const struct soc_amd_picasso_config *cfg = config_of_soc(); diff --git a/src/soc/amd/stoneyridge/northbridge.c b/src/soc/amd/stoneyridge/northbridge.c index 25e55a6bb5..61d89444b3 100644 --- a/src/soc/amd/stoneyridge/northbridge.c +++ b/src/soc/amd/stoneyridge/northbridge.c @@ -162,18 +162,6 @@ static void northbridge_init(struct device *dev) setup_ioapic((u8 *)IO_APIC2_ADDR, CONFIG_MAX_CPUS+1); } -unsigned long acpi_fill_mcfg(unsigned long current) -{ - - current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *)current, - CONFIG_MMCONF_BASE_ADDRESS, - 0, - 0, - CONFIG_MMCONF_BUS_NUMBER - 1); - - return current; -} - static unsigned long acpi_fill_hest(acpi_hest_t *hest) { void *addr, *current; |