From 245adcab13ad47af7419c4ff84c8196a26c025c7 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Tue, 4 May 2021 20:01:46 +0200 Subject: soc/amd/common/fsp/fsp-acpi: factor out SSDT from HOB functionality This function will be reused in Cezanne, so move it from the Picasso directory to the common FSP integration code. TEST=On Mandolin Linux finds the AMD SSDT that contains ALIB. Signed-off-by: Felix Held Change-Id: I7b256de712fe60d1c021cb875aaadec1d331584b Reviewed-on: https://review.coreboot.org/c/coreboot/+/52896 Tested-by: build bot (Jenkins) Reviewed-by: Raul Rangel Reviewed-by: Marshall Dawson --- src/soc/amd/common/block/include/amdblocks/acpi.h | 3 ++ src/soc/amd/common/fsp/Makefile.inc | 1 + src/soc/amd/common/fsp/fsp-acpi.c | 40 +++++++++++++++++++++++ src/soc/amd/picasso/agesa_acpi.c | 36 ++------------------ 4 files changed, 46 insertions(+), 34 deletions(-) create mode 100644 src/soc/amd/common/fsp/fsp-acpi.c (limited to 'src') diff --git a/src/soc/amd/common/block/include/amdblocks/acpi.h b/src/soc/amd/common/block/include/amdblocks/acpi.h index 215d6682cb..eec5a3fc17 100644 --- a/src/soc/amd/common/block/include/amdblocks/acpi.h +++ b/src/soc/amd/common/block/include/amdblocks/acpi.h @@ -56,4 +56,7 @@ unsigned long southbridge_write_acpi_tables(const struct device *device, unsigne unsigned long acpi_fill_madt_irqoverride(unsigned long current); void acpi_fill_root_complex_tom(const struct device *device); +uintptr_t add_agesa_fsp_acpi_table(guid_t guid, const char *name, acpi_rsdp_t *rsdp, + uintptr_t current); + #endif /* AMD_BLOCK_ACPI_H */ diff --git a/src/soc/amd/common/fsp/Makefile.inc b/src/soc/amd/common/fsp/Makefile.inc index 5523876a7e..3ba6ea5b4a 100644 --- a/src/soc/amd/common/fsp/Makefile.inc +++ b/src/soc/amd/common/fsp/Makefile.inc @@ -1,4 +1,5 @@ ifeq ($(CONFIG_PLATFORM_USES_FSP2_0),y) romstage-y += fsp_reset.c ramstage-y += fsp_reset.c +ramstage-$(CONFIG_HAVE_ACPI_TABLES) += fsp-acpi.c endif # CONFIG_PLATFORM_USES_FSP2_0 diff --git a/src/soc/amd/common/fsp/fsp-acpi.c b/src/soc/amd/common/fsp/fsp-acpi.c new file mode 100644 index 0000000000..b530688c03 --- /dev/null +++ b/src/soc/amd/common/fsp/fsp-acpi.c @@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include +#include +#include +#include +#include + +struct amd_fsp_acpi_hob_info { + uint32_t table_size_in_bytes; + uint8_t total_hobs_for_table; + uint8_t sequence_number; + uint16_t reserved; + uint16_t hob_payload[0xffc8]; /* maximum payload size */ +} __packed; + +uintptr_t add_agesa_fsp_acpi_table(guid_t guid, const char *name, acpi_rsdp_t *rsdp, + uintptr_t current) +{ + const struct amd_fsp_acpi_hob_info *data; + void *table = (void *)current; + size_t hob_size; + + data = fsp_find_extension_hob_by_guid(guid.b, &hob_size); + if (!data) { + printk(BIOS_ERR, "AGESA %s ACPI table was not found.\n", name); + return current; + } + + printk(BIOS_INFO, "ACPI: * %s (AGESA).\n", name); + + memcpy(table, data->hob_payload, data->table_size_in_bytes); + + current += data->table_size_in_bytes; + acpi_add_table(rsdp, table); + current = acpi_align_current(current); + + return current; +} diff --git a/src/soc/amd/picasso/agesa_acpi.c b/src/soc/amd/picasso/agesa_acpi.c index b5982c85aa..5122be5d50 100644 --- a/src/soc/amd/picasso/agesa_acpi.c +++ b/src/soc/amd/picasso/agesa_acpi.c @@ -6,12 +6,12 @@ #include #include #include -#include #include #include #include #include #include +#include #include #include #include @@ -20,38 +20,6 @@ #include #include -struct amd_fsp_acpi_hob_info { - uint32_t table_size_in_bytes; - uint8_t total_hobs_for_table; - uint8_t sequence_number; - uint16_t reserved; - uint16_t hob_payload[0xffc8]; -} __packed; - -static uintptr_t add_agesa_acpi_table(guid_t guid, const char *name, acpi_rsdp_t *rsdp, - uintptr_t current) -{ - const struct amd_fsp_acpi_hob_info *data; - void *table = (void *)current; - size_t hob_size; - - data = fsp_find_extension_hob_by_guid(guid.b, &hob_size); - if (!data) { - printk(BIOS_ERR, "AGESA %s ACPI table was not found.\n", name); - return current; - } - - printk(BIOS_INFO, "ACPI: * %s (AGESA).\n", name); - - memcpy(table, data->hob_payload, data->table_size_in_bytes); - - current += data->table_size_in_bytes; - acpi_add_table(rsdp, table); - current = acpi_align_current(current); - - return current; -} - unsigned long acpi_fill_ivrs_ioapic(acpi_ivrs_t *ivrs, unsigned long current) { ivrs_ivhd_special_t *ivhd_ioapic = (ivrs_ivhd_special_t *)current; @@ -1033,7 +1001,7 @@ uintptr_t agesa_write_acpi_tables(const struct device *device, uintptr_t current current += crat->header.length; acpi_add_table(rsdp, crat); - current = add_agesa_acpi_table(AMD_FSP_ACPI_ALIB_HOB_GUID, "ALIB", rsdp, current); + current = add_agesa_fsp_acpi_table(AMD_FSP_ACPI_ALIB_HOB_GUID, "ALIB", rsdp, current); /* IVRS */ current = ALIGN(current, 8); -- cgit v1.2.3