include/device/pci_ids: add model number to PCIe port and bus devices
Different models within family 17h have different PCI IDs for their PCIe
GPP port and internal bus devices.
Change-Id: I386df908ce5451b4484be2a2e4a9018c3d47d030
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47677
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index 7dacb65..d1a4744 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -453,9 +453,9 @@
#define PCI_DEVICE_ID_AMD_CZ_USB3_0 0x7914
#define PCI_DEVICE_ID_AMD_CZ_SMBUS 0x790B
-#define PCI_DEVICE_ID_AMD_FAM17H_PCIE_GPP 0x15D3
-#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_MODEL18H_PCIE_GPP 0x15D3
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_PCIE_GPP_BUSA 0x15DB
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_PCIE_GPP_BUSB 0x15DC
#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
diff --git a/src/soc/amd/picasso/pcie_gpp.c b/src/soc/amd/picasso/pcie_gpp.c
index 96d33f2..3c3021e 100644
--- a/src/soc/amd/picasso/pcie_gpp.c
+++ b/src/soc/amd/picasso/pcie_gpp.c
@@ -48,8 +48,8 @@
};
static const unsigned short pci_device_ids[] = {
- PCI_DEVICE_ID_AMD_FAM17H_PCIE_GPP_BUSA,
- PCI_DEVICE_ID_AMD_FAM17H_PCIE_GPP_BUSB,
+ PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_PCIE_GPP_BUSA,
+ PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_PCIE_GPP_BUSB,
0
};
@@ -72,5 +72,5 @@
static const struct pci_driver external_pcie_gpp_driver __pci_driver = {
.ops = &external_pcie_gpp_ops,
.vendor = PCI_VENDOR_ID_AMD,
- .device = PCI_DEVICE_ID_AMD_FAM17H_PCIE_GPP,
+ .device = PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_PCIE_GPP,
};