summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2018-03-10 04:35:01 +0000
committerjsg <jsg@openbsd.org>2018-03-10 04:35:01 +0000
commitbe2cde88ac768126030f029ed994663ef212a5fa (patch)
tree86ee40485c1b880a97cac05558f5af34589e1994
parentAdd another ICH10 em(4). From John the.cheeze at gmail. (diff)
downloadwireguard-openbsd-be2cde88ac768126030f029ed994663ef212a5fa.tar.xz
wireguard-openbsd-be2cde88ac768126030f029ed994663ef212a5fa.zip
Add ids for Ice Lake and Cannon Lake Ethernet and some more I210 ids.
From FreeBSD.
-rw-r--r--sys/dev/pci/if_em_hw.h12
-rw-r--r--sys/dev/pci/pcidevs12
2 files changed, 22 insertions, 2 deletions
diff --git a/sys/dev/pci/if_em_hw.h b/sys/dev/pci/if_em_hw.h
index f4dcb4aaae2..99f18203a70 100644
--- a/sys/dev/pci/if_em_hw.h
+++ b/sys/dev/pci/if_em_hw.h
@@ -31,7 +31,7 @@
*******************************************************************************/
-/* $OpenBSD: if_em_hw.h,v 1.71 2018/03/10 02:49:23 jsg Exp $ */
+/* $OpenBSD: if_em_hw.h,v 1.72 2018/03/10 04:35:01 jsg Exp $ */
/* $FreeBSD: if_em_hw.h,v 1.15 2005/05/26 23:32:02 tackerman Exp $ */
/* if_em_hw.h
@@ -565,6 +565,14 @@ int32_t em_check_phy_reset_block(struct em_hw *hw);
#define E1000_DEV_ID_PCH_SPT_I219_V4 0x15D8
#define E1000_DEV_ID_PCH_SPT_I219_LM5 0x15E3
#define E1000_DEV_ID_PCH_SPT_I219_V5 0x15D6
+#define E1000_DEV_ID_PCH_CNP_I219_LM6 0x15BD
+#define E1000_DEV_ID_PCH_CNP_I219_V6 0x15BE
+#define E1000_DEV_ID_PCH_CNP_I219_LM7 0x15BB
+#define E1000_DEV_ID_PCH_CNP_I219_V7 0x15BC
+#define E1000_DEV_ID_PCH_ICP_I219_LM8 0x15DF
+#define E1000_DEV_ID_PCH_ICP_I219_V8 0x15E0
+#define E1000_DEV_ID_PCH_ICP_I219_LM9 0x15E1
+#define E1000_DEV_ID_PCH_ICP_I219_V9 0x15E2
#define E1000_DEV_ID_82575EB_PT 0x10A7
#define E1000_DEV_ID_82575EB_PF 0x10A9
#define E1000_DEV_ID_82575GB_QP 0x10D6
@@ -595,6 +603,8 @@ int32_t em_check_phy_reset_block(struct em_hw *hw);
#define E1000_DEV_ID_I350_SGMII 0x1524
#define E1000_DEV_ID_82576_QUAD_CU_ET2 0x1526
#define E1000_DEV_ID_I210_COPPER 0x1533
+#define E1000_DEV_ID_I210_COPPER_OEM1 0x1534
+#define E1000_DEV_ID_I210_COPPER_IT 0x1535
#define E1000_DEV_ID_I210_FIBER 0x1536
#define E1000_DEV_ID_I210_SERDES 0x1537
#define E1000_DEV_ID_I210_SGMII 0x1538
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index deb295c9dd2..5e9d112aba8 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.1838 2018/03/10 02:47:21 jsg Exp $
+$OpenBSD: pcidevs,v 1.1839 2018/03/10 04:35:01 jsg Exp $
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
/*
@@ -3389,6 +3389,8 @@ product INTEL X540T 0x1528 X540T
product INTEL 82599_SFP_FCOE 0x1529 82599
product INTEL 82599_BPLANE_FCOE 0x152a 82599
product INTEL I210_COPPER 0x1533 I210
+product INTEL I210_COPPER_OEM1 0x1534 I210
+product INTEL I210_COPPER_IT 0x1535 I210
product INTEL I210_FIBER 0x1536 I210 Fiber
product INTEL I210_SERDES 0x1537 I210 SerDes
product INTEL I210_SGMII 0x1538 I210 SGMII
@@ -3437,6 +3439,10 @@ product INTEL X550EM_X_1G_T 0x15ae X552 1GbaseT
product INTEL I219_LM2 0x15b7 I219-LM
product INTEL I219_V2 0x15b8 I219-V
product INTEL I219_LM3 0x15b9 I219-LM
+product INTEL I219_LM7 0x15bb I219-LM
+product INTEL I219_V7 0x15bc I219-V
+product INTEL I219_LM6 0x15bd I219-LM
+product INTEL I219_V6 0x15be I219-V
product INTEL X550EM_A_KR 0x15c2 X553 Backplane
product INTEL X550EM_A_KR_L 0x15c3 X553 Backplane
product INTEL X550EM_A_SFP_N 0x15c4 X553 SFP+
@@ -3448,6 +3454,10 @@ product INTEL X550T1 0x15d1 X550T
product INTEL I219_V5 0x15d6 I219-V
product INTEL I219_LM4 0x15d7 I219-LM
product INTEL I219_V4 0x15d8 I219-V
+product INTEL I219_LM8 0x15df I219-LM
+product INTEL I219_V8 0x15e0 I219-V
+product INTEL I219_LM9 0x15e1 I219-LM
+product INTEL I219_V9 0x15e2 I219-V
product INTEL I219_LM5 0x15e3 I219-LM
product INTEL CORE5G_H_PCIE_X16 0x1601 Core 5G PCIE
product INTEL CORE5G_M_GT1_1 0x1602 HD Graphics