From 26577d2ecbb8c01635b959d296f70eb251743046 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Fri, 26 Jan 2024 15:05:40 +0100 Subject: soc/amd: factor out acpi_add_fsp_tables Factor out acpi_add_fsp_tables from the soc_acpi_write_tables function and move the remaining parts of the soc_acpi_write_tables function to the SoC's acpi.c. This aligns the other family 17h/19h SoCs more with Genoa and only leaves the FSP-specific code in agesa_acpi.c which will be made common in a following patch. I decided against also renaming agesa_acpi.c to acpi_fsp.c, since that would have made the diff less readable and the files get deleted in a following patch anyway. Signed-off-by: Felix Held Change-Id: Ia87ac0e77c5e673e694703b85a4bab85a34b980e Reviewed-on: https://review.coreboot.org/c/coreboot/+/80224 Tested-by: build bot (Jenkins) Reviewed-by: Matt DeVillier --- src/soc/amd/cezanne/acpi.c | 14 ++++++++++++++ src/soc/amd/cezanne/agesa_acpi.c | 9 +-------- src/soc/amd/common/block/include/amdblocks/acpi.h | 2 ++ src/soc/amd/glinda/acpi.c | 14 ++++++++++++++ src/soc/amd/glinda/agesa_acpi.c | 9 +-------- src/soc/amd/mendocino/acpi.c | 14 ++++++++++++++ src/soc/amd/mendocino/agesa_acpi.c | 9 +-------- src/soc/amd/phoenix/acpi.c | 14 ++++++++++++++ src/soc/amd/phoenix/agesa_acpi.c | 9 +-------- src/soc/amd/picasso/acpi.c | 17 +++++++++++++++++ src/soc/amd/picasso/agesa_acpi.c | 12 +----------- 11 files changed, 80 insertions(+), 43 deletions(-) diff --git a/src/soc/amd/cezanne/acpi.c b/src/soc/amd/cezanne/acpi.c index 7a5fdf0ed5..417d5f9aa4 100644 --- a/src/soc/amd/cezanne/acpi.c +++ b/src/soc/amd/cezanne/acpi.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include "chip.h" @@ -54,6 +55,19 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) fadt->flags |= cfg->common_config.fadt_flags; /* additional board-specific flags */ } +unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current, + acpi_rsdp_t *rsdp) +{ + /* TODO: look into adding CRAT */ + + /* IVRS */ + current = acpi_add_ivrs_table(current, rsdp); + + current = acpi_add_fsp_tables(current, rsdp); + + return current; +} + const acpi_cstate_t cstate_cfg_table[] = { [0] = { .ctype = 1, diff --git a/src/soc/amd/cezanne/agesa_acpi.c b/src/soc/amd/cezanne/agesa_acpi.c index 96ff0f00fe..a5057bf59f 100644 --- a/src/soc/amd/cezanne/agesa_acpi.c +++ b/src/soc/amd/cezanne/agesa_acpi.c @@ -2,21 +2,14 @@ #include #include -#include #include #include -unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current, - acpi_rsdp_t *rsdp) +unsigned long acpi_add_fsp_tables(unsigned long current, acpi_rsdp_t *rsdp) { - /* TODO: look into adding CRAT */ - /* add ALIB SSDT from HOB */ current = acpi_align_current(current); current = add_agesa_fsp_acpi_table(AMD_FSP_ACPI_ALIB_HOB_GUID, "ALIB", rsdp, current); - /* IVRS */ - current = acpi_add_ivrs_table(current, rsdp); - return current; } diff --git a/src/soc/amd/common/block/include/amdblocks/acpi.h b/src/soc/amd/common/block/include/amdblocks/acpi.h index 2a47c0e8bd..4db077668c 100644 --- a/src/soc/amd/common/block/include/amdblocks/acpi.h +++ b/src/soc/amd/common/block/include/amdblocks/acpi.h @@ -55,6 +55,8 @@ struct chipset_power_state { unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current, acpi_rsdp_t *rsdp); +unsigned long acpi_add_fsp_tables(unsigned long current, acpi_rsdp_t *rsdp); + unsigned long southbridge_write_acpi_tables(const struct device *device, unsigned long current, struct acpi_rsdp *rsdp); diff --git a/src/soc/amd/glinda/acpi.c b/src/soc/amd/glinda/acpi.c index 8cca10d419..86e9aec766 100644 --- a/src/soc/amd/glinda/acpi.c +++ b/src/soc/amd/glinda/acpi.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include "chip.h" @@ -57,6 +58,19 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) fadt->flags |= cfg->common_config.fadt_flags; /* additional board-specific flags */ } +unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current, + acpi_rsdp_t *rsdp) +{ + /* TODO: look into adding CRAT */ + + /* IVRS */ + current = acpi_add_ivrs_table(current, rsdp); + + current = acpi_add_fsp_tables(current, rsdp); + + return current; +} + const acpi_cstate_t cstate_cfg_table[] = { [0] = { .ctype = 1, diff --git a/src/soc/amd/glinda/agesa_acpi.c b/src/soc/amd/glinda/agesa_acpi.c index 68273d17cd..114fdd8095 100644 --- a/src/soc/amd/glinda/agesa_acpi.c +++ b/src/soc/amd/glinda/agesa_acpi.c @@ -4,21 +4,14 @@ #include #include -#include #include #include -unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current, - acpi_rsdp_t *rsdp) +unsigned long acpi_add_fsp_tables(unsigned long current, acpi_rsdp_t *rsdp) { - /* TODO: look into adding CRAT */ - /* add ALIB SSDT from HOB */ current = acpi_align_current(current); current = add_agesa_fsp_acpi_table(AMD_FSP_ACPI_ALIB_HOB_GUID, "ALIB", rsdp, current); - /* IVRS */ - current = acpi_add_ivrs_table(current, rsdp); - return current; } diff --git a/src/soc/amd/mendocino/acpi.c b/src/soc/amd/mendocino/acpi.c index 11261db91a..328a2f9b4d 100644 --- a/src/soc/amd/mendocino/acpi.c +++ b/src/soc/amd/mendocino/acpi.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include "chip.h" @@ -56,6 +57,19 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) fadt->flags |= cfg->common_config.fadt_flags; /* additional board-specific flags */ } +unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current, + acpi_rsdp_t *rsdp) +{ + /* TODO: look into adding CRAT */ + + /* IVRS */ + current = acpi_add_ivrs_table(current, rsdp); + + current = acpi_add_fsp_tables(current, rsdp); + + return current; +} + const acpi_cstate_t cstate_cfg_table[] = { [0] = { .ctype = 1, diff --git a/src/soc/amd/mendocino/agesa_acpi.c b/src/soc/amd/mendocino/agesa_acpi.c index 7ff8403a9d..da0f9a1e1a 100644 --- a/src/soc/amd/mendocino/agesa_acpi.c +++ b/src/soc/amd/mendocino/agesa_acpi.c @@ -4,21 +4,14 @@ #include #include -#include #include #include -unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current, - acpi_rsdp_t *rsdp) +unsigned long acpi_add_fsp_tables(unsigned long current, acpi_rsdp_t *rsdp) { - /* TODO: look into adding CRAT */ - /* add ALIB SSDT from HOB */ current = acpi_align_current(current); current = add_agesa_fsp_acpi_table(AMD_FSP_ACPI_ALIB_HOB_GUID, "ALIB", rsdp, current); - /* IVRS */ - current = acpi_add_ivrs_table(current, rsdp); - return current; } diff --git a/src/soc/amd/phoenix/acpi.c b/src/soc/amd/phoenix/acpi.c index 76de7a0fb1..663a322ff0 100644 --- a/src/soc/amd/phoenix/acpi.c +++ b/src/soc/amd/phoenix/acpi.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include "chip.h" @@ -57,6 +58,19 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) fadt->flags |= cfg->common_config.fadt_flags; /* additional board-specific flags */ } +unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current, + acpi_rsdp_t *rsdp) +{ + /* TODO: look into adding CRAT */ + + /* IVRS */ + current = acpi_add_ivrs_table(current, rsdp); + + current = acpi_add_fsp_tables(current, rsdp); + + return current; +} + const acpi_cstate_t cstate_cfg_table[] = { [0] = { .ctype = 1, diff --git a/src/soc/amd/phoenix/agesa_acpi.c b/src/soc/amd/phoenix/agesa_acpi.c index 4ebe814ab5..67a112e350 100644 --- a/src/soc/amd/phoenix/agesa_acpi.c +++ b/src/soc/amd/phoenix/agesa_acpi.c @@ -5,21 +5,14 @@ #include #include #include -#include #include #include -unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current, - acpi_rsdp_t *rsdp) +unsigned long acpi_add_fsp_tables(unsigned long current, acpi_rsdp_t *rsdp) { - /* TODO: look into adding CRAT */ - /* add ALIB SSDT from HOB */ current = acpi_align_current(current); current = add_agesa_fsp_acpi_table(AMD_FSP_ACPI_ALIB_HOB_GUID, "ALIB", rsdp, current); - /* IVRS */ - current = acpi_add_ivrs_table(current, rsdp); - return current; } diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c index d864053f19..94721073cf 100644 --- a/src/soc/amd/picasso/acpi.c +++ b/src/soc/amd/picasso/acpi.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include "chip.h" @@ -58,6 +59,22 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) fadt->flags |= cfg->fadt_flags; /* additional board-specific flags */ } +unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current, + acpi_rsdp_t *rsdp) +{ + /* CRAT */ + current = acpi_add_crat_table(current, rsdp); + + /* IVRS */ + current = acpi_add_ivrs_table(current, rsdp); + + /* Add SRAT, MSCT, SLIT if needed in the future */ + + current = acpi_add_fsp_tables(current, rsdp); + + return current; +} + const acpi_cstate_t cstate_cfg_table[] = { [0] = { .ctype = 1, diff --git a/src/soc/amd/picasso/agesa_acpi.c b/src/soc/amd/picasso/agesa_acpi.c index 8feda807ca..a5057bf59f 100644 --- a/src/soc/amd/picasso/agesa_acpi.c +++ b/src/soc/amd/picasso/agesa_acpi.c @@ -2,24 +2,14 @@ #include #include -#include #include #include -unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current, - acpi_rsdp_t *rsdp) +unsigned long acpi_add_fsp_tables(unsigned long current, acpi_rsdp_t *rsdp) { - /* CRAT */ - current = acpi_add_crat_table(current, rsdp); - /* add ALIB SSDT from HOB */ current = acpi_align_current(current); current = add_agesa_fsp_acpi_table(AMD_FSP_ACPI_ALIB_HOB_GUID, "ALIB", rsdp, current); - /* IVRS */ - current = acpi_add_ivrs_table(current, rsdp); - - /* Add SRAT, MSCT, SLIT if needed in the future */ - return current; } -- cgit v1.2.3