From 14734fcc72b05f42b4c70e07e86e400396c12dc8 Mon Sep 17 00:00:00 2001 From: Raul E Rangel Date: Mon, 3 May 2021 16:56:34 -0600 Subject: soc/amd/cezanne: Generate PCI GPP ACPI names We can generate the names, so there is no need to hard code a table. This will make the code more generic so it can be reused with picasso in the future. BUG=b:184766519 TEST=Dump guybrush ACPI table and verify it looks correct. Signed-off-by: Raul E Rangel Change-Id: I5134d1dba4fcb9ce8cc4bfad1c619331a95f3b11 Reviewed-on: https://review.coreboot.org/c/coreboot/+/52870 Reviewed-by: Marshall Dawson Reviewed-by: Felix Held Tested-by: build bot (Jenkins) --- src/soc/amd/cezanne/pcie_gpp.c | 40 +++++++++------------------------------- 1 file changed, 9 insertions(+), 31 deletions(-) (limited to 'src/soc/amd/cezanne') diff --git a/src/soc/amd/cezanne/pcie_gpp.c b/src/soc/amd/cezanne/pcie_gpp.c index 283470bc27..58c776146f 100644 --- a/src/soc/amd/cezanne/pcie_gpp.c +++ b/src/soc/amd/cezanne/pcie_gpp.c @@ -11,43 +11,21 @@ #include #include #include +#include +#include static const char *pcie_gpp_acpi_name(const struct device *dev) { + char *name; + if (dev->path.type != DEVICE_PATH_PCI) return NULL; - switch (dev->path.pci.devfn) { - case PCIE_GPP_1_0_DEVFN: - return "GP10"; - case PCIE_GPP_1_1_DEVFN: - return "GP11"; - case PCIE_GPP_1_2_DEVFN: - return "GP12"; - case PCIE_GPP_2_0_DEVFN: - return "GP20"; - case PCIE_GPP_2_1_DEVFN: - return "GP21"; - case PCIE_GPP_2_2_DEVFN: - return "GP22"; - case PCIE_GPP_2_3_DEVFN: - return "GP23"; - case PCIE_GPP_2_4_DEVFN: - return "GP24"; - case PCIE_GPP_2_5_DEVFN: - return "GP25"; - case PCIE_GPP_2_6_DEVFN: - return "GP26"; - case PCIE_ABC_A_DEVFN: - return "GPPA"; - case PCIE_GPP_B_DEVFN: - return "GPPB"; - case PCIE_GPP_C_DEVFN: - return "GPPC"; - default: - printk(BIOS_ERR, "%s: Unhanded devfn 0x%x\n", __func__, dev->path.pci.devfn); - return NULL; - } + name = malloc(ACPI_NAME_BUFFER_SIZE); + snprintf(name, ACPI_NAME_BUFFER_SIZE, "GP%02x", dev->path.pci.devfn); + name[4] = '\0'; + + return name; } static void acpi_device_write_gpp_pci_dev(const struct device *dev) -- cgit v1.2.3