From 69ffebf5ccf123bc0b3fb28b485985af0597761d Mon Sep 17 00:00:00 2001 From: Felix Held Date: Mon, 24 Jul 2023 21:31:44 +0200 Subject: [PATCH] soc/amd/*/root_complex: introduce and use SMN_IOHC_MISC_BASE_13B1 On the mobile SoCs, SMN_IOHC_MISC_BASE_13B1 is the only IOHC misc base address, but on for example Genoa it's the address of the IOHC misc base of the second IOHC. Due to it not being the first one on Genoa, use 13B1 as part of the name instead of using an index of 0 which would look odd in the Genoa case. Signed-off-by: Felix Held Change-Id: I1db28ec03a3ba1c2040d8a1500ae17aa9705f6e9 Reviewed-on: https://review.coreboot.org/c/coreboot/+/76756 Reviewed-by: Eric Lai Reviewed-by: Fred Reitberger Tested-by: build bot (Jenkins) Reviewed-by: Matt DeVillier --- src/soc/amd/cezanne/root_complex.c | 2 +- src/soc/amd/common/block/include/amdblocks/root_complex.h | 2 ++ src/soc/amd/glinda/root_complex.c | 2 +- src/soc/amd/mendocino/root_complex.c | 2 +- src/soc/amd/phoenix/root_complex.c | 2 +- src/soc/amd/picasso/root_complex.c | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/soc/amd/cezanne/root_complex.c b/src/soc/amd/cezanne/root_complex.c index cea3b20dd5..2e3c5c7c7f 100644 --- a/src/soc/amd/cezanne/root_complex.c +++ b/src/soc/amd/cezanne/root_complex.c @@ -207,7 +207,7 @@ struct device_operations cezanne_root_complex_operations = { uint32_t get_iohc_misc_smn_base(struct device *domain) { - return 0x13b10000; + return SMN_IOHC_MISC_BASE_13B1; } static const struct non_pci_mmio_reg non_pci_mmio[] = { 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 d9575c1bd4..6149897b1e 100644 --- a/src/soc/amd/common/block/include/amdblocks/root_complex.h +++ b/src/soc/amd/common/block/include/amdblocks/root_complex.h @@ -6,6 +6,8 @@ #include #include +#define SMN_IOHC_MISC_BASE_13B1 0x13b10000 + #define NON_PCI_RES_IDX_AUTO 0 struct non_pci_mmio_reg { diff --git a/src/soc/amd/glinda/root_complex.c b/src/soc/amd/glinda/root_complex.c index 3ae7688699..cf9d7e481f 100644 --- a/src/soc/amd/glinda/root_complex.c +++ b/src/soc/amd/glinda/root_complex.c @@ -237,7 +237,7 @@ struct device_operations glinda_root_complex_operations = { uint32_t get_iohc_misc_smn_base(struct device *domain) { - return 0x13b10000; + return SMN_IOHC_MISC_BASE_13B1; } static const struct non_pci_mmio_reg non_pci_mmio[] = { diff --git a/src/soc/amd/mendocino/root_complex.c b/src/soc/amd/mendocino/root_complex.c index 0b3f56e32f..834052f177 100644 --- a/src/soc/amd/mendocino/root_complex.c +++ b/src/soc/amd/mendocino/root_complex.c @@ -398,7 +398,7 @@ struct device_operations mendocino_root_complex_operations = { uint32_t get_iohc_misc_smn_base(struct device *domain) { - return 0x13b10000; + return SMN_IOHC_MISC_BASE_13B1; } static const struct non_pci_mmio_reg non_pci_mmio[] = { diff --git a/src/soc/amd/phoenix/root_complex.c b/src/soc/amd/phoenix/root_complex.c index 6b1a81e499..a1f256f73d 100644 --- a/src/soc/amd/phoenix/root_complex.c +++ b/src/soc/amd/phoenix/root_complex.c @@ -237,7 +237,7 @@ struct device_operations phoenix_root_complex_operations = { uint32_t get_iohc_misc_smn_base(struct device *domain) { - return 0x13b10000; + return SMN_IOHC_MISC_BASE_13B1; } static const struct non_pci_mmio_reg non_pci_mmio[] = { diff --git a/src/soc/amd/picasso/root_complex.c b/src/soc/amd/picasso/root_complex.c index bfcc86f9c4..7ae1df0481 100644 --- a/src/soc/amd/picasso/root_complex.c +++ b/src/soc/amd/picasso/root_complex.c @@ -213,7 +213,7 @@ struct device_operations picasso_root_complex_operations = { uint32_t get_iohc_misc_smn_base(struct device *domain) { - return 0x13b10000; + return SMN_IOHC_MISC_BASE_13B1; } static const struct non_pci_mmio_reg non_pci_mmio[] = {