From e708a401a5c3d480a4d5818a836ab8cefb837cfc Mon Sep 17 00:00:00 2001
From: David Shao <davshao@gmail.com>
Date: Tue, 18 Aug 2020 04:18:36 -0700
Subject: [PATCH] Additional Intel I219-LM and I219-V Ethernet PCI device
 numbers.

From NetBSD current sys/dev/pci/pcidevs.h,
verified on physical hardware for I219-V11 0x0D4D

Intel Ethernet I219-V and I219-LM additional
---
 sys/dev/netif/em/if_em.c         | 14 ++++++++++++++
 sys/dev/netif/emx/if_emx.c       | 14 ++++++++++++++
 sys/dev/netif/ig_hal/e1000_api.c | 14 ++++++++++++++
 sys/dev/netif/ig_hal/e1000_hw.h  | 14 ++++++++++++++
 4 files changed, 56 insertions(+)

diff --git a/sys/dev/netif/em/if_em.c b/sys/dev/netif/em/if_em.c
index e2819bd79e..28dd399158 100644
--- a/sys/dev/netif/em/if_em.c
+++ b/sys/dev/netif/em/if_em.c
@@ -255,6 +255,20 @@ static const struct em_vendor_info em_vendor_info_array[] = {
 	EM_EMX_DEVICE(PCH_CNP_I219_V6),
 	EM_EMX_DEVICE(PCH_CNP_I219_LM7),
 	EM_EMX_DEVICE(PCH_CNP_I219_V7),
+	EM_EMX_DEVICE(PCH_CNP_I219_LM8),
+	EM_EMX_DEVICE(PCH_CNP_I219_V8),
+	EM_EMX_DEVICE(PCH_CNP_I219_LM9),
+	EM_EMX_DEVICE(PCH_CNP_I219_V9),
+	EM_EMX_DEVICE(PCH_CNP_I219_LM10),
+	EM_EMX_DEVICE(PCH_CNP_I219_V10),
+	EM_EMX_DEVICE(PCH_CNP_I219_LM11),
+	EM_EMX_DEVICE(PCH_CNP_I219_V11),
+	EM_EMX_DEVICE(PCH_CNP_I219_LM12),
+	EM_EMX_DEVICE(PCH_CNP_I219_V12),
+	EM_EMX_DEVICE(PCH_CNP_I219_LM13),
+	EM_EMX_DEVICE(PCH_CNP_I219_V13),
+	EM_EMX_DEVICE(PCH_CNP_I219_LM14),
+	EM_EMX_DEVICE(PCH_CNP_I219_V14),
 
 	/* required last entry */
 	EM_DEVICE_NULL
diff --git a/sys/dev/netif/emx/if_emx.c b/sys/dev/netif/emx/if_emx.c
index 1fba978f10..4325e34720 100644
--- a/sys/dev/netif/emx/if_emx.c
+++ b/sys/dev/netif/emx/if_emx.c
@@ -184,6 +184,20 @@ static const struct emx_device {
 	EMX_DEVICE(PCH_CNP_I219_V6),
 	EMX_DEVICE(PCH_CNP_I219_LM7),
 	EMX_DEVICE(PCH_CNP_I219_V7),
+	EMX_DEVICE(PCH_CNP_I219_LM8),
+	EMX_DEVICE(PCH_CNP_I219_V8),
+	EMX_DEVICE(PCH_CNP_I219_LM9),
+	EMX_DEVICE(PCH_CNP_I219_V9),
+	EMX_DEVICE(PCH_CNP_I219_LM10),
+	EMX_DEVICE(PCH_CNP_I219_V10),
+	EMX_DEVICE(PCH_CNP_I219_LM11),
+	EMX_DEVICE(PCH_CNP_I219_V11),
+	EMX_DEVICE(PCH_CNP_I219_LM12),
+	EMX_DEVICE(PCH_CNP_I219_V12),
+	EMX_DEVICE(PCH_CNP_I219_LM13),
+	EMX_DEVICE(PCH_CNP_I219_V13),
+	EMX_DEVICE(PCH_CNP_I219_LM14),
+	EMX_DEVICE(PCH_CNP_I219_V14),
 
 	/* required last entry */
 	EMX_DEVICE_NULL
diff --git a/sys/dev/netif/ig_hal/e1000_api.c b/sys/dev/netif/ig_hal/e1000_api.c
index 2ddc3daabe..aea7a5451b 100644
--- a/sys/dev/netif/ig_hal/e1000_api.c
+++ b/sys/dev/netif/ig_hal/e1000_api.c
@@ -315,6 +315,20 @@ s32 e1000_set_mac_type(struct e1000_hw *hw)
 	case E1000_DEV_ID_PCH_CNP_I219_V6:
 	case E1000_DEV_ID_PCH_CNP_I219_LM7:
 	case E1000_DEV_ID_PCH_CNP_I219_V7:
+	case E1000_DEV_ID_PCH_CNP_I219_LM8:
+	case E1000_DEV_ID_PCH_CNP_I219_V8:
+	case E1000_DEV_ID_PCH_CNP_I219_LM9:
+	case E1000_DEV_ID_PCH_CNP_I219_V9:
+	case E1000_DEV_ID_PCH_CNP_I219_LM10:
+	case E1000_DEV_ID_PCH_CNP_I219_V10:
+	case E1000_DEV_ID_PCH_CNP_I219_LM11:
+	case E1000_DEV_ID_PCH_CNP_I219_V11:
+	case E1000_DEV_ID_PCH_CNP_I219_LM12:
+	case E1000_DEV_ID_PCH_CNP_I219_V12:
+	case E1000_DEV_ID_PCH_CNP_I219_LM13:
+	case E1000_DEV_ID_PCH_CNP_I219_V13:
+	case E1000_DEV_ID_PCH_CNP_I219_LM14:
+	case E1000_DEV_ID_PCH_CNP_I219_V14:
 		mac->type = e1000_pch_cnp;
 		break;
 	case E1000_DEV_ID_82575EB_COPPER:
diff --git a/sys/dev/netif/ig_hal/e1000_hw.h b/sys/dev/netif/ig_hal/e1000_hw.h
index b324e392e8..9d1708a132 100644
--- a/sys/dev/netif/ig_hal/e1000_hw.h
+++ b/sys/dev/netif/ig_hal/e1000_hw.h
@@ -151,6 +151,20 @@ struct e1000_hw;
 #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_CNP_I219_LM8		0x15DF
+#define E1000_DEV_ID_PCH_CNP_I219_V8		0x15E0
+#define E1000_DEV_ID_PCH_CNP_I219_LM9		0x15E1
+#define E1000_DEV_ID_PCH_CNP_I219_V9		0x15E2
+#define E1000_DEV_ID_PCH_CNP_I219_LM10		0x0D4E
+#define E1000_DEV_ID_PCH_CNP_I219_V10		0x0D4F
+#define E1000_DEV_ID_PCH_CNP_I219_LM11		0x0D4C
+#define E1000_DEV_ID_PCH_CNP_I219_V11		0x0D4D
+#define E1000_DEV_ID_PCH_CNP_I219_LM12		0x0D53
+#define E1000_DEV_ID_PCH_CNP_I219_V12		0x0D55
+#define E1000_DEV_ID_PCH_CNP_I219_LM13		0x15FB
+#define E1000_DEV_ID_PCH_CNP_I219_V13		0x15FC
+#define E1000_DEV_ID_PCH_CNP_I219_LM14		0x15F9
+#define E1000_DEV_ID_PCH_CNP_I219_V14		0x15FA
 #define E1000_DEV_ID_82576			0x10C9
 #define E1000_DEV_ID_82576_FIBER		0x10E6
 #define E1000_DEV_ID_82576_SERDES		0x10E7
-- 
2.27.0