amd/family17h: Add PCI device IDs for all controllers in AMD Family17h

This change adds all the missing PCI device IDs for AMD Family
17h. IDs that were already present are updated to include _FAM17H_ in
the name instead of _PCO_ and _DALI_. This ensures that the PCI IDs
match the family and models as per the PPR. In cases where the
controller is present only on certain models, _MODEL##H_ is also
included in the name.

BUG=b:153858769
BRANCH=None
TEST=Verified that trembyle and dalboz still build.

Signed-off-by: Furquan Shaikh <furquan@google.com>
Change-Id: Ia767d32ec22f5e58827e7531c0d3d3bac90d3425
Reviewed-on: https://review.coreboot.org/c/coreboot/+/40673
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Raul Rangel <rrangel@chromium.org>

5 files changed, 33 insertions, 13 deletions

diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index 76b214abef..cfdcab350c 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -453,13 +453,32 @@
 #define PCI_DEVICE_ID_AMD_CZ_USB3_0	0x7914
 #define PCI_DEVICE_ID_AMD_CZ_SMBUS	0x790B
 
-#define PCI_DEVICE_ID_AMD_PCO_LPC	0x790e
-#define PCI_DEVICE_ID_AMD_PCO_HDA0	0x15de
-#define PCI_DEVICE_ID_AMD_PCO_HDA1	0x15e3
-#define PCI_DEVICD_ID_AMD_PCO_ACP	0x15e2
-#define PCI_DEVICE_ID_AMD_PCO_XHCI0	0x15e0
-#define PCI_DEVICE_ID_AMD_PCO_XHCI1	0x15e1
-#define PCI_DEVICE_ID_AMD_DALI_XHCI	0x15e5
+#define PCI_DEVICE_ID_AMD_FAM17H_GNB				0x15D0
+#define PCI_DEVICE_ID_AMD_FAM17H_PCIE_GPP			0x15D3
+#define PCI_DEVICE_ID_AMD_FAM17H_GPU				0x15D8
+#define PCI_DEVICE_ID_AMD_FAM17H_PCIE_GPP_BUSA			0x15DB
+#define PCI_DEVICE_ID_AMD_FAM17H_PCIE_GPP_BUSB			0x15DC
+#define PCI_DEVICE_ID_AMD_FAM17H_HDA0				0x15DE
+#define PCI_DEVICE_ID_AMD_FAM17H_ACP				0x15E2
+#define PCI_DEVICE_ID_AMD_FAM17H_HDA1				0x15E3
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_XHCI0			0x15E0
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_XHCI1			0x15E1
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL20H_XHCI0			0x15E5
+#define PCI_DEVICE_ID_AMD_FAM17H_DF0				0x15E8
+#define PCI_DEVICE_ID_AMD_FAM17H_DF1				0x15E9
+#define PCI_DEVICE_ID_AMD_FAM17H_DF2				0x15EA
+#define PCI_DEVICE_ID_AMD_FAM17H_DF3				0x15EB
+#define PCI_DEVICE_ID_AMD_FAM17H_DF4				0x15EC
+#define PCI_DEVICE_ID_AMD_FAM17H_DF5				0x15ED
+#define PCI_DEVICE_ID_AMD_FAM17H_DF6				0x15EE
+#define PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_VER0			0x7901
+#define PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_VER1			0x7904
+#define PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_RAID_VER0		0x7916
+#define PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_RAID_VER1		0x7917
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_SD			0x7906
+#define PCI_DEVICE_ID_AMD_FAM17H_SMBUS				0x790B
+#define PCI_DEVICE_ID_AMD_FAM17H_LPC				0x790E
+#define PCI_DEVICE_ID_AMD_FAM17H_GBE				0x1458
 
 #define PCI_VENDOR_ID_VLSI		0x1004
 #define PCI_DEVICE_ID_VLSI_82C592	0x0005
diff --git a/src/soc/amd/common/block/hda/hda.c b/src/soc/amd/common/block/hda/hda.c
index 1eaee1e578..e4f86df192 100644
--- a/src/soc/amd/common/block/hda/hda.c
+++ b/src/soc/amd/common/block/hda/hda.c
@@ -10,7 +10,8 @@
 static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_AMD_SB900_HDA,
 	PCI_DEVICE_ID_AMD_CZ_HDA,
-	PCI_DEVICE_ID_AMD_PCO_HDA1,
+	PCI_DEVICE_ID_AMD_FAM17H_HDA0,
+	PCI_DEVICE_ID_AMD_FAM17H_HDA1,
 	0
 };
 
diff --git a/src/soc/amd/common/block/lpc/lpc.c b/src/soc/amd/common/block/lpc/lpc.c
index 3df5ad0ae9..0c98fcbc6b 100644
--- a/src/soc/amd/common/block/lpc/lpc.c
+++ b/src/soc/amd/common/block/lpc/lpc.c
@@ -324,7 +324,7 @@ static struct device_operations lpc_ops = {
 static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_AMD_SB900_LPC,
 	PCI_DEVICE_ID_AMD_CZ_LPC,
-	PCI_DEVICE_ID_AMD_PCO_LPC,
+	PCI_DEVICE_ID_AMD_FAM17H_LPC,
 	0
 };
 static const struct pci_driver lpc_driver __pci_driver = {
diff --git a/src/soc/amd/picasso/acp.c b/src/soc/amd/picasso/acp.c
index 3dbc9f7a7a..ce5ced3031 100644
--- a/src/soc/amd/picasso/acp.c
+++ b/src/soc/amd/picasso/acp.c
@@ -56,5 +56,5 @@ static struct device_operations acp_ops = {
 static const struct pci_driver acp_driver __pci_driver = {
 	.ops = &acp_ops,
 	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICD_ID_AMD_PCO_ACP,
+	.device = PCI_DEVICE_ID_AMD_FAM17H_ACP,
 };
diff --git a/src/soc/amd/picasso/usb.c b/src/soc/amd/picasso/usb.c
index 67328b8f52..6faf28f2c2 100644
--- a/src/soc/amd/picasso/usb.c
+++ b/src/soc/amd/picasso/usb.c
@@ -34,9 +34,9 @@ static struct device_operations usb_ops = {
 };
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_AMD_PCO_XHCI0,
-	PCI_DEVICE_ID_AMD_PCO_XHCI1,
-	PCI_DEVICE_ID_AMD_DALI_XHCI,
+	PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_XHCI0,
+	PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_XHCI1,
+	PCI_DEVICE_ID_AMD_FAM17H_MODEL20H_XHCI0,
 	0
 };