commit 0e5dde5d996cb81cc91877fad519c22622c17a97
author Felix Held <felix-coreboot@felixheld.de> Tue Nov 17 14:57:40 2020 +0100
committer Felix Held <felix-coreboot@felixheld.de> Wed Nov 18 17:54:02 2020 +0000
tree c36ae3087ac4abcf68ab6b4cd9118b93f2e1cfe5
parent 52ba30226ce2569b7f7ac15e024767561a8639c2

include/device/pci_ids: add model number to data fabric devices

Different models within family 17h have different PCI IDs for their data
fabric PCI devices.

Change-Id: I44f8d32c950710e962dc519495b08c92f357ed20
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47676
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>

src/soc/amd/picasso/data_fabric.c

diff --git a/src/soc/amd/picasso/data_fabric.c b/src/soc/amd/picasso/data_fabric.c
index ac4e23d..79fdba1 100644
--- a/src/soc/amd/picasso/data_fabric.c
+++ b/src/soc/amd/picasso/data_fabric.c
@@ -123,19 +123,19 @@
 static const char *data_fabric_acpi_name(const struct device *dev)
 {
 	switch (dev->device) {
-	case PCI_DEVICE_ID_AMD_FAM17H_DF0:
+	case PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF0:
 		return "DFD0";
-	case PCI_DEVICE_ID_AMD_FAM17H_DF1:
+	case PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF1:
 		return "DFD1";
-	case PCI_DEVICE_ID_AMD_FAM17H_DF2:
+	case PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF2:
 		return "DFD2";
-	case PCI_DEVICE_ID_AMD_FAM17H_DF3:
+	case PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF3:
 		return "DFD3";
-	case PCI_DEVICE_ID_AMD_FAM17H_DF4:
+	case PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF4:
 		return "DFD4";
-	case PCI_DEVICE_ID_AMD_FAM17H_DF5:
+	case PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF5:
 		return "DFD5";
-	case PCI_DEVICE_ID_AMD_FAM17H_DF6:
+	case PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF6:
 		return "DFD6";
 	default:
 		printk(BIOS_ERR, "%s: Unhandled device id 0x%x\n", __func__, dev->device);
@@ -152,13 +152,13 @@
 };
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_AMD_FAM17H_DF0,
-	PCI_DEVICE_ID_AMD_FAM17H_DF1,
-	PCI_DEVICE_ID_AMD_FAM17H_DF2,
-	PCI_DEVICE_ID_AMD_FAM17H_DF3,
-	PCI_DEVICE_ID_AMD_FAM17H_DF4,
-	PCI_DEVICE_ID_AMD_FAM17H_DF5,
-	PCI_DEVICE_ID_AMD_FAM17H_DF6,
+	PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF0,
+	PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF1,
+	PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF2,
+	PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF3,
+	PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF4,
+	PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF5,
+	PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF6,
 	0
 };