From 1fb8fd5d9f0e4326f662060cb8ad02c633b98d0b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 27 Aug 2017 09:25:02 +0200 Subject: [PATCH] 4.4-stable patches added patches: mei-me-add-broxton-pci-device-ids.patch mei-me-add-lewisburg-device-ids.patch --- .../mei-me-add-broxton-pci-device-ids.patch | 43 +++++++++++++++++++ .../mei-me-add-lewisburg-device-ids.patch | 41 ++++++++++++++++++ queue-4.4/series | 2 + 3 files changed, 86 insertions(+) create mode 100644 queue-4.4/mei-me-add-broxton-pci-device-ids.patch create mode 100644 queue-4.4/mei-me-add-lewisburg-device-ids.patch diff --git a/queue-4.4/mei-me-add-broxton-pci-device-ids.patch b/queue-4.4/mei-me-add-broxton-pci-device-ids.patch new file mode 100644 index 00000000000..ec23aa8d92d --- /dev/null +++ b/queue-4.4/mei-me-add-broxton-pci-device-ids.patch @@ -0,0 +1,43 @@ +From dd16f6cdeb4e02a728863d3cf99aaab352f0d761 Mon Sep 17 00:00:00 2001 +From: Tomas Winkler +Date: Mon, 29 Feb 2016 22:03:23 +0200 +Subject: mei: me: add broxton pci device ids + +From: Tomas Winkler + +commit dd16f6cdeb4e02a728863d3cf99aaab352f0d761 upstream. + +Add device ids for Broxton SoC based devices. + +Signed-off-by: Tomas Winkler +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/misc/mei/hw-me-regs.h | 3 +++ + drivers/misc/mei/pci-me.c | 3 +++ + 2 files changed, 6 insertions(+) + +--- a/drivers/misc/mei/hw-me-regs.h ++++ b/drivers/misc/mei/hw-me-regs.h +@@ -125,6 +125,9 @@ + #define MEI_DEV_ID_KBP 0xA2BA /* Kaby Point */ + #define MEI_DEV_ID_KBP_2 0xA2BB /* Kaby Point 2 */ + ++#define MEI_DEV_ID_BXT_M 0x1A9A /* Broxton M */ ++#define MEI_DEV_ID_APL_I 0x5A9A /* Apollo Lake I */ ++ + /* + * MEI HW Section + */ +--- a/drivers/misc/mei/pci-me.c ++++ b/drivers/misc/mei/pci-me.c +@@ -90,6 +90,9 @@ static const struct pci_device_id mei_me + {MEI_PCI_DEVICE(MEI_DEV_ID_KBP, mei_me_pch8_cfg)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_KBP_2, mei_me_pch8_cfg)}, + ++ {MEI_PCI_DEVICE(MEI_DEV_ID_BXT_M, mei_me_pch8_cfg)}, ++ {MEI_PCI_DEVICE(MEI_DEV_ID_APL_I, mei_me_pch8_cfg)}, ++ + /* required last entry */ + {0, } + }; diff --git a/queue-4.4/mei-me-add-lewisburg-device-ids.patch b/queue-4.4/mei-me-add-lewisburg-device-ids.patch new file mode 100644 index 00000000000..e46d3e73407 --- /dev/null +++ b/queue-4.4/mei-me-add-lewisburg-device-ids.patch @@ -0,0 +1,41 @@ +From 9ff2007bea1f1bfc53ac0bc7ccf8200bb275fd52 Mon Sep 17 00:00:00 2001 +From: Tomas Winkler +Date: Tue, 29 Nov 2016 16:49:27 +0200 +Subject: mei: me: add lewisburg device ids + +From: Tomas Winkler + +commit 9ff2007bea1f1bfc53ac0bc7ccf8200bb275fd52 upstream. + +Add MEI Lewisburg PCH IDs for Purley based workstations. + +Signed-off-by: Alexander Usyskin +Signed-off-by: Tomas Winkler +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/misc/mei/hw-me-regs.h | 2 ++ + drivers/misc/mei/pci-me.c | 1 + + 2 files changed, 3 insertions(+) + +--- a/drivers/misc/mei/hw-me-regs.h ++++ b/drivers/misc/mei/hw-me-regs.h +@@ -125,6 +125,8 @@ + #define MEI_DEV_ID_KBP 0xA2BA /* Kaby Point */ + #define MEI_DEV_ID_KBP_2 0xA2BB /* Kaby Point 2 */ + ++#define MEI_DEV_ID_LBG 0xA1BA /* Lewisburg (SPT) */ ++ + #define MEI_DEV_ID_BXT_M 0x1A9A /* Broxton M */ + #define MEI_DEV_ID_APL_I 0x5A9A /* Apollo Lake I */ + +--- a/drivers/misc/mei/pci-me.c ++++ b/drivers/misc/mei/pci-me.c +@@ -86,6 +86,7 @@ static const struct pci_device_id mei_me + {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_2, mei_me_pch8_cfg)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H, mei_me_pch8_sps_cfg)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H_2, mei_me_pch8_sps_cfg)}, ++ {MEI_PCI_DEVICE(MEI_DEV_ID_LBG, 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/queue-4.4/series b/queue-4.4/series index 75a52e6f878..dd867d47fef 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -12,3 +12,5 @@ tcp-when-rearming-rto-if-rto-time-is-in-past-then-fire-rto-asap.patch irda-do-not-leak-initialized-list.dev-to-userspace.patch net-sched-fix-null-pointer-dereference-when-action-calls-some-targets.patch net_sched-fix-order-of-queue-length-updates-in-qdisc_replace.patch +mei-me-add-broxton-pci-device-ids.patch +mei-me-add-lewisburg-device-ids.patch -- 2.47.3