remove AMD64 strings from pcidevs

ok mortimer@ mpi@ deraadt@

10 files changed, 175 insertions, 175 deletions

diff --git a/sys/arch/amd64/pci/pchb.c b/sys/arch/amd64/pci/pchb.c
index 6e599d7be4a..9b30aa3aca8 100644
--- a/sys/arch/amd64/pci/pchb.c
+++ b/sys/arch/amd64/pci/pchb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pchb.c,v 1.43 2018/04/28 15:44:59 jasper Exp $	*/
+/*	$OpenBSD: pchb.c,v 1.44 2020/01/04 01:34:24 jsg Exp $	*/
 /*	$NetBSD: pchb.c,v 1.1 2003/04/26 18:39:50 fvdl Exp $	*/
 /*
  * Copyright (c) 2000 Michael Shalayeff
@@ -159,8 +159,8 @@ pchbattach(struct device *parent, struct device *self, void *aux)
 	case PCI_VENDOR_AMD:
 		printf("\n");
 		switch (PCI_PRODUCT(pa->pa_id)) {
-		case PCI_PRODUCT_AMD_AMD64_0F_HT:
-		case PCI_PRODUCT_AMD_AMD64_10_HT:
+		case PCI_PRODUCT_AMD_0F_HT:
+		case PCI_PRODUCT_AMD_10_HT:
 			for (i = 0; i < AMD64HT_NUM_LDT; i++)
 				pchb_amd64ht_attach(self, pa, i);
 			break;
diff --git a/sys/arch/i386/pci/pchb.c b/sys/arch/i386/pci/pchb.c
index 11e78f855db..abb81989871 100644
--- a/sys/arch/i386/pci/pchb.c
+++ b/sys/arch/i386/pci/pchb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pchb.c,v 1.90 2018/04/28 15:44:59 jasper Exp $ */
+/*	$OpenBSD: pchb.c,v 1.91 2020/01/04 01:34:24 jsg Exp $ */
 /*	$NetBSD: pchb.c,v 1.65 2007/08/15 02:26:13 markd Exp $	*/
 
 /*
@@ -185,8 +185,8 @@ pchbattach(struct device *parent, struct device *self, void *aux)
 	case PCI_VENDOR_AMD:
 		printf("\n");
 		switch (PCI_PRODUCT(pa->pa_id)) {
-		case PCI_PRODUCT_AMD_AMD64_0F_HT:
-		case PCI_PRODUCT_AMD_AMD64_10_HT:
+		case PCI_PRODUCT_AMD_0F_HT:
+		case PCI_PRODUCT_AMD_10_HT:
 			for (i = 0; i < AMD64HT_NUM_LDT; i++)
 				pchb_amd64ht_attach(self, pa, i);
 			break;
diff --git a/sys/dev/pci/amas.c b/sys/dev/pci/amas.c
index 98658f73e41..afbbf091b58 100644
--- a/sys/dev/pci/amas.c
+++ b/sys/dev/pci/amas.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: amas.c,v 1.5 2014/06/15 11:43:24 sf Exp $	*/
+/*	$OpenBSD: amas.c,v 1.6 2020/01/04 01:34:24 jsg Exp $	*/
 
 /*
  * Copyright (c) 2009 Ariane van der Steldt <ariane@stack.nl>
@@ -132,9 +132,9 @@ struct cfdriver amas_cd = {
 };
 
 const struct pci_matchid amas_devices[] = {
-	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_0F_ADDR },
-	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_10_ADDR },
-	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_11_ADDR },
+	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_0F_ADDR },
+	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_10_ADDR },
+	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_11_ADDR },
 };
 
 int
@@ -161,13 +161,13 @@ amas_attach(struct device *parent, struct device *self, void *aux)
 	amas->pa_pc = pa->pa_pc;
 
 	switch (PCI_PRODUCT(pa->pa_id)) {
-	case PCI_PRODUCT_AMD_AMD64_0F_ADDR:
+	case PCI_PRODUCT_AMD_0F_ADDR:
 		amas->family = AMAS_FAM_0Fh;
 		break;
-	case PCI_PRODUCT_AMD_AMD64_10_ADDR:
+	case PCI_PRODUCT_AMD_10_ADDR:
 		amas->family = AMAS_FAM_10h;
 		break;
-	case PCI_PRODUCT_AMD_AMD64_11_ADDR:
+	case PCI_PRODUCT_AMD_11_ADDR:
 		amas->family = AMAS_FAM_11h;
 		break;
 	}
diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c
index eef2b7cc8b7..3e865d95eff 100644
--- a/sys/dev/pci/azalia.c
+++ b/sys/dev/pci/azalia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: azalia.c,v 1.253 2019/10/14 01:59:14 jcs Exp $	*/
+/*	$OpenBSD: azalia.c,v 1.254 2020/01/04 01:34:24 jsg Exp $	*/
 /*	$NetBSD: azalia.c,v 1.20 2006/05/07 08:31:44 kent Exp $	*/
 
 /*-
@@ -528,8 +528,8 @@ azalia_pci_attach(struct device *parent, struct device *self, void *aux)
 	/* disable MSI for AMD Summit Ridge/Raven Ridge HD Audio */
 	if (PCI_VENDOR(sc->pciid) == PCI_VENDOR_AMD) {
 		switch (PCI_PRODUCT(sc->pciid)) {
-		case PCI_PRODUCT_AMD_AMD64_17_HDA:
-		case PCI_PRODUCT_AMD_AMD64_17_1X_HDA:
+		case PCI_PRODUCT_AMD_17_HDA:
+		case PCI_PRODUCT_AMD_17_1X_HDA:
 			pa->pa_flags &= ~PCI_FLAGS_MSI_ENABLED;
 		}
 	}
diff --git a/sys/dev/pci/ccp_pci.c b/sys/dev/pci/ccp_pci.c
index 91a3d22e8eb..76e215e47f8 100644
--- a/sys/dev/pci/ccp_pci.c
+++ b/sys/dev/pci/ccp_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ccp_pci.c,v 1.4 2020/01/02 22:34:41 mortimer Exp $ */
+/*	$OpenBSD: ccp_pci.c,v 1.5 2020/01/04 01:34:24 jsg Exp $ */
 
 /*
  * Copyright (c) 2018 David Gwynne <dlg@openbsd.org>
@@ -43,11 +43,11 @@ struct cfattach ccp_pci_ca = {
 };
 
 static const struct pci_matchid ccp_pci_devices[] = {
-	{ PCI_VENDOR_AMD,	PCI_PRODUCT_AMD_AMD64_16_CCP },
-	{ PCI_VENDOR_AMD,	PCI_PRODUCT_AMD_AMD64_17_CCP_1 },
-	{ PCI_VENDOR_AMD,	PCI_PRODUCT_AMD_AMD64_17_CCP_2 },
-	{ PCI_VENDOR_AMD,	PCI_PRODUCT_AMD_AMD64_17_1X_CCP },
-	{ PCI_VENDOR_AMD,	PCI_PRODUCT_AMD_AMD64_17_3X_CCP },
+	{ PCI_VENDOR_AMD,	PCI_PRODUCT_AMD_16_CCP },
+	{ PCI_VENDOR_AMD,	PCI_PRODUCT_AMD_17_CCP_1 },
+	{ PCI_VENDOR_AMD,	PCI_PRODUCT_AMD_17_CCP_2 },
+	{ PCI_VENDOR_AMD,	PCI_PRODUCT_AMD_17_1X_CCP },
+	{ PCI_VENDOR_AMD,	PCI_PRODUCT_AMD_17_3X_CCP },
 };
 
 int
diff --git a/sys/dev/pci/kate.c b/sys/dev/pci/kate.c
index 52c1b2e15ee..79648ce08d6 100644
--- a/sys/dev/pci/kate.c
+++ b/sys/dev/pci/kate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kate.c,v 1.6 2015/03/14 03:38:48 jsg Exp $	*/
+/*	$OpenBSD: kate.c,v 1.7 2020/01/04 01:34:24 jsg Exp $	*/
 
 /*
  * Copyright (c) 2008 Constantine A. Murenin <cnst+openbsd@bugmail.mojo.ru>
@@ -101,7 +101,7 @@ kate_match(struct device *parent, void *match, void *aux)
 	int			i, j;
 
 	if (PCI_VENDOR(pa->pa_id) != PCI_VENDOR_AMD ||
-	    PCI_PRODUCT(pa->pa_id) != PCI_PRODUCT_AMD_AMD64_0F_MISC)
+	    PCI_PRODUCT(pa->pa_id) != PCI_PRODUCT_AMD_0F_MISC)
 		return 0;
 
 	/*
diff --git a/sys/dev/pci/km.c b/sys/dev/pci/km.c
index 89a8b9ca1bd..a92edb866b6 100644
--- a/sys/dev/pci/km.c
+++ b/sys/dev/pci/km.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: km.c,v 1.11 2015/11/04 19:39:30 sthen Exp $	*/
+/*	$OpenBSD: km.c,v 1.12 2020/01/04 01:34:24 jsg Exp $	*/
 
 /*
  * Copyright (c) 2008 Constantine A. Murenin <cnst+openbsd@bugmail.mojo.ru>
@@ -67,13 +67,13 @@ struct cfdriver km_cd = {
 };
 
 static const struct pci_matchid km_devices[] = {
-	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_10_MISC },
-	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_11_MISC },
-	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_14_MISC },
-	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_0x_MISC },
-	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_1x_MISC },
-	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_16_MISC },
-	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_16_3X_MISC }
+	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_10_MISC },
+	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_11_MISC },
+	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_14_MISC },
+	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_15_0x_MISC },
+	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_15_1x_MISC },
+	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_16_MISC },
+	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_16_3X_MISC }
 };
 
 
diff --git a/sys/dev/pci/ksmn.c b/sys/dev/pci/ksmn.c
index e15718dd34e..39ea077c861 100644
--- a/sys/dev/pci/ksmn.c
+++ b/sys/dev/pci/ksmn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ksmn.c,v 1.3 2019/11/20 20:44:22 brynet Exp $	*/
+/*	$OpenBSD: ksmn.c,v 1.4 2020/01/04 01:34:24 jsg Exp $	*/
 
 /*
  * Copyright (c) 2019 Bryan Steele <brynet@openbsd.org>
@@ -93,9 +93,9 @@ struct cfdriver ksmn_cd = {
 };
 
 static const struct pci_matchid ksmn_devices[] = {
-	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_17_RC },
-	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_17_1X_RC },
-	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_17_3X_RC }
+	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_17_RC },
+	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_17_1X_RC },
+	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_17_3X_RC }
 };
 
 int
diff --git a/sys/dev/pci/mmuagp.c b/sys/dev/pci/mmuagp.c
index bd6661c6d71..cb6176daabf 100644
--- a/sys/dev/pci/mmuagp.c
+++ b/sys/dev/pci/mmuagp.c
@@ -254,7 +254,7 @@ mmuagp_attach(struct device *parent, struct device *self, void *aux)
 		tag = pci_make_tag(pa->pa_pc, 0, i, 3);
 		id = pci_conf_read(pa->pa_pc, tag, PCI_ID_REG);
 		if (PCI_VENDOR(id) == PCI_VENDOR_AMD &&
-		    PCI_PRODUCT(id) ==  PCI_PRODUCT_AMD_AMD64_0F_MISC) {
+		    PCI_PRODUCT(id) ==  PCI_PRODUCT_AMD_0F_MISC) {
 			msc->mctrl_tag[n] = tag;
 			n++;
 		}
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index 7b324a329ba..25655b76fdf 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.1905 2020/01/03 00:51:55 dlg Exp $
+$OpenBSD: pcidevs,v 1.1906 2020/01/04 01:34:24 jsg Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
 /*
@@ -692,143 +692,143 @@ product ALTIMA AC9100		0x03ea	AC9100
 product ALTIMA AC1003		0x03eb	AC1003
 
 /* AMD products */
-product AMD AMD64_0F_HT		0x1100	AMD64 0Fh HyperTransport
-product AMD AMD64_0F_ADDR	0x1101	AMD64 0Fh Address Map
-product AMD AMD64_0F_DRAM	0x1102	AMD64 0Fh DRAM Cfg
-product AMD AMD64_0F_MISC	0x1103	AMD64 0Fh Misc Cfg
-product AMD AMD64_10_HT		0x1200	AMD64 10h HyperTransport
-product AMD AMD64_10_ADDR	0x1201	AMD64 10h Address Map
-product AMD AMD64_10_DRAM	0x1202	AMD64 10h DRAM Cfg
-product AMD AMD64_10_MISC	0x1203	AMD64 10h Misc Cfg
-product AMD AMD64_10_LINK	0x1204	AMD64 10h Link Cfg
-product AMD AMD64_11_HT		0x1300	AMD64 11h HyperTransport
-product AMD AMD64_11_ADDR	0x1301	AMD64 11h Address Map
-product AMD AMD64_11_DRAM	0x1302	AMD64 11h DRAM Cfg
-product AMD AMD64_11_MISC	0x1303	AMD64 11h Misc Cfg
-product AMD AMD64_11_LINK	0x1304	AMD64 11h Link Cfg
-product AMD AMD64_15_1x_LINK	0x1400	AMD64 15/1xh Link Cfg
-product AMD AMD64_15_1x_ADDR	0x1401	AMD64 15/1xh Address Map
-product AMD AMD64_15_1x_DRAM	0x1402	AMD64 15/1xh DRAM Cfg
-product AMD AMD64_15_1x_MISC	0x1403	AMD64 15/1xh Misc Cfg
-product AMD AMD64_15_1x_CPU_PM	0x1404	AMD64 15/1xh CPU Power
-product AMD AMD64_15_1x_NB_PM	0x1405	AMD64 15/1xh NB Power
-product AMD AMD64_15_1x_HB	0x1410	AMD64 15/1xh Host
-product AMD AMD64_15_1x_PCIE_1	0x1412	AMD64 15/1xh PCIE
-product AMD AMD64_15_1x_PCIE_2	0x1413	AMD64 15/1xh PCIE
-product AMD AMD64_15_1x_PCIE_3	0x1414	AMD64 15/1xh PCIE
-product AMD AMD64_15_1x_PCIE_4	0x1415	AMD64 15/1xh PCIE
-product AMD AMD64_15_1x_PCIE_5	0x1416	AMD64 15/1xh PCIE
-product AMD AMD64_15_1x_PCIE_6	0x1417	AMD64 15/1xh PCIE
-product AMD AMD64_15_1x_PCIE_7	0x1418	AMD64 15/1xh PCIE
-product AMD AMD64_15_1x_IOMMU	0x1419	AMD64 15/1xh IOMMU
-product AMD AMD64_15_3X_LINK	0x141a	AMD64 15h Link Cfg
-product AMD AMD64_15_3X_ADDR	0x141b	AMD64 15h Address Map
-product AMD AMD64_15_3X_DRAM	0x141c	AMD64 15h DRAM Cfg
-product AMD AMD64_15_3X_MISC	0x141d	AMD64 15h Misc Cfg
-product AMD AMD64_15_3X_CPU_PM	0x141e	AMD64 15h CPU Power
-product AMD AMD64_15_3X_MISC_2	0x141f	AMD64 15h Misc Cfg
-product AMD AMD64_15_3X_RC	0x1422	AMD64 15h Root Complex
-product AMD AMD64_15_3X_IOMMU	0x1423	AMD64 15h IOMMU
-product AMD AMD64_15_3X_PCIE_1	0x1424	AMD64 15h PCIE
-product AMD AMD64_15_3X_PCIE_2	0x1425	AMD64 15h PCIE
-product AMD AMD64_15_3X_PCIE_3	0x1426	AMD64 15h PCIE
-product AMD AMD64_16_PCIE	0x1439	AMD64 16h PCIE
-product AMD AMD64_17_RC		0x1450	AMD64 17h Root Complex
-product AMD AMD64_17_IOMMU	0x1451	AMD64 17h IOMMU
-product AMD AMD64_17_PCIE_1	0x1452	AMD64 17h PCIE
-product AMD AMD64_17_PCIE_2	0x1453	AMD64 17h PCIE
-product AMD AMD64_17_PCIE_3	0x1454	AMD64 17h PCIE
-product AMD AMD64_17_CCP_1	0x1456	AMD64 17h Crypto
-product AMD AMD64_17_HDA	0x1457	AMD64 17h HD Audio
-product AMD AMD64_17_XHCI_1	0x145c	AMD64 17h xHCI
-product AMD AMD64_17_XHCI_2	0x145f	AMD64 17h xHCI
-product AMD AMD64_17_DF_1	0x1460	AMD64 17h Data Fabric
-product AMD AMD64_17_DF_2	0x1461	AMD64 17h Data Fabric
-product AMD AMD64_17_DF_3	0x1462	AMD64 17h Data Fabric
-product AMD AMD64_17_DF_4	0x1463	AMD64 17h Data Fabric
-product AMD AMD64_17_DF_5	0x1464	AMD64 17h Data Fabric
-product AMD AMD64_17_DF_6	0x1465	AMD64 17h Data Fabric
-product AMD AMD64_17_DF_7	0x1466	AMD64 17h Data Fabric
-product AMD AMD64_17_DF_8	0x1467	AMD64 17h Data Fabric
-product AMD AMD64_17_CCP_2	0x1468	AMD64 17h Crypto
-product AMD AMD64_17_PCIE_4	0x1470	AMD64 17h PCIE
-product AMD AMD64_17_PCIE_5	0x1471	AMD64 17h PCIE
-product AMD AMD64_17_3X_RC	0x1480	AMD64 17h/3xh Root Complex
-product AMD AMD64_17_3X_CCP	0x1486	AMD64 17h/3xh Crypto
-product AMD AMD64_14_HB		0x1510	AMD64 14h Host
-product AMD AMD64_14_PCIE_1	0x1512	AMD64 14h PCIE
-product AMD AMD64_14_PCIE_2	0x1513	AMD64 14h PCIE
-product AMD AMD64_14_PCIE_3	0x1514	AMD64 14h PCIE
-product AMD AMD64_14_PCIE_4	0x1515	AMD64 14h PCIE
-product AMD AMD64_14_PCIE_5	0x1516	AMD64 14h PCIE
-product AMD AMD64_16_LINK	0x1530	AMD64 16h Link Cfg
-product AMD AMD64_16_ADDR	0x1531	AMD64 16h Address Map
-product AMD AMD64_16_DRAM	0x1532	AMD64 16h DRAM Cfg
-product AMD AMD64_16_MISC	0x1533	AMD64 16h Misc Cfg
-product AMD AMD64_16_CPU_PM	0x1534	AMD64 16h CPU Power
-product AMD AMD64_16_HB		0x1536	AMD64 16h Host
-product AMD AMD64_16_CCP	0x1537	AMD64 16h Crypto
-product AMD AMD64_16_3X_RC	0x1566	AMD64 16h Root Complex
-product AMD AMD64_16_3X_HB	0x156b	AMD64 16h Host
-product AMD AMD64_15_6X_LINK	0x1570	AMD64 15h Link Cfg
-product AMD AMD64_15_6X_ADDR	0x1571	AMD64 15h Address Map
-product AMD AMD64_15_6X_DRAM	0x1572	AMD64 15h DRAM Cfg
-product AMD AMD64_15_6X_MISC	0x1573	AMD64 15h Misc Cfg
-product AMD AMD64_15_6X_CPU_PM	0x1574	AMD64 15h CPU Power
-product AMD AMD64_15_6X_MISC_2	0x1575	AMD64 15h Misc Cfg
-product AMD AMD64_15_6X_RC	0x1576	AMD64 15h Root Complex
-product AMD AMD64_15_6X_IOMMU	0x1577	AMD64 15h IOMMU
-product AMD AMD64_15_6X_PSP	0x1578	AMD64 15h PSP 2.0
-product AMD AMD64_15_6X_AUDIO	0x157a	AMD64 15h HD Audio
-product AMD AMD64_15_6X_HB_1	0x157b	AMD64 15h Host
-product AMD AMD64_15_6X_PCIE_1	0x157c	AMD64 15h PCIE
-product AMD AMD64_15_6X_HB_2	0x157d	AMD64 15h Host
-product AMD AMD64_16_3X_LINK	0x1580	AMD64 16h Link Cfg
-product AMD AMD64_16_3X_ADDR	0x1581	AMD64 16h Address Map
-product AMD AMD64_16_3X_DRAM	0x1582	AMD64 16h DRAM Cfg
-product AMD AMD64_16_3X_MISC	0x1583	AMD64 16h Misc Cfg
-product AMD AMD64_16_3X_CPU_PM	0x1584	AMD64 16h CPU Power
-product AMD AMD64_16_3X_MISC_2	0x1585	AMD64 16h Misc Cfg
-product AMD AMD64_17_1X_RC	0x15d0	AMD64 17h/1xh Root Complex
-product AMD AMD64_17_1X_IOMMU	0x15d1	AMD64 17h/1xh IOMMU
-product AMD AMD64_17_1X_PCIE_1	0x15d3	AMD64 17h/1xh PCIE
-product AMD AMD64_17_1X_PCIE_2	0x15db	AMD64 17h/1xh PCIE
-product AMD AMD64_17_1X_PCIE_3	0x15dc	AMD64 17h/1xh PCIE
-product AMD AMD64_17_1X_CCP	0x15df	AMD64 17h/1xh Crypto
-product AMD AMD64_17_1X_XHCI_1	0x15e0	AMD64 17h/1xh xHCI
-product AMD AMD64_17_1X_XHCI_2	0x15e1	AMD64 17h/1xh xHCI
-product AMD AMD64_17_1X_ACP	0x15e2	AMD64 17h/1xh I2S Audio
-product AMD AMD64_17_1X_HDA	0x15e3	AMD64 17h/1xh HD Audio
-product AMD AMD64_17_1X_DF_0	0x15e8	AMD64 17h/1xh Data Fabric
-product AMD AMD64_17_1X_DF_1	0x15e9	AMD64 17h/1xh Data Fabric
-product AMD AMD64_17_1X_DF_2	0x15ea	AMD64 17h/1xh Data Fabric
-product AMD AMD64_17_1X_DF_3	0x15eb	AMD64 17h/1xh Data Fabric
-product AMD AMD64_17_1X_DF_4	0x15ec	AMD64 17h/1xh Data Fabric
-product AMD AMD64_17_1X_DF_5	0x15ed	AMD64 17h/1xh Data Fabric
-product AMD AMD64_17_1X_DF_6	0x15ee	AMD64 17h/1xh Data Fabric
-product AMD AMD64_17_1X_DF_7	0x15ef	AMD64 17h/1xh Data Fabric
-product AMD AMD64_15_0x_LINK	0x1600	AMD64 15/0xh Link Cfg
-product AMD AMD64_15_0x_ADDR	0x1601	AMD64 15/0xh Address Map
-product AMD AMD64_15_0x_DRAM	0x1602	AMD64 15/0xh DRAM Cfg
-product AMD AMD64_15_0x_MISC	0x1603	AMD64 15/0xh Misc Cfg
-product AMD AMD64_15_0x_CPU_PM	0x1604	AMD64 15/0xh CPU Power
-product AMD AMD64_15_0x_HB	0x1605	AMD64 15/0xh Host
-product AMD AMD64_14_LINK	0x1700	AMD64 14h Link Cfg
-product AMD AMD64_14_ADDR	0x1701	AMD64 14h Address Map
-product AMD AMD64_14_DRAM	0x1702	AMD64 14h DRAM Cfg
-product AMD AMD64_14_MISC	0x1703	AMD64 14h Misc Cfg
-product AMD AMD64_14_CPU_PM	0x1704	AMD64 14h CPU Power
-product AMD AMD64_12_HB		0x1705	AMD64 12h Host
-product AMD AMD64_12_PCIE_1	0x1707	AMD64 12h PCIE
-product AMD AMD64_12_PCIE_2	0x1708	AMD64 12h PCIE
-product AMD AMD64_12_PCIE_3	0x1709	AMD64 12h PCIE
-product AMD AMD64_12_PCIE_4	0x170a	AMD64 12h PCIE
-product AMD AMD64_12_PCIE_5	0x170b	AMD64 12h PCIE
-product AMD AMD64_12_PCIE_6	0x170c	AMD64 12h PCIE
-product AMD AMD64_12_PCIE_7	0x170d	AMD64 12h PCIE
-product AMD AMD64_14_NB_PM	0x1716	AMD64 14h NB Power
-product AMD AMD64_14_RESERVED_1	0x1718	AMD64 14h Reserved
-product AMD AMD64_14_RESERVED_2	0x1719	AMD64 14h Reserved
+product AMD 0F_HT		0x1100	0Fh HyperTransport
+product AMD 0F_ADDR		0x1101	0Fh Address Map
+product AMD 0F_DRAM		0x1102	0Fh DRAM Cfg
+product AMD 0F_MISC		0x1103	0Fh Misc Cfg
+product AMD 10_HT		0x1200	10h HyperTransport
+product AMD 10_ADDR		0x1201	10h Address Map
+product AMD 10_DRAM		0x1202	10h DRAM Cfg
+product AMD 10_MISC		0x1203	10h Misc Cfg
+product AMD 10_LINK		0x1204	10h Link Cfg
+product AMD 11_HT		0x1300	11h HyperTransport
+product AMD 11_ADDR		0x1301	11h Address Map
+product AMD 11_DRAM		0x1302	11h DRAM Cfg
+product AMD 11_MISC		0x1303	11h Misc Cfg
+product AMD 11_LINK		0x1304	11h Link Cfg
+product AMD 15_1x_LINK		0x1400	15/1xh Link Cfg
+product AMD 15_1x_ADDR		0x1401	15/1xh Address Map
+product AMD 15_1x_DRAM		0x1402	15/1xh DRAM Cfg
+product AMD 15_1x_MISC		0x1403	15/1xh Misc Cfg
+product AMD 15_1x_CPU_PM	0x1404	15/1xh CPU Power
+product AMD 15_1x_NB_PM		0x1405	15/1xh NB Power
+product AMD 15_1x_HB		0x1410	15/1xh Host
+product AMD 15_1x_PCIE_1	0x1412	15/1xh PCIE
+product AMD 15_1x_PCIE_2	0x1413	15/1xh PCIE
+product AMD 15_1x_PCIE_3	0x1414	15/1xh PCIE
+product AMD 15_1x_PCIE_4	0x1415	15/1xh PCIE
+product AMD 15_1x_PCIE_5	0x1416	15/1xh PCIE
+product AMD 15_1x_PCIE_6	0x1417	15/1xh PCIE
+product AMD 15_1x_PCIE_7	0x1418	15/1xh PCIE
+product AMD 15_1x_IOMMU		0x1419	15/1xh IOMMU
+product AMD 15_3X_LINK		0x141a	15h Link Cfg
+product AMD 15_3X_ADDR		0x141b	15h Address Map
+product AMD 15_3X_DRAM		0x141c	15h DRAM Cfg
+product AMD 15_3X_MISC		0x141d	15h Misc Cfg
+product AMD 15_3X_CPU_PM	0x141e	15h CPU Power
+product AMD 15_3X_MISC_2	0x141f	15h Misc Cfg
+product AMD 15_3X_RC		0x1422	15h Root Complex
+product AMD 15_3X_IOMMU		0x1423	15h IOMMU
+product AMD 15_3X_PCIE_1	0x1424	15h PCIE
+product AMD 15_3X_PCIE_2	0x1425	15h PCIE
+product AMD 15_3X_PCIE_3	0x1426	15h PCIE
+product AMD 16_PCIE		0x1439	16h PCIE
+product AMD 17_RC		0x1450	17h Root Complex
+product AMD 17_IOMMU		0x1451	17h IOMMU
+product AMD 17_PCIE_1		0x1452	17h PCIE
+product AMD 17_PCIE_2		0x1453	17h PCIE
+product AMD 17_PCIE_3		0x1454	17h PCIE
+product AMD 17_CCP_1		0x1456	17h Crypto
+product AMD 17_HDA		0x1457	17h HD Audio
+product AMD 17_XHCI_1		0x145c	17h xHCI
+product AMD 17_XHCI_2		0x145f	17h xHCI
+product AMD 17_DF_1		0x1460	17h Data Fabric
+product AMD 17_DF_2		0x1461	17h Data Fabric
+product AMD 17_DF_3		0x1462	17h Data Fabric
+product AMD 17_DF_4		0x1463	17h Data Fabric
+product AMD 17_DF_5		0x1464	17h Data Fabric
+product AMD 17_DF_6		0x1465	17h Data Fabric
+product AMD 17_DF_7		0x1466	17h Data Fabric
+product AMD 17_DF_8		0x1467	17h Data Fabric
+product AMD 17_CCP_2		0x1468	17h Crypto
+product AMD 17_PCIE_4		0x1470	17h PCIE
+product AMD 17_PCIE_5		0x1471	17h PCIE
+product AMD 17_3X_RC		0x1480	17h/3xh Root Complex
+product AMD 17_3X_CCP		0x1486	17h/3xh Crypto
+product AMD 14_HB		0x1510	14h Host
+product AMD 14_PCIE_1		0x1512	14h PCIE
+product AMD 14_PCIE_2		0x1513	14h PCIE
+product AMD 14_PCIE_3		0x1514	14h PCIE
+product AMD 14_PCIE_4		0x1515	14h PCIE
+product AMD 14_PCIE_5		0x1516	14h PCIE
+product AMD 16_LINK		0x1530	16h Link Cfg
+product AMD 16_ADDR		0x1531	16h Address Map
+product AMD 16_DRAM		0x1532	16h DRAM Cfg
+product AMD 16_MISC		0x1533	16h Misc Cfg
+product AMD 16_CPU_PM		0x1534	16h CPU Power
+product AMD 16_HB		0x1536	16h Host
+product AMD 16_CCP		0x1537	16h Crypto
+product AMD 16_3X_RC		0x1566	16h Root Complex
+product AMD 16_3X_HB		0x156b	16h Host
+product AMD 15_6X_LINK		0x1570	15h Link Cfg
+product AMD 15_6X_ADDR		0x1571	15h Address Map
+product AMD 15_6X_DRAM		0x1572	15h DRAM Cfg
+product AMD 15_6X_MISC		0x1573	15h Misc Cfg
+product AMD 15_6X_CPU_PM	0x1574	15h CPU Power
+product AMD 15_6X_MISC_2	0x1575	15h Misc Cfg
+product AMD 15_6X_RC		0x1576	15h Root Complex
+product AMD 15_6X_IOMMU		0x1577	15h IOMMU
+product AMD 15_6X_PSP		0x1578	15h PSP 2.0
+product AMD 15_6X_AUDIO		0x157a	15h HD Audio
+product AMD 15_6X_HB_1		0x157b	15h Host
+product AMD 15_6X_PCIE_1	0x157c	15h PCIE
+product AMD 15_6X_HB_2		0x157d	15h Host
+product AMD 16_3X_LINK		0x1580	16h Link Cfg
+product AMD 16_3X_ADDR		0x1581	16h Address Map
+product AMD 16_3X_DRAM		0x1582	16h DRAM Cfg
+product AMD 16_3X_MISC		0x1583	16h Misc Cfg
+product AMD 16_3X_CPU_PM	0x1584	16h CPU Power
+product AMD 16_3X_MISC_2	0x1585	16h Misc Cfg
+product AMD 17_1X_RC		0x15d0	17h/1xh Root Complex
+product AMD 17_1X_IOMMU		0x15d1	17h/1xh IOMMU
+product AMD 17_1X_PCIE_1	0x15d3	17h/1xh PCIE
+product AMD 17_1X_PCIE_2	0x15db	17h/1xh PCIE
+product AMD 17_1X_PCIE_3	0x15dc	17h/1xh PCIE
+product AMD 17_1X_CCP		0x15df	17h/1xh Crypto
+product AMD 17_1X_XHCI_1	0x15e0	17h/1xh xHCI
+product AMD 17_1X_XHCI_2	0x15e1	17h/1xh xHCI
+product AMD 17_1X_ACP		0x15e2	17h/1xh I2S Audio
+product AMD 17_1X_HDA		0x15e3	17h/1xh HD Audio
+product AMD 17_1X_DF_0		0x15e8	17h/1xh Data Fabric
+product AMD 17_1X_DF_1		0x15e9	17h/1xh Data Fabric
+product AMD 17_1X_DF_2		0x15ea	17h/1xh Data Fabric
+product AMD 17_1X_DF_3		0x15eb	17h/1xh Data Fabric
+product AMD 17_1X_DF_4		0x15ec	17h/1xh Data Fabric
+product AMD 17_1X_DF_5		0x15ed	17h/1xh Data Fabric
+product AMD 17_1X_DF_6		0x15ee	17h/1xh Data Fabric
+product AMD 17_1X_DF_7		0x15ef	17h/1xh Data Fabric
+product AMD 15_0x_LINK		0x1600	15/0xh Link Cfg
+product AMD 15_0x_ADDR		0x1601	15/0xh Address Map
+product AMD 15_0x_DRAM		0x1602	15/0xh DRAM Cfg
+product AMD 15_0x_MISC		0x1603	15/0xh Misc Cfg
+product AMD 15_0x_CPU_PM	0x1604	15/0xh CPU Power
+product AMD 15_0x_HB		0x1605	15/0xh Host
+product AMD 14_LINK		0x1700	14h Link Cfg
+product AMD 14_ADDR		0x1701	14h Address Map
+product AMD 14_DRAM		0x1702	14h DRAM Cfg
+product AMD 14_MISC		0x1703	14h Misc Cfg
+product AMD 14_CPU_PM		0x1704	14h CPU Power
+product AMD 12_HB		0x1705	12h Host
+product AMD 12_PCIE_1		0x1707	12h PCIE
+product AMD 12_PCIE_2		0x1708	12h PCIE
+product AMD 12_PCIE_3		0x1709	12h PCIE
+product AMD 12_PCIE_4		0x170a	12h PCIE
+product AMD 12_PCIE_5		0x170b	12h PCIE
+product AMD 12_PCIE_6		0x170c	12h PCIE
+product AMD 12_PCIE_7		0x170d	12h PCIE
+product AMD 14_NB_PM		0x1716	14h NB Power
+product AMD 14_RESERVED_1	0x1718	14h Reserved
+product AMD 14_RESERVED_2	0x1719	14h Reserved
 product AMD A1100_HB_1		0x1a00	A1100 Host
 product AMD A1100_HB_2		0x1a01	A1100 Host
 product AMD A1100_PCIE_1	0x1a02	A1100 PCIE