From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 30 Apr 2021 13:54:18 +0000 (+0200)
Subject: 5.10-stable patches
X-Git-Tag: v5.4.116~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7661beea18632c4f660e08b3cc6bf7db22395c87;p=thirdparty%2Fkernel%2Fstable-queue.git

5.10-stable patches

added patches:
	mei-me-add-alder-lake-p-device-id.patch
---

diff --git a/queue-5.10/mei-me-add-alder-lake-p-device-id.patch b/queue-5.10/mei-me-add-alder-lake-p-device-id.patch
new file mode 100644
index 00000000000..eb54166ae86
--- /dev/null
+++ b/queue-5.10/mei-me-add-alder-lake-p-device-id.patch
@@ -0,0 +1,40 @@
+From 0df74278faedf20f9696bf2755cf0ce34afa4c3a Mon Sep 17 00:00:00 2001
+From: Tomas Winkler <tomas.winkler@intel.com>
+Date: Wed, 14 Apr 2021 07:52:00 +0300
+Subject: mei: me: add Alder Lake P device id.
+
+From: Tomas Winkler <tomas.winkler@intel.com>
+
+commit 0df74278faedf20f9696bf2755cf0ce34afa4c3a upstream.
+
+Add Alder Lake P device ID.
+
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
+Link: https://lore.kernel.org/r/20210414045200.3498241-1-tomas.winkler@intel.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/misc/mei/hw-me-regs.h |    1 +
+ drivers/misc/mei/pci-me.c     |    1 +
+ 2 files changed, 2 insertions(+)
+
+--- a/drivers/misc/mei/hw-me-regs.h
++++ b/drivers/misc/mei/hw-me-regs.h
+@@ -105,6 +105,7 @@
+ 
+ #define MEI_DEV_ID_ADP_S      0x7AE8  /* Alder Lake Point S */
+ #define MEI_DEV_ID_ADP_LP     0x7A60  /* Alder Lake Point LP */
++#define MEI_DEV_ID_ADP_P      0x51E0  /* Alder Lake Point P */
+ 
+ /*
+  * MEI HW Section
+--- a/drivers/misc/mei/pci-me.c
++++ b/drivers/misc/mei/pci-me.c
+@@ -111,6 +111,7 @@ static const struct pci_device_id mei_me
+ 
+ 	{MEI_PCI_DEVICE(MEI_DEV_ID_ADP_S, MEI_ME_PCH15_CFG)},
+ 	{MEI_PCI_DEVICE(MEI_DEV_ID_ADP_LP, MEI_ME_PCH15_CFG)},
++	{MEI_PCI_DEVICE(MEI_DEV_ID_ADP_P, MEI_ME_PCH15_CFG)},
+ 
+ 	/* required last entry */
+ 	{0, }
diff --git a/queue-5.10/series b/queue-5.10/series
index b68ba8e0087..dec2cec3608 100644
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -1 +1,2 @@
 iwlwifi-fix-softirq-hardirq-disabling-in-iwl_pcie_gen2_enqueue_hcmd.patch
+mei-me-add-alder-lake-p-device-id.patch