From: jsg <jsg@openbsd.org>
Date: Sun, 3 Dec 2023 00:19:25 +0000 (+0000)
Subject: match Lunar Lake, Raptor Lake and Arrow Lake
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=51d4bfee906aab4f17dc6af57a87d15a8a1581e8;p=openbsd

match Lunar Lake, Raptor Lake and Arrow Lake
---

diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c
index fbe46ae6a20..f31ff133610 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.367 2023/11/10 15:51:20 bluhm Exp $ */
+/* $OpenBSD: if_em.c,v 1.368 2023/12/03 00:19:25 jsg Exp $ */
 /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */
 
 #include <dev/pci/if_em.h>
@@ -168,6 +168,11 @@ const struct pci_matchid em_devices[] = {
 	{ 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_LM20 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM21 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM22 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM23 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM24 },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V2 },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V4 },
@@ -186,6 +191,11 @@ const struct pci_matchid em_devices[] = {
 	{ 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_I219_V20 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V21 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V22 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V23 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V24 },
 	{ 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 5cd58ebf1eb..481ea9513b7 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.118 2023/09/05 13:06:42 naddy Exp $ */
+/* $OpenBSD: if_em_hw.c,v 1.119 2023/12/03 00:19:25 jsg Exp $ */
 /*
  * if_em_hw.c Shared functions for accessing and configuring the MAC
  */
@@ -660,11 +660,23 @@ em_set_mac_type(struct em_hw *hw)
 	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_RPL_I219_LM22:
+	case E1000_DEV_ID_PCH_RPL_I219_V22:
+	case E1000_DEV_ID_PCH_RPL_I219_LM23:
+	case E1000_DEV_ID_PCH_RPL_I219_V23:
+		hw->mac_type = em_pch_adp;
+		break;
 	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_adp;
+	case E1000_DEV_ID_PCH_LNP_I219_LM20:
+	case E1000_DEV_ID_PCH_LNP_I219_V20:
+	case E1000_DEV_ID_PCH_LNP_I219_LM21:
+	case E1000_DEV_ID_PCH_LNP_I219_V21:
+	case E1000_DEV_ID_PCH_ARL_I219_LM24:
+	case E1000_DEV_ID_PCH_ARL_I219_V24:
+		hw->mac_type = em_pch_adp;	/* pch_mtp */
 		break;
 	case E1000_DEV_ID_EP80579_LAN_1:
 		hw->mac_type = em_icp_xxxx;
diff --git a/sys/dev/pci/if_em_hw.h b/sys/dev/pci/if_em_hw.h
index 0b9f548d6b5..340be410f35 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.89 2023/09/05 13:06:43 naddy Exp $ */
+/* $OpenBSD: if_em_hw.h,v 1.90 2023/12/03 00:19:25 jsg Exp $ */
 /* $FreeBSD: if_em_hw.h,v 1.15 2005/05/26 23:32:02 tackerman Exp $ */
 
 /* if_em_hw.h
@@ -605,6 +605,16 @@ uint32_t em_translate_82542_register(uint32_t);
 #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_PCH_LNP_I219_LM20   0x550E
+#define E1000_DEV_ID_PCH_LNP_I219_V20    0x550F
+#define E1000_DEV_ID_PCH_LNP_I219_LM21   0x5510
+#define E1000_DEV_ID_PCH_LNP_I219_V21    0x5511
+#define E1000_DEV_ID_PCH_RPL_I219_LM22   0x0DC7
+#define E1000_DEV_ID_PCH_RPL_I219_V22    0x0DC8
+#define E1000_DEV_ID_PCH_RPL_I219_LM23   0x0DC5
+#define E1000_DEV_ID_PCH_RPL_I219_V23    0x0DC6
+#define E1000_DEV_ID_PCH_ARL_I219_LM24   0x57A0
+#define E1000_DEV_ID_PCH_ARL_I219_V24    0x57A1
 #define E1000_DEV_ID_82575EB_PT          0x10A7
 #define E1000_DEV_ID_82575EB_PF          0x10A9
 #define E1000_DEV_ID_82575GB_QP          0x10D6