Home Home > GIT Browse > SLE15
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-07-19 15:28:49 +0200
committerTakashi Iwai <tiwai@suse.de>2019-07-19 15:28:51 +0200
commit008cacf59c42a8a2e005ff7c243ca232010b1ba0 (patch)
tree4c6f4b4f8f8335fe052a9266f3f34db85fde45ca
parent66dee7e7f300492a79bcd21c0069a8ea8305486b (diff)
mei: me: add gemini lake devices id (bsc#1051510).
-rw-r--r--patches.drivers/mei-me-add-gemini-lake-devices-id.patch42
-rw-r--r--series.conf1
2 files changed, 43 insertions, 0 deletions
diff --git a/patches.drivers/mei-me-add-gemini-lake-devices-id.patch b/patches.drivers/mei-me-add-gemini-lake-devices-id.patch
new file mode 100644
index 0000000000..26bfea1fe7
--- /dev/null
+++ b/patches.drivers/mei-me-add-gemini-lake-devices-id.patch
@@ -0,0 +1,42 @@
+From 688cb67839e852740d22cf763e5eafb27d5a6e53 Mon Sep 17 00:00:00 2001
+From: Tomas Winkler <tomas.winkler@intel.com>
+Date: Sun, 24 Sep 2017 11:35:34 +0300
+Subject: [PATCH] mei: me: add gemini lake devices id
+Git-commit: 688cb67839e852740d22cf763e5eafb27d5a6e53
+Patch-mainline: v4.14-rc5
+References: bsc#1051510
+
+Add Gemini Lake (GLK) device id.
+
+Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
+Cc: stable <stable@vger.kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/misc/mei/hw-me-regs.h | 2 ++
+ drivers/misc/mei/pci-me.c | 2 ++
+ 2 files changed, 4 insertions(+)
+
+--- a/drivers/misc/mei/hw-me-regs.h
++++ b/drivers/misc/mei/hw-me-regs.h
+@@ -127,6 +127,8 @@
+ #define MEI_DEV_ID_BXT_M 0x1A9A /* Broxton M */
+ #define MEI_DEV_ID_APL_I 0x5A9A /* Apollo Lake I */
+
++#define MEI_DEV_ID_GLK 0x319A /* Gemini Lake */
++
+ #define MEI_DEV_ID_KBP 0xA2BA /* Kaby Point */
+ #define MEI_DEV_ID_KBP_2 0xA2BB /* Kaby Point 2 */
+
+--- a/drivers/misc/mei/pci-me.c
++++ b/drivers/misc/mei/pci-me.c
+@@ -92,6 +92,8 @@ static const struct pci_device_id mei_me
+ {MEI_PCI_DEVICE(MEI_DEV_ID_BXT_M, mei_me_pch8_cfg)},
+ {MEI_PCI_DEVICE(MEI_DEV_ID_APL_I, mei_me_pch8_cfg)},
+
++ {MEI_PCI_DEVICE(MEI_DEV_ID_GLK, mei_me_pch8_cfg)},
++
+ {MEI_PCI_DEVICE(MEI_DEV_ID_KBP, mei_me_pch8_cfg)},
+ {MEI_PCI_DEVICE(MEI_DEV_ID_KBP_2, mei_me_pch8_cfg)},
+
diff --git a/series.conf b/series.conf
index 879ad66f29..0946f3145f 100644
--- a/series.conf
+++ b/series.conf
@@ -7598,6 +7598,7 @@
patches.fixes/0001-USB-serial-console-fix-use-after-free-after-failed-s.patch
patches.fixes/0001-usb-renesas_usbhs-Fix-DMAC-sequence-for-receiving-ze.patch
patches.fixes/0001-usb-usbtest-fix-NULL-pointer-dereference.patch
+ patches.drivers/mei-me-add-gemini-lake-devices-id.patch
patches.suse/msft-hv-1507-Drivers-hv-vmbus-Fix-bugs-in-rescind-handling.patch
patches.drivers/media-dvb-i2c-transfers-over-usb-cannot-be-done-from
patches.drivers/media-s5p-cec-add-NACK-detection-support