From b0ab545e7b2d920387fcc68a0c4a383a8b0dd915 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Fri, 11 Aug 2023 22:24:00 +0200 Subject: soc/amd/*/root_complex: introduce get_iohc_fabric_id Implement get_iohc_fabric_id for each SoC that translates the coreboot domain number to the fabric ID of the corresponding PCI root. This allows the primary domain to have the number 0 even though the destination data fabric ID will be non-zero. Keeping the primary domain number 0 allows to use config_of_soc() which can be resolved at link time and not need to dynamically find the SoC device to get the config. Signed-off-by: Felix Held Change-Id: I6538a777619eed974b449fc70d3fe3084ba447dd Reviewed-on: https://review.coreboot.org/c/coreboot/+/77168 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/soc/amd/cezanne/root_complex.c | 10 ++++++++++ src/soc/amd/common/block/include/amdblocks/root_complex.h | 2 ++ src/soc/amd/glinda/root_complex.c | 10 ++++++++++ src/soc/amd/mendocino/root_complex.c | 10 ++++++++++ src/soc/amd/phoenix/root_complex.c | 10 ++++++++++ src/soc/amd/picasso/root_complex.c | 10 ++++++++++ 6 files changed, 52 insertions(+) (limited to 'src/soc/amd') diff --git a/src/soc/amd/cezanne/root_complex.c b/src/soc/amd/cezanne/root_complex.c index ecb1991cae..ad23306e4f 100644 --- a/src/soc/amd/cezanne/root_complex.c +++ b/src/soc/amd/cezanne/root_complex.c @@ -207,3 +207,13 @@ const struct non_pci_mmio_reg *get_iohc_non_pci_mmio_regs(size_t *count) *count = ARRAY_SIZE(non_pci_mmio); return non_pci_mmio; } + +signed int get_iohc_fabric_id(struct device *domain) +{ + switch (domain->path.domain.domain) { + case 0: + return IOMS0_FABRIC_ID; + default: + return -1; + } +} diff --git a/src/soc/amd/common/block/include/amdblocks/root_complex.h b/src/soc/amd/common/block/include/amdblocks/root_complex.h index fd75ddffa3..b09a5f3e27 100644 --- a/src/soc/amd/common/block/include/amdblocks/root_complex.h +++ b/src/soc/amd/common/block/include/amdblocks/root_complex.h @@ -22,6 +22,8 @@ void read_non_pci_resources(struct device *domain, unsigned int *idx); uint32_t get_iohc_misc_smn_base(struct device *domain); const struct non_pci_mmio_reg *get_iohc_non_pci_mmio_regs(size_t *count); +signed int get_iohc_fabric_id(struct device *domain); + void read_fsp_resources(struct device *dev, unsigned int *idx); #endif /* AMD_BLOCK_ROOT_COMPLEX_H */ diff --git a/src/soc/amd/glinda/root_complex.c b/src/soc/amd/glinda/root_complex.c index 4474a3fb29..10c32856b4 100644 --- a/src/soc/amd/glinda/root_complex.c +++ b/src/soc/amd/glinda/root_complex.c @@ -240,3 +240,13 @@ const struct non_pci_mmio_reg *get_iohc_non_pci_mmio_regs(size_t *count) *count = ARRAY_SIZE(non_pci_mmio); return non_pci_mmio; } + +signed int get_iohc_fabric_id(struct device *domain) +{ + switch (domain->path.domain.domain) { + case 0: + return IOMS0_FABRIC_ID; + default: + return -1; + } +} diff --git a/src/soc/amd/mendocino/root_complex.c b/src/soc/amd/mendocino/root_complex.c index 0c95f7a86f..706cc2e75e 100644 --- a/src/soc/amd/mendocino/root_complex.c +++ b/src/soc/amd/mendocino/root_complex.c @@ -398,3 +398,13 @@ const struct non_pci_mmio_reg *get_iohc_non_pci_mmio_regs(size_t *count) *count = ARRAY_SIZE(non_pci_mmio); return non_pci_mmio; } + +signed int get_iohc_fabric_id(struct device *domain) +{ + switch (domain->path.domain.domain) { + case 0: + return IOMS0_FABRIC_ID; + default: + return -1; + } +} diff --git a/src/soc/amd/phoenix/root_complex.c b/src/soc/amd/phoenix/root_complex.c index b1a3129bfa..ba263d5329 100644 --- a/src/soc/amd/phoenix/root_complex.c +++ b/src/soc/amd/phoenix/root_complex.c @@ -240,3 +240,13 @@ const struct non_pci_mmio_reg *get_iohc_non_pci_mmio_regs(size_t *count) *count = ARRAY_SIZE(non_pci_mmio); return non_pci_mmio; } + +signed int get_iohc_fabric_id(struct device *domain) +{ + switch (domain->path.domain.domain) { + case 0: + return IOMS0_FABRIC_ID; + default: + return -1; + } +} diff --git a/src/soc/amd/picasso/root_complex.c b/src/soc/amd/picasso/root_complex.c index b74a132c8b..f347dd0cf5 100644 --- a/src/soc/amd/picasso/root_complex.c +++ b/src/soc/amd/picasso/root_complex.c @@ -213,3 +213,13 @@ const struct non_pci_mmio_reg *get_iohc_non_pci_mmio_regs(size_t *count) *count = ARRAY_SIZE(non_pci_mmio); return non_pci_mmio; } + +signed int get_iohc_fabric_id(struct device *domain) +{ + switch (domain->path.domain.domain) { + case 0: + return IOMS0_FABRIC_ID; + default: + return -1; + } +} -- cgit v1.2.3