[PATCH] Add PCI device IDs to e1000e driver for Comet Lake support (rhbz 1794369)

[Javier Martinez Canillas]

This is needed in F31 for the X1 Carbon 7th gen ethernet device to work.
---
 1000e-Add-support-for-Comet-Lake.patch | 54 ++++++++++++++++++++++++++
 kernel.spec                            |  7 ++++
 2 files changed, 61 insertions(+)
 create mode 100644 1000e-Add-support-for-Comet-Lake.patch

diff --git a/1000e-Add-support-for-Comet-Lake.patch
b/1000e-Add-support-for-Comet-Lake.patch
new file mode 100644
index 00000000000..6f4840bcbcd
--- /dev/null
+++ b/1000e-Add-support-for-Comet-Lake.patch
@@ -0,0 +1,54 @@
+From 914ee9c436cbe90c8ca8a46ec8433cb614a2ada5 Mon Sep 17 00:00:00 2001
+From: Sasha Neftin <sasha.neftin(a)intel.com&gt;
+Date: Thu, 10 Oct 2019 13:15:39 +0300
+Subject: [PATCH] e1000e: Add support for Comet Lake
+
+Add devices ID's for the next LOM generations that will be
+available on the next Intel Client platform (Comet Lake)
+This patch provides the initial support for these devices
+
+Signed-off-by: Sasha Neftin <sasha.neftin(a)intel.com&gt;
+Tested-by: Aaron Brown <aaron.f.brown(a)intel.com&gt;
+Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com&gt;
+---
+ drivers/net/ethernet/intel/e1000e/hw.h     | 6 ++++++
+ drivers/net/ethernet/intel/e1000e/netdev.c | 6 ++++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/drivers/net/ethernet/intel/e1000e/hw.h
b/drivers/net/ethernet/intel/e1000e/hw.h
+index eff75bd8a8f..11fdc27faa8 100644
+--- a/drivers/net/ethernet/intel/e1000e/hw.h
++++ b/drivers/net/ethernet/intel/e1000e/hw.h
+@@ -86,6 +86,12 @@ 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_CMP_I219_LM10		0x0D4E
++#define E1000_DEV_ID_PCH_CMP_I219_V10		0x0D4F
++#define E1000_DEV_ID_PCH_CMP_I219_LM11		0x0D4C
++#define E1000_DEV_ID_PCH_CMP_I219_V11		0x0D4D
++#define E1000_DEV_ID_PCH_CMP_I219_LM12		0x0D53
++#define E1000_DEV_ID_PCH_CMP_I219_V12		0x0D55
+ 
+ #define E1000_REVISION_4	4
+ 
+diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c
b/drivers/net/ethernet/intel/e1000e/netdev.c
+index 42f57ab8fb8..731e1b3e103 100644
+--- a/drivers/net/ethernet/intel/e1000e/netdev.c
++++ b/drivers/net/ethernet/intel/e1000e/netdev.c
+@@ -7749,6 +7749,12 @@ static const struct pci_device_id e1000_pci_tbl[] = {
+ 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ICP_I219_V8), board_pch_cnp },
+ 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ICP_I219_LM9), board_pch_cnp },
+ 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ICP_I219_V9), board_pch_cnp },
++	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CMP_I219_LM10), board_pch_cnp },
++	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CMP_I219_V10), board_pch_cnp },
++	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CMP_I219_LM11), board_pch_cnp },
++	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CMP_I219_V11), board_pch_cnp },
++	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CMP_I219_LM12), board_pch_spt },
++	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CMP_I219_V12), board_pch_spt },
+ 
+ 	{ 0, 0, 0, 0, 0, 0, 0 }	/* terminate list */
+ };
+-- 
+2.24.1
+
diff --git a/kernel.spec b/kernel.spec
index 68789704761..dc1ad80cd93 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -801,6 +801,10 @@ Patch503:
KEYS-Make-use-of-platform-keyring-for-module-signature.patch
 # https://lkml.org/lkml/2019/8/29/1772
 Patch504: ARM-fix-__get_user_check-in-case-uaccess_-calls-are-not-inlined.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1794369#c3
+# https://patchwork.ozlabs.org/patch/1174394/
+Patch506: 1000e-Add-support-for-Comet-Lake.patch
+
 # CVE-2019-19054 rhbz 1775063 1775117
 Patch523: media-rc-prevent-memory-leak-in-cx23888_ir_probe.patch
 
@@ -2520,6 +2524,9 @@ fi
 #
 #
 %changelog
+* Wed Jan 29 2020 Javier Martinez Canillas <javierm(a)redhat.com&gt;
+- Add PCI device IDs to e1000e driver for Comet Lake support (rhbz 1794369)
+
 * Mon Jan 27 2020 Jeremy Cline <jcline(a)redhat.com&gt; - 5.4.15-200
 - Linux v5.4.15
 
-- 
2.24.1