diff options
| author |   jsg <jsg@openbsd.org> | 2020-01-20 23:45:02 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2020-01-20 23:45:02 +0000 |
| commit | f872b0ca7bc15abfc9df9784b4b2ca8f97c78027 (patch) | |
| tree | 5f7026d03194e8392b1d8cbc7b1ab6693124ba95 | |
| parent | floppy is a bit tight right now, evict fxp temporarily until another (diff) | |
| download | wireguard-openbsd-f872b0ca7bc15abfc9df9784b4b2ca8f97c78027.tar.xz wireguard-openbsd-f872b0ca7bc15abfc9df9784b4b2ca8f97c78027.zip | |
match on Intel Comet Lake and Tiger Lake Ethernet
| -rw-r--r-- | sys/dev/pci/if_em.c | 13 | ||||
| -rw-r--r-- | sys/dev/pci/if_em_hw.c | 13 | ||||
| -rw-r--r-- | sys/dev/pci/if_em_hw.h | 13 |
3 files changed, 36 insertions, 3 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index 14a90e70ca1..de522667351 100644 --- a/sys/dev/pci/if_em.c +++ b/sys/dev/pci/if_em.c @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ -/* $OpenBSD: if_em.c,v 1.342 2019/03/01 10:02:44 dlg Exp $ */ +/* $OpenBSD: if_em.c,v 1.343 2020/01/20 23:45:02 jsg Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include <dev/pci/if_em.h> @@ -156,6 +156,12 @@ const struct pci_matchid em_devices[] = { { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM7 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM8 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM9 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM10 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM11 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM12 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM13 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM14 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM15 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V2 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V4 }, @@ -164,6 +170,11 @@ const struct pci_matchid em_devices[] = { { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V7 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V8 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V9 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V10 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V11 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V12 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V13 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V14 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_COPPER }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_FIBER }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_SERDES }, diff --git a/sys/dev/pci/if_em_hw.c b/sys/dev/pci/if_em_hw.c index 8747e3ab44e..c2101df4906 100644 --- a/sys/dev/pci/if_em_hw.c +++ b/sys/dev/pci/if_em_hw.c @@ -31,7 +31,7 @@ *******************************************************************************/ -/* $OpenBSD: if_em_hw.c,v 1.104 2019/09/05 20:47:49 kettenis Exp $ */ +/* $OpenBSD: if_em_hw.c,v 1.105 2020/01/20 23:45:02 jsg Exp $ */ /* * if_em_hw.c Shared functions for accessing and configuring the MAC */ @@ -625,6 +625,8 @@ em_set_mac_type(struct em_hw *hw) case E1000_DEV_ID_PCH_SPT_I219_V4: case E1000_DEV_ID_PCH_SPT_I219_LM5: case E1000_DEV_ID_PCH_SPT_I219_V5: + case E1000_DEV_ID_PCH_CMP_I219_LM12: + case E1000_DEV_ID_PCH_CMP_I219_V12: hw->mac_type = em_pch_spt; break; case E1000_DEV_ID_PCH_CNP_I219_LM6: @@ -635,6 +637,15 @@ em_set_mac_type(struct em_hw *hw) case E1000_DEV_ID_PCH_ICP_I219_V8: case E1000_DEV_ID_PCH_ICP_I219_LM9: case E1000_DEV_ID_PCH_ICP_I219_V9: + case E1000_DEV_ID_PCH_CMP_I219_LM10: + case E1000_DEV_ID_PCH_CMP_I219_V10: + case E1000_DEV_ID_PCH_CMP_I219_LM11: + case E1000_DEV_ID_PCH_CMP_I219_V11: + case E1000_DEV_ID_PCH_TGP_I219_LM13: + case E1000_DEV_ID_PCH_TGP_I219_V13: + case E1000_DEV_ID_PCH_TGP_I219_LM14: + case E1000_DEV_ID_PCH_TGP_I219_V14: + case E1000_DEV_ID_PCH_TGP_I219_LM15: hw->mac_type = em_pch_cnp; break; case E1000_DEV_ID_EP80579_LAN_1: diff --git a/sys/dev/pci/if_em_hw.h b/sys/dev/pci/if_em_hw.h index 6b2a74dc313..2e537941611 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.78 2019/01/05 18:46:36 kettenis Exp $ */ +/* $OpenBSD: if_em_hw.h,v 1.79 2020/01/20 23:45:02 jsg Exp $ */ /* $FreeBSD: if_em_hw.h,v 1.15 2005/05/26 23:32:02 tackerman Exp $ */ /* if_em_hw.h @@ -575,6 +575,17 @@ int32_t em_check_phy_reset_block(struct em_hw *hw); #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_PCH_CMP_I219_LM10 0x0D4E +#define E1000_DEV_ID_PCH_CMP_I219_V10 0x0D4F +#define E1000_DEV_ID_PCH_CMP_I219_LM11 0x0D4C +#define E1000_DEV_ID_PCH_CMP_I219_V11 0x0D4D +#define E1000_DEV_ID_PCH_CMP_I219_LM12 0x0D53 +#define E1000_DEV_ID_PCH_CMP_I219_V12 0x0D55 +#define E1000_DEV_ID_PCH_TGP_I219_LM13 0x15FB +#define E1000_DEV_ID_PCH_TGP_I219_V13 0x15FC +#define E1000_DEV_ID_PCH_TGP_I219_LM14 0x15F9 +#define E1000_DEV_ID_PCH_TGP_I219_V14 0x15FA +#define E1000_DEV_ID_PCH_TGP_I219_LM15 0x15F4 #define E1000_DEV_ID_82575EB_PT 0x10A7 #define E1000_DEV_ID_82575EB_PF 0x10A9 #define E1000_DEV_ID_82575GB_QP 0x10D6 |