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>
This commit is contained in:
Felix Held 2020-06-26 18:03:53 +02:00 committed by Felix Held
parent fa8b75fb17
commit 42b0e8f438
4 changed files with 6 additions and 6 deletions

View File

@ -310,7 +310,7 @@ void mainboard_get_pcie_ddi_descriptors(
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;

View File

@ -114,7 +114,7 @@ static const fsp_pcie_descriptor dali_pcie_descriptors[] = {
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 @@ static const fsp_ddi_descriptor dali_ddi_descriptors[] = {
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 {

View File

@ -34,7 +34,7 @@ void print_silicon_type(void);
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);

View File

@ -199,9 +199,9 @@ void print_soc_type(void)
}
}
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)