svn commit: r357488 - stable/12/sys/dev/e1000

[George V. Neville-Neil]

Author: gnn
Date: Tue Feb  4 03:31:28 2020
New Revision: 357488
URL: https://svnweb.freebsd.org/changeset/base/357488

Log:
  MFC 356913
  
  Add support for latest Intel I219 device, supported in Lenovo Carbon X1 v7

Modified:
  stable/12/sys/dev/e1000/e1000_api.c
  stable/12/sys/dev/e1000/e1000_hw.h
  stable/12/sys/dev/e1000/if_em.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/e1000/e1000_api.c
==============================================================================
--- stable/12/sys/dev/e1000/e1000_api.c	Tue Feb  4 02:44:52 2020	(r357487)
+++ stable/12/sys/dev/e1000/e1000_api.c	Tue Feb  4 03:31:28 2020	(r357488)
@@ -319,6 +319,7 @@ s32 e1000_set_mac_type(struct e1000_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_ICP_I219_V10:
 		mac->type = e1000_pch_cnp;
 		break;
 	case E1000_DEV_ID_82575EB_COPPER:

Modified: stable/12/sys/dev/e1000/e1000_hw.h
==============================================================================
--- stable/12/sys/dev/e1000/e1000_hw.h	Tue Feb  4 02:44:52 2020	(r357487)
+++ stable/12/sys/dev/e1000/e1000_hw.h	Tue Feb  4 03:31:28 2020	(r357488)
@@ -155,6 +155,7 @@ struct e1000_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_ICP_I219_V10		0x0D4F
 #define E1000_DEV_ID_82576			0x10C9
 #define E1000_DEV_ID_82576_FIBER		0x10E6
 #define E1000_DEV_ID_82576_SERDES		0x10E7

Modified: stable/12/sys/dev/e1000/if_em.c
==============================================================================
--- stable/12/sys/dev/e1000/if_em.c	Tue Feb  4 02:44:52 2020	(r357487)
+++ stable/12/sys/dev/e1000/if_em.c	Tue Feb  4 03:31:28 2020	(r357488)
@@ -174,6 +174,7 @@ static pci_vendor_info_t em_vendor_info_array[] =
 	PVID(0x8086, E1000_DEV_ID_PCH_ICP_I219_V8, "Intel(R) PRO/1000 Network Connection"),
 	PVID(0x8086, E1000_DEV_ID_PCH_ICP_I219_LM9, "Intel(R) PRO/1000 Network Connection"),
 	PVID(0x8086, E1000_DEV_ID_PCH_ICP_I219_V9, "Intel(R) PRO/1000 Network Connection"),
+	PVID(0x8086, E1000_DEV_ID_PCH_ICP_I219_V10, "Intel(R) PRO/1000 Network Connection"),
 	/* required last entry */
 	PVID_END
 };