diff options
Diffstat (limited to 'src/soc/amd/picasso/agesa_acpi.c')
| -rw-r--r-- | src/soc/amd/picasso/agesa_acpi.c | 36 |
1 files changed, 2 insertions, 34 deletions
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 <console/console.h> #include <cpu/amd/cpuid.h> #include <cpu/amd/msr.h> -#include <fsp/util.h> #include <FspGuids.h> #include <soc/acpi.h> #include <stdint.h> #include <device/pci_def.h> #include <device/pci_ops.h> +#include <amdblocks/acpi.h> #include <amdblocks/cpu.h> #include <amdblocks/data_fabric.h> #include <amdblocks/ioapic.h> @@ -20,38 +20,6 @@ #include <stdlib.h> #include <arch/mmio.h> -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); |