Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/42833 )
Change subject: soc/amd/picasso/soc_util: rework reduced I/O chip detection ......................................................................
soc/amd/picasso/soc_util: rework reduced I/O chip detection
Both Dali and Pollock chips have less PCIe, USB3 and DisplayPort connectivity. While Dali can either be fused-down PCO or RV2 silicon, Pollock is always RV2 silicon.
Since we have all boards using this code in tree right now, soc_is_dali() can be renamed and generalized to soc_is_reduced_io_sku().
Change-Id: I9eb57595da6f806305552128b0c077ceeb7c4661 Signed-off-by: Felix Held felix-coreboot@felixheld.de Reviewed-on: https://review.coreboot.org/c/coreboot/+/42833 Reviewed-by: Angel Pons th3fanbus@gmail.com Reviewed-by: Rob Barnes robbarnes@google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/amd/mandolin/mainboard.c M src/mainboard/google/zork/variants/baseboard/fsps_baseboard_trembyle.c M src/soc/amd/picasso/include/soc/soc_util.h M src/soc/amd/picasso/soc_util.c 4 files changed, 6 insertions(+), 6 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Rob Barnes: Looks good to me, but someone else must approve
diff --git a/src/mainboard/amd/mandolin/mainboard.c b/src/mainboard/amd/mandolin/mainboard.c index 2e66c65..54f5775 100644 --- a/src/mainboard/amd/mandolin/mainboard.c +++ b/src/mainboard/amd/mandolin/mainboard.c @@ -310,7 +310,7 @@ const fsp_ddi_descriptor **ddi_descs, size_t *ddi_num) { /* Dali */ - if (soc_is_dali()) { + if (soc_is_reduced_io_sku()) { *pcie_descs = dali_pcie_descriptors; *pcie_num = ARRAY_SIZE(dali_pcie_descriptors); *ddi_descs = dali_ddi_descriptors; diff --git a/src/mainboard/google/zork/variants/baseboard/fsps_baseboard_trembyle.c b/src/mainboard/google/zork/variants/baseboard/fsps_baseboard_trembyle.c index f5f4842..df42f6b 100644 --- a/src/mainboard/google/zork/variants/baseboard/fsps_baseboard_trembyle.c +++ b/src/mainboard/google/zork/variants/baseboard/fsps_baseboard_trembyle.c @@ -114,7 +114,7 @@ const fsp_pcie_descriptor *baseboard_get_pcie_descriptors(size_t *num) { /* Type 2 or Type 1 fused like Type 2. */ - if (soc_is_dali()) { + if (soc_is_reduced_io_sku()) { *num = ARRAY_SIZE(dali_pcie_descriptors); return dali_pcie_descriptors; } else { @@ -176,7 +176,7 @@ const fsp_ddi_descriptor *baseboard_get_ddi_descriptors(size_t *num) { /* Type 2 or Type 1 fused like Type 2. */ - if (soc_is_dali()) { + if (soc_is_reduced_io_sku()) { *num = ARRAY_SIZE(dali_ddi_descriptors); return dali_ddi_descriptors; } else { diff --git a/src/soc/amd/picasso/include/soc/soc_util.h b/src/soc/amd/picasso/include/soc/soc_util.h index 2459207..0de0643 100644 --- a/src/soc/amd/picasso/include/soc/soc_util.h +++ b/src/soc/amd/picasso/include/soc/soc_util.h @@ -34,7 +34,7 @@ void print_soc_type(void);
/* function to determine the connectivity feature set */ -bool soc_is_dali(void); +bool soc_is_reduced_io_sku(void);
/* function to determine the iGPU type */ bool soc_is_raven2(void); diff --git a/src/soc/amd/picasso/soc_util.c b/src/soc/amd/picasso/soc_util.c index 2aa9daa..64a97a0 100644 --- a/src/soc/amd/picasso/soc_util.c +++ b/src/soc/amd/picasso/soc_util.c @@ -199,9 +199,9 @@ } }
-bool soc_is_dali(void) +bool soc_is_reduced_io_sku(void) { - return get_soc_type() == SOC_DALI; + return get_silicon_type() == SILICON_RV2 || get_soc_type() == SOC_DALI; }
bool soc_is_raven2(void)