sync

2 files changed, 52 insertions, 27 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 3b1eba538a3..9e3e2fbae37 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: pcidevs,v 1.1806 2016/11/10 11:50:40 mpi Exp 
+ *	OpenBSD: pcidevs,v 1.1807 2016/11/25 18:28:28 mikeb Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
@@ -3357,7 +3357,7 @@
 #define	PCI_PRODUCT_INTEL_I218_V	0x1559		/* I218-V */
 #define	PCI_PRODUCT_INTEL_I218_LM	0x155a		/* I218-LM */
 #define	PCI_PRODUCT_INTEL_X540T1	0x1560		/* X540T */
-#define	PCI_PRODUCT_INTEL_X550T	0x1563		/* X550 */
+#define	PCI_PRODUCT_INTEL_X550T	0x1563		/* X550T */
 #define	PCI_PRODUCT_INTEL_DSL5520	0x156c		/* DSL5520 Thunderbolt */
 #define	PCI_PRODUCT_INTEL_DSL5520_PCIE	0x156d		/* DSL5520 Thunderbolt */
 #define	PCI_PRODUCT_INTEL_I219_LM	0x156f		/* I219-LM */
@@ -3375,16 +3375,21 @@
 #define	PCI_PRODUCT_INTEL_I218_V_2	0x15a1		/* I218-V */
 #define	PCI_PRODUCT_INTEL_I218_LM_3	0x15a2		/* I218-LM */
 #define	PCI_PRODUCT_INTEL_I218_V_3	0x15a3		/* I218-V */
-#define	PCI_PRODUCT_INTEL_X552_SFP	0x15ac		/* X552 */
-#define	PCI_PRODUCT_INTEL_X557_AT2	0x15ad		/* X557-AT2 */
+#define	PCI_PRODUCT_INTEL_X550EM_X_KX4	0x15aa		/* X557 Backplane */
+#define	PCI_PRODUCT_INTEL_X550EM_X_KR	0x15ab		/* X557 Backplane */
+#define	PCI_PRODUCT_INTEL_X550EM_X_SFP	0x15ac		/* X557 SFP+ */
+#define	PCI_PRODUCT_INTEL_X550EM_X_10G_T	0x15ad		/* X557 10GbaseT */
+#define	PCI_PRODUCT_INTEL_X550EM_X_1G_T	0x15ae		/* X557 1GbaseT */
 #define	PCI_PRODUCT_INTEL_I219_LM2	0x15b7		/* I219-LM2 */
 #define	PCI_PRODUCT_INTEL_I219_V2	0x15b8		/* I219-V2 */
-#define	PCI_PRODUCT_INTEL_X550EM_X_KX4	0x15aa		/* X550EM Backplane */
-#define	PCI_PRODUCT_INTEL_X550EM_X_KR	0x15ab		/* X550EM Backplane */
-#define	PCI_PRODUCT_INTEL_X550EM_X_SFP	0x15ac		/* X550EM SFP+ */
-#define	PCI_PRODUCT_INTEL_X550EM_X_10G_T	0x15ad		/* X550EM 10GbaseT */
-#define	PCI_PRODUCT_INTEL_X550EM_X_1G_T	0x15ae		/* X550EM 1GbaseT */
-#define	PCI_PRODUCT_INTEL_X550T1	0x15d1		/* X550 */
+#define	PCI_PRODUCT_INTEL_X550EM_A_KR	0x15c2		/* X552 Backplane */
+#define	PCI_PRODUCT_INTEL_X550EM_A_KR_L	0x15c3		/* X552 Backplane */
+#define	PCI_PRODUCT_INTEL_X550EM_A_SFP_N	0x15c4		/* X552 SFP+ */
+#define	PCI_PRODUCT_INTEL_X550EM_A_SGMII	0x15c6		/* X552 SGMII */
+#define	PCI_PRODUCT_INTEL_X550EM_A_SGMII_L	0x15c7		/* X552 SGMII */
+#define	PCI_PRODUCT_INTEL_X550EM_A_10G_T	0x15c8		/* X552 10GBaseT */
+#define	PCI_PRODUCT_INTEL_X550EM_A_SFP	0x15ce		/* X552 SFP+ */
+#define	PCI_PRODUCT_INTEL_X550T1	0x15d1		/* X550T */
 #define	PCI_PRODUCT_INTEL_CORE5G_H_PCIE_X16	0x1601		/* Core 5G PCIE */
 #define	PCI_PRODUCT_INTEL_CORE5G_M_GT1_1	0x1602		/* HD Graphics */
 #define	PCI_PRODUCT_INTEL_CORE5G_HB_1	0x1604		/* Core 5G Host */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index f95b6eda190..11e68e1886b 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: pcidevs,v 1.1806 2016/11/10 11:50:40 mpi Exp 
+ *	OpenBSD: pcidevs,v 1.1807 2016/11/25 18:28:28 mikeb Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
@@ -10945,7 +10945,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550T,
-	    "X550",
+	    "X550T",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_DSL5520,
@@ -11016,12 +11016,24 @@ static const struct pci_known_product pci_known_products[] = {
 	    "I218-V",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X552_SFP,
-	    "X552",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550EM_X_KX4,
+	    "X557 Backplane",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550EM_X_KR,
+	    "X557 Backplane",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550EM_X_SFP,
+	    "X557 SFP+",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550EM_X_10G_T,
+	    "X557 10GbaseT",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X557_AT2,
-	    "X557-AT2",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550EM_X_1G_T,
+	    "X557 1GbaseT",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM2,
@@ -11032,28 +11044,36 @@ static const struct pci_known_product pci_known_products[] = {
 	    "I219-V2",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550EM_X_KX4,
-	    "X550EM Backplane",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550EM_A_KR,
+	    "X552 Backplane",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550EM_X_KR,
-	    "X550EM Backplane",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550EM_A_KR_L,
+	    "X552 Backplane",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550EM_X_SFP,
-	    "X550EM SFP+",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550EM_A_SFP_N,
+	    "X552 SFP+",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550EM_X_10G_T,
-	    "X550EM 10GbaseT",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550EM_A_SGMII,
+	    "X552 SGMII",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550EM_X_1G_T,
-	    "X550EM 1GbaseT",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550EM_A_SGMII_L,
+	    "X552 SGMII",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550EM_A_10G_T,
+	    "X552 10GBaseT",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550EM_A_SFP,
+	    "X552 SFP+",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550T1,
-	    "X550",
+	    "X550T",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE5G_H_PCIE_X16,