* [stable 4.4 0/2] missing mei device ids
@ 2017-08-23 6:30 Tomas Winkler
2017-08-23 6:30 ` [stable 4.4 1/2] mei: me: add broxton pci " Tomas Winkler
2017-08-23 6:30 ` [stable 4.4 2/2] mei: me: add lewisburg " Tomas Winkler
0 siblings, 2 replies; 4+ messages in thread
From: Tomas Winkler @ 2017-08-23 6:30 UTC (permalink / raw)
To: stable, Greg Kroah-Hartman; +Cc: linux-kernel, Alexander Usyskin, Tomas Winkler
Device ids that are missing in 4.4 stable
Tomas Winkler (2):
mei: me: add broxton pci device ids
mei: me: add lewisburg device ids
drivers/misc/mei/hw-me-regs.h | 8 ++++++++
drivers/misc/mei/pci-me.c | 4 ++++
2 files changed, 12 insertions(+)
--
2.9.5
^ permalink raw reply [flat|nested] 4+ messages in thread
* [stable 4.4 1/2] mei: me: add broxton pci device ids
2017-08-23 6:30 [stable 4.4 0/2] missing mei device ids Tomas Winkler
@ 2017-08-23 6:30 ` Tomas Winkler
2017-08-23 13:40 ` Greg Kroah-Hartman
2017-08-23 6:30 ` [stable 4.4 2/2] mei: me: add lewisburg " Tomas Winkler
1 sibling, 1 reply; 4+ messages in thread
From: Tomas Winkler @ 2017-08-23 6:30 UTC (permalink / raw)
To: stable, Greg Kroah-Hartman; +Cc: linux-kernel, Alexander Usyskin, Tomas Winkler
Add device ids for Broxton SoC based devices.
Cc: stable@kernel.com #4.4.x
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/misc/mei/hw-me-regs.h | 3 +++
drivers/misc/mei/pci-me.c | 3 +++
2 files changed, 6 insertions(+)
diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
index a2661381ddfc..21e5c6b652c5 100644
--- 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
*/
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index 01e20384ac44..9d7ed85f2744 100644
--- 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_pci_tbl[] = {
{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, }
};
--
2.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [stable 4.4 2/2] mei: me: add lewisburg device ids
2017-08-23 6:30 [stable 4.4 0/2] missing mei device ids Tomas Winkler
2017-08-23 6:30 ` [stable 4.4 1/2] mei: me: add broxton pci " Tomas Winkler
@ 2017-08-23 6:30 ` Tomas Winkler
1 sibling, 0 replies; 4+ messages in thread
From: Tomas Winkler @ 2017-08-23 6:30 UTC (permalink / raw)
To: stable, Greg Kroah-Hartman; +Cc: linux-kernel, Alexander Usyskin, Tomas Winkler
Add MEI Lewisburg PCH IDs for Purley based workstations.
Cc: <stable@vger.kernel.org> # 4.4.x
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/misc/mei/hw-me-regs.h | 5 +++++
drivers/misc/mei/pci-me.c | 1 +
2 files changed, 6 insertions(+)
diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
index 21e5c6b652c5..1d8b92aff107 100644
--- a/drivers/misc/mei/hw-me-regs.h
+++ b/drivers/misc/mei/hw-me-regs.h
@@ -122,6 +122,11 @@
#define MEI_DEV_ID_SPT_H 0xA13A /* Sunrise Point H */
#define MEI_DEV_ID_SPT_H_2 0xA13B /* Sunrise Point H 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 */
+
#define MEI_DEV_ID_KBP 0xA2BA /* Kaby Point */
#define MEI_DEV_ID_KBP_2 0xA2BB /* Kaby Point 2 */
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index 9d7ed85f2744..adab5bbb642a 100644
--- 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_pci_tbl[] = {
{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)},
--
2.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [stable 4.4 1/2] mei: me: add broxton pci device ids
2017-08-23 6:30 ` [stable 4.4 1/2] mei: me: add broxton pci " Tomas Winkler
@ 2017-08-23 13:40 ` Greg Kroah-Hartman
0 siblings, 0 replies; 4+ messages in thread
From: Greg Kroah-Hartman @ 2017-08-23 13:40 UTC (permalink / raw)
To: Tomas Winkler; +Cc: stable, linux-kernel, Alexander Usyskin
On Wed, Aug 23, 2017 at 09:30:28AM +0300, Tomas Winkler wrote:
> Add device ids for Broxton SoC based devices.
>
> Cc: stable@kernel.com #4.4.x
> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
> drivers/misc/mei/hw-me-regs.h | 3 +++
> drivers/misc/mei/pci-me.c | 3 +++
> 2 files changed, 6 insertions(+)
What is the git commit for this, and patch 2/2 in this series, that
describes these patches in Linus's tree?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-08-23 13:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-23 6:30 [stable 4.4 0/2] missing mei device ids Tomas Winkler
2017-08-23 6:30 ` [stable 4.4 1/2] mei: me: add broxton pci " Tomas Winkler
2017-08-23 13:40 ` Greg Kroah-Hartman
2017-08-23 6:30 ` [stable 4.4 2/2] mei: me: add lewisburg " Tomas Winkler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).