diff options
| author |   jsg <jsg@openbsd.org> | 2017-03-19 11:09:26 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2017-03-19 11:09:26 +0000 |
| commit | cce8e8a9e8ed4c3633b6583cae3edbc85f068ad3 (patch) | |
| tree | 8c00a71fbbbc6754b2cd559d44a11d9b84994dc8 /sys | |
| parent | Put the address of the per-cpu clock and interrupt registers into the cpu_info (diff) | |
| download | wireguard-openbsd-cce8e8a9e8ed4c3633b6583cae3edbc85f068ad3.tar.xz wireguard-openbsd-cce8e8a9e8ed4c3633b6583cae3edbc85f068ad3.zip | |
Match the Kaby Lake and Lewisburg (Skylake-EP PCH) MACs with I219 PHYs.
Expanded version of a diff from claudio@ who tested on x270 ok kettenis@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/if_em.c | 9 | ||||
| -rw-r--r-- | sys/dev/pci/if_em_hw.c | 7 | ||||
| -rw-r--r-- | sys/dev/pci/if_em_hw.h | 7 |
3 files changed, 19 insertions, 4 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index 8676731af77..a6a3a510618 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.334 2017/01/24 03:57:35 dlg Exp $ */ +/* $OpenBSD: if_em.c,v 1.335 2017/03/19 11:09:26 jsg Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include <dev/pci/if_em.h> @@ -146,9 +146,14 @@ const struct pci_matchid em_devices[] = { { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I218_V_2 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I218_V_3 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM2 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM3 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM4 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM5 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V2 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V4 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V5 }, { 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 f7ed46d796f..d108555a812 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.92 2016/08/23 04:04:23 jsg Exp $ */ +/* $OpenBSD: if_em_hw.c,v 1.93 2017/03/19 11:09:26 jsg Exp $ */ /* * if_em_hw.c Shared functions for accessing and configuring the MAC */ @@ -615,6 +615,11 @@ em_set_mac_type(struct em_hw *hw) case E1000_DEV_ID_PCH_SPT_I219_V: case E1000_DEV_ID_PCH_SPT_I219_LM2: case E1000_DEV_ID_PCH_SPT_I219_V2: + case E1000_DEV_ID_PCH_LBG_I219_LM3: + case E1000_DEV_ID_PCH_SPT_I219_LM4: + case E1000_DEV_ID_PCH_SPT_I219_V4: + case E1000_DEV_ID_PCH_SPT_I219_LM5: + case E1000_DEV_ID_PCH_SPT_I219_V5: hw->mac_type = em_pch_spt; 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 8e5cc529e7f..655f5c264a7 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.68 2016/02/18 14:24:39 bluhm Exp $ */ +/* $OpenBSD: if_em_hw.h,v 1.69 2017/03/19 11:09:26 jsg Exp $ */ /* $FreeBSD: if_em_hw.h,v 1.15 2005/05/26 23:32:02 tackerman Exp $ */ /* if_em_hw.h @@ -559,6 +559,11 @@ int32_t em_check_phy_reset_block(struct em_hw *hw); #define E1000_DEV_ID_PCH_SPT_I219_V 0x1570 #define E1000_DEV_ID_PCH_SPT_I219_LM2 0x15B7 #define E1000_DEV_ID_PCH_SPT_I219_V2 0x15B8 +#define E1000_DEV_ID_PCH_LBG_I219_LM3 0x15B9 +#define E1000_DEV_ID_PCH_SPT_I219_LM4 0x15D7 +#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_82575EB_PT 0x10A7 #define E1000_DEV_ID_82575EB_PF 0x10A9 #define E1000_DEV_ID_82575GB_QP 0x10D6 |