Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-02-15 10:23:48 +0100
committerJiri Slaby <jslaby@suse.cz>2019-02-15 10:23:59 +0100
commit6a7a608063f419ead2fc5c674cb8edcca71cfcde (patch)
treeabdbdcf9f5a21e77dcd56a41b70c3fe4779368d0
parent381c2eaffcb4915e2bf67c2cf21ccb4d7121a929 (diff)
mei: me: add ice lake point device id (bnc#1012628).
-rw-r--r--patches.kernel.org/4.20.9-015-mei-me-add-ice-lake-point-device-id.patch49
-rw-r--r--series.conf1
2 files changed, 50 insertions, 0 deletions
diff --git a/patches.kernel.org/4.20.9-015-mei-me-add-ice-lake-point-device-id.patch b/patches.kernel.org/4.20.9-015-mei-me-add-ice-lake-point-device-id.patch
new file mode 100644
index 0000000000..99833152a9
--- /dev/null
+++ b/patches.kernel.org/4.20.9-015-mei-me-add-ice-lake-point-device-id.patch
@@ -0,0 +1,49 @@
+From: Tomas Winkler <tomas.winkler@intel.com>
+Date: Thu, 24 Jan 2019 14:45:02 +0200
+Subject: [PATCH] mei: me: add ice lake point device id.
+References: bnc#1012628
+Patch-mainline: 4.20.9
+Git-commit: efe814e90b98aed6d655b5a4092b9114b8b26e42
+
+commit efe814e90b98aed6d655b5a4092b9114b8b26e42 upstream.
+
+Add icelake mei device id.
+
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ drivers/misc/mei/hw-me-regs.h | 2 ++
+ drivers/misc/mei/pci-me.c | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
+index 23739a60517f..bb1ee9834a02 100644
+--- a/drivers/misc/mei/hw-me-regs.h
++++ b/drivers/misc/mei/hw-me-regs.h
+@@ -139,6 +139,8 @@
+ #define MEI_DEV_ID_CNP_H 0xA360 /* Cannon Point H */
+ #define MEI_DEV_ID_CNP_H_4 0xA364 /* Cannon Point H 4 (iTouch) */
+
++#define MEI_DEV_ID_ICP_LP 0x34E0 /* Ice Lake Point LP */
++
+ /*
+ * MEI HW Section
+ */
+diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
+index c8e21c894a5f..4299658d48d6 100644
+--- a/drivers/misc/mei/pci-me.c
++++ b/drivers/misc/mei/pci-me.c
+@@ -105,6 +105,8 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
+ {MEI_PCI_DEVICE(MEI_DEV_ID_CNP_H, MEI_ME_PCH8_CFG)},
+ {MEI_PCI_DEVICE(MEI_DEV_ID_CNP_H_4, MEI_ME_PCH8_CFG)},
+
++ {MEI_PCI_DEVICE(MEI_DEV_ID_ICP_LP, MEI_ME_PCH12_CFG)},
++
+ /* required last entry */
+ {0, }
+ };
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index 783e698ff8..69c4570a29 100644
--- a/series.conf
+++ b/series.conf
@@ -1097,6 +1097,7 @@
patches.kernel.org/4.20.9-012-signal-Better-detection-of-synchronous-signals.patch
patches.kernel.org/4.20.9-013-misc-vexpress-Off-by-one-in-vexpress_syscfg_ex.patch
patches.kernel.org/4.20.9-014-cfg80211-call-disconnect_wk-when-AP-stops.patch
+ patches.kernel.org/4.20.9-015-mei-me-add-ice-lake-point-device-id.patch
########################################################
# Build fixes that apply to the vanilla kernel too.