Change in coreboot[master]: include/device/pci_ids: add model number to data fabric devices
Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47676 )
Change subject: include/device/pci_ids: add model number to data fabric devices ......................................................................
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 --- M src/include/device/pci_ids.h M src/soc/amd/picasso/data_fabric.c 2 files changed, 21 insertions(+), 21 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/76/47676/1
diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h index cb2d2dd..7dacb65 100644 --- a/src/include/device/pci_ids.h +++ b/src/include/device/pci_ids.h @@ -461,13 +461,13 @@ #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_MODEL18H_DF0 0x15E8 +#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF1 0x15E9 +#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF2 0x15EA +#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF3 0x15EB +#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF4 0x15EC +#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF5 0x15ED +#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_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 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 };
Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47676 )
Change subject: include/device/pci_ids: add model number to data fabric devices ......................................................................
Patch Set 1: Code-Review+2
Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/47676 )
Change subject: include/device/pci_ids: add model number to data fabric devices ......................................................................
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 --- M src/include/device/pci_ids.h M src/soc/amd/picasso/data_fabric.c 2 files changed, 21 insertions(+), 21 deletions(-)
Approvals: build bot (Jenkins): Verified Marshall Dawson: Looks good to me, approved
diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h index cb2d2dd..7dacb65 100644 --- a/src/include/device/pci_ids.h +++ b/src/include/device/pci_ids.h @@ -461,13 +461,13 @@ #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_MODEL18H_DF0 0x15E8 +#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF1 0x15E9 +#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF2 0x15EA +#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF3 0x15EB +#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF4 0x15EC +#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF5 0x15ED +#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_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 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 };
-
Felix Held (Code Review) -
Marshall Dawson (Code Review)