]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.11-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 30 Apr 2021 13:54:34 +0000 (15:54 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 30 Apr 2021 13:54:34 +0000 (15:54 +0200)
added patches:
mei-me-add-alder-lake-p-device-id.patch

queue-5.11/mei-me-add-alder-lake-p-device-id.patch [new file with mode: 0644]
queue-5.11/series

diff --git a/queue-5.11/mei-me-add-alder-lake-p-device-id.patch b/queue-5.11/mei-me-add-alder-lake-p-device-id.patch
new file mode 100644 (file)
index 0000000..eb54166
--- /dev/null
@@ -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, }
index 8521fa6b3aee048d1ccaa2080f370cd81741bf8d..89f7dff9bf629604f50ab7a8a89fb43012a8f714 100644 (file)
@@ -1,2 +1,3 @@
 iwlwifi-fix-softirq-hardirq-disabling-in-iwl_pcie_gen2_enqueue_hcmd.patch
 drm-amd-display-update-modifier-list-for-gfx10_3.patch
+mei-me-add-alder-lake-p-device-id.patch