From: Greg Kroah-Hartman Date: Mon, 9 Dec 2013 08:51:02 +0000 (-0800) Subject: 3.12-stable patches X-Git-Tag: v3.4.74~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e3df87f681dcf6fc3b9f9aff32aeb5aa9a05db6f;p=thirdparty%2Fkernel%2Fstable-queue.git 3.12-stable patches added patches: mei-add-9-series-pch-mei-device-ids.patch mei-me-add-lynx-point-wellsburg-work-station-device-id.patch --- diff --git a/queue-3.12/mei-add-9-series-pch-mei-device-ids.patch b/queue-3.12/mei-add-9-series-pch-mei-device-ids.patch new file mode 100644 index 00000000000..e625d196524 --- /dev/null +++ b/queue-3.12/mei-add-9-series-pch-mei-device-ids.patch @@ -0,0 +1,51 @@ +From 76a9635979e543f04a5885198e68ff28e3311b67 Mon Sep 17 00:00:00 2001 +From: Tomas Winkler +Date: Thu, 5 Dec 2013 09:34:44 +0200 +Subject: mei: add 9 series PCH mei device ids + +From: Tomas Winkler + +commit 76a9635979e543f04a5885198e68ff28e3311b67 upstream. + +And Lynx Point H Refresh and Wildcat Point LP +device ids. + +Signed-off-by: Tomas Winkler +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/misc/mei/hw-me-regs.h | 5 ++++- + drivers/misc/mei/pci-me.c | 4 +++- + 2 files changed, 7 insertions(+), 2 deletions(-) + +--- a/drivers/misc/mei/hw-me-regs.h ++++ b/drivers/misc/mei/hw-me-regs.h +@@ -109,9 +109,12 @@ + #define MEI_DEV_ID_PPT_2 0x1CBA /* Panther Point */ + #define MEI_DEV_ID_PPT_3 0x1DBA /* Panther Point */ + +-#define MEI_DEV_ID_LPT 0x8C3A /* Lynx Point */ ++#define MEI_DEV_ID_LPT_H 0x8C3A /* Lynx Point H */ + #define MEI_DEV_ID_LPT_W 0x8D3A /* Lynx Point - Wellsburg */ + #define MEI_DEV_ID_LPT_LP 0x9C3A /* Lynx Point LP */ ++#define MEI_DEV_ID_LPT_HR 0x8CBA /* Lynx Point H Refresh */ ++ ++#define MEI_DEV_ID_WPT_LP 0x9CBA /* Wildcat Point LP */ + /* + * MEI HW Section + */ +--- a/drivers/misc/mei/pci-me.c ++++ b/drivers/misc/mei/pci-me.c +@@ -76,9 +76,11 @@ static DEFINE_PCI_DEVICE_TABLE(mei_me_pc + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_PPT_1)}, + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_PPT_2)}, + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_PPT_3)}, +- {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_LPT)}, ++ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_LPT_H)}, + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_LPT_W)}, + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_LPT_LP)}, ++ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_LPT_HR)}, ++ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_WPT_LP)}, + + /* required last entry */ + {0, } diff --git a/queue-3.12/mei-me-add-lynx-point-wellsburg-work-station-device-id.patch b/queue-3.12/mei-me-add-lynx-point-wellsburg-work-station-device-id.patch new file mode 100644 index 00000000000..bbe4d3434cd --- /dev/null +++ b/queue-3.12/mei-me-add-lynx-point-wellsburg-work-station-device-id.patch @@ -0,0 +1,39 @@ +From 838b3a6d62413b336f3dde15ecff161070358957 Mon Sep 17 00:00:00 2001 +From: Tomas Winkler +Date: Wed, 16 Oct 2013 12:09:43 +0300 +Subject: mei: me: add Lynx Point Wellsburg work station device id + +From: Tomas Winkler + +commit 838b3a6d62413b336f3dde15ecff161070358957 upstream. + +add missing device id for LPT based work station + +Signed-off-by: Tomas Winkler +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -110,6 +110,7 @@ + #define MEI_DEV_ID_PPT_3 0x1DBA /* Panther Point */ + + #define MEI_DEV_ID_LPT 0x8C3A /* Lynx Point */ ++#define MEI_DEV_ID_LPT_W 0x8D3A /* Lynx Point - Wellsburg */ + #define MEI_DEV_ID_LPT_LP 0x9C3A /* Lynx Point LP */ + /* + * MEI HW Section +--- a/drivers/misc/mei/pci-me.c ++++ b/drivers/misc/mei/pci-me.c +@@ -77,6 +77,7 @@ static DEFINE_PCI_DEVICE_TABLE(mei_me_pc + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_PPT_2)}, + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_PPT_3)}, + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_LPT)}, ++ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_LPT_W)}, + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_LPT_LP)}, + + /* required last entry */ diff --git a/queue-3.12/series b/queue-3.12/series index b236095f002..445cf0543cd 100644 --- a/queue-3.12/series +++ b/queue-3.12/series @@ -51,3 +51,5 @@ iwlwifi-dvm-don-t-override-mac80211-s-queue-setting.patch tg3-avoid-double-freeing-of-rx-data-memory.patch input-allow-deselecting-serio-drivers-even-without-config_expert.patch input-mousedev-allow-disabling-even-without-config_expert.patch +mei-me-add-lynx-point-wellsburg-work-station-device-id.patch +mei-add-9-series-pch-mei-device-ids.patch