From 0b249e2164be2385bc6a5e82814435649b2b06e0 Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Sun, 24 Jan 2021 10:21:43 +0000
Subject: [PATCH] match on Intel Alder Lake and Meteor Lake I219 Ethernet ids

---
 sys/dev/pci/if_em.c    | 11 ++++++++++-
 sys/dev/pci/if_em_hw.c | 11 ++++++++++-
 sys/dev/pci/if_em_hw.h | 11 ++++++++++-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c
index 12ebff467a3..759da7a3ba3 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.357 2020/12/12 11:48:53 jan Exp $ */
+/* $OpenBSD: if_em.c,v 1.358 2021/01/24 10:21:43 jsg Exp $ */
 /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */
 
 #include <dev/pci/if_em.h>
@@ -162,6 +162,10 @@ const struct pci_matchid em_devices[] = {
 	{ 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_LM16 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM17 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM18 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM19 },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V2 },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V4 },
@@ -175,6 +179,11 @@ const struct pci_matchid em_devices[] = {
 	{ 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_I219_V15 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V16 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V17 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V18 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V19 },
 	{ 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 f0bef80cdf3..34202c596db 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.109 2020/07/13 10:35:55 dlg Exp $ */
+/* $OpenBSD: if_em_hw.c,v 1.110 2021/01/24 10:21:43 jsg Exp $ */
 /*
  * if_em_hw.c Shared functions for accessing and configuring the MAC
  */
@@ -651,6 +651,15 @@ em_set_mac_type(struct em_hw *hw)
 	case E1000_DEV_ID_PCH_TGP_I219_LM14:
 	case E1000_DEV_ID_PCH_TGP_I219_V14:
 	case E1000_DEV_ID_PCH_TGP_I219_LM15:
+	case E1000_DEV_ID_PCH_TGP_I219_V15:
+	case E1000_DEV_ID_PCH_ADP_I219_LM16:
+	case E1000_DEV_ID_PCH_ADP_I219_V16:
+	case E1000_DEV_ID_PCH_ADP_I219_LM17:
+	case E1000_DEV_ID_PCH_ADP_I219_V17:
+	case E1000_DEV_ID_PCH_MTP_I219_LM18:
+	case E1000_DEV_ID_PCH_MTP_I219_V18:
+	case E1000_DEV_ID_PCH_MTP_I219_LM19:
+	case E1000_DEV_ID_PCH_MTP_I219_V19:
 		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 cfba7341f57..443889fd01b 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.83 2020/07/13 10:35:55 dlg Exp $ */
+/* $OpenBSD: if_em_hw.h,v 1.84 2021/01/24 10:21:43 jsg Exp $ */
 /* $FreeBSD: if_em_hw.h,v 1.15 2005/05/26 23:32:02 tackerman Exp $ */
 
 /* if_em_hw.h
@@ -589,6 +589,15 @@ uint32_t em_translate_82542_register(uint32_t);
 #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_PCH_TGP_I219_V15    0x15F5
+#define E1000_DEV_ID_PCH_ADP_I219_LM16   0x1A1E
+#define E1000_DEV_ID_PCH_ADP_I219_V16    0x1A1F
+#define E1000_DEV_ID_PCH_ADP_I219_LM17   0x1A1C
+#define E1000_DEV_ID_PCH_ADP_I219_V17    0x1A1D
+#define E1000_DEV_ID_PCH_MTP_I219_LM18   0x550A
+#define E1000_DEV_ID_PCH_MTP_I219_V18    0x550B
+#define E1000_DEV_ID_PCH_MTP_I219_LM19   0x550C
+#define E1000_DEV_ID_PCH_MTP_I219_V19    0x550D
 #define E1000_DEV_ID_82575EB_PT          0x10A7
 #define E1000_DEV_ID_82575EB_PF          0x10A9
 #define E1000_DEV_ID_82575GB_QP          0x10D6
-- 
2.20.1