linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [char-msic 1/3] mei: me: disable driver on SPT SPS firmware
@ 2016-11-29 12:44 Tomas Winkler
  2016-11-29 12:44 ` [char-msic 2/3] mei: me: fix place for kaby point device ids Tomas Winkler
                   ` (2 more replies)
  0 siblings, 3 replies; 17+ messages in thread
From: Tomas Winkler @ 2016-11-29 12:44 UTC (permalink / raw)
  To: stable, Greg Kroah-Hartman; +Cc: linux-kernel, Alexander Usyskin

commit 8c57cac1457f3125a5d13dc03635c0708c61bff0 upstream

Sunrise Point PCH with SPS Firmware doesn't expose working
MEI interface, we need to quirk it out.
The SPS Firmware is identifiable only on the first PCI function
of the device.

Cc: <stable@vger.kernel.org> #4.4
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/misc/mei/hw-me.c  | 10 ++++++++--
 drivers/misc/mei/pci-me.c |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c
index 25b1997a62cb..36333750c512 100644
--- a/drivers/misc/mei/hw-me.c
+++ b/drivers/misc/mei/hw-me.c
@@ -1258,8 +1258,14 @@ static bool mei_me_fw_type_nm(struct pci_dev *pdev)
 static bool mei_me_fw_type_sps(struct pci_dev *pdev)
 {
 	u32 reg;
-	/* Read ME FW Status check for SPS Firmware */
-	pci_read_config_dword(pdev, PCI_CFG_HFS_1, &reg);
+	unsigned int devfn;
+
+	/*
+	 * Read ME FW Status register to check for SPS Firmware
+	 * The SPS FW is only signaled in pci function 0
+	 */
+	devfn = PCI_DEVFN(PCI_SLOT(pdev->devfn), 0);
+	pci_bus_read_config_dword(pdev->bus, devfn, PCI_CFG_HFS_1, &reg);
 	/* if bits [19:16] = 15, running SPS Firmware */
 	return (reg & 0xf0000) == 0xf0000;
 }
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index 0af3d7d30419..01e20384ac44 100644
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -84,8 +84,8 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
 
 	{MEI_PCI_DEVICE(MEI_DEV_ID_SPT, mei_me_pch8_cfg)},
 	{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_2, mei_me_pch8_cfg)},
-	{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H, mei_me_pch8_cfg)},
-	{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H_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_KBP, mei_me_pch8_cfg)},
 	{MEI_PCI_DEVICE(MEI_DEV_ID_KBP_2, mei_me_pch8_cfg)},
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [char-msic 2/3] mei: me: fix place for kaby point device ids.
  2016-11-29 12:44 [char-msic 1/3] mei: me: disable driver on SPT SPS firmware Tomas Winkler
@ 2016-11-29 12:44 ` Tomas Winkler
  2016-11-29 19:15   ` Greg Kroah-Hartman
  2016-11-29 12:44 ` [char-msic 3/3] mei: fix return value on disconnection Tomas Winkler
  2016-11-29 19:14 ` [char-msic 1/3] mei: me: disable driver on SPT SPS firmware Greg Kroah-Hartman
  2 siblings, 1 reply; 17+ messages in thread
From: Tomas Winkler @ 2016-11-29 12:44 UTC (permalink / raw)
  To: stable, Greg Kroah-Hartman; +Cc: linux-kernel, Alexander Usyskin

This is fix of the backported patch only, it places
KBL DIDs on correct place to easy on backporting of
further DIDs.

Fixes: 5c99f32c461c ('mei: me: add kaby point device ids')
Cc: <stable@vger.kernel.org> #4.4
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
 drivers/misc/mei/hw-me-regs.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
index 4e8069866c85..a2661381ddfc 100644
--- a/drivers/misc/mei/hw-me-regs.h
+++ b/drivers/misc/mei/hw-me-regs.h
@@ -66,9 +66,6 @@
 #ifndef _MEI_HW_MEI_REGS_H_
 #define _MEI_HW_MEI_REGS_H_
 
-#define MEI_DEV_ID_KBP        0xA2BA  /* Kaby Point */
-#define MEI_DEV_ID_KBP_2      0xA2BB  /* Kaby Point 2 */
-
 /*
  * MEI device IDs
  */
@@ -124,6 +121,10 @@
 #define MEI_DEV_ID_SPT_2      0x9D3B  /* Sunrise Point 2 */
 #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_KBP        0xA2BA  /* Kaby Point */
+#define MEI_DEV_ID_KBP_2      0xA2BB  /* Kaby Point 2 */
+
 /*
  * MEI HW Section
  */
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [char-msic 3/3] mei: fix return value on disconnection
  2016-11-29 12:44 [char-msic 1/3] mei: me: disable driver on SPT SPS firmware Tomas Winkler
  2016-11-29 12:44 ` [char-msic 2/3] mei: me: fix place for kaby point device ids Tomas Winkler
@ 2016-11-29 12:44 ` Tomas Winkler
  2016-11-29 19:15   ` Greg Kroah-Hartman
  2016-11-29 19:14 ` [char-msic 1/3] mei: me: disable driver on SPT SPS firmware Greg Kroah-Hartman
  2 siblings, 1 reply; 17+ messages in thread
From: Tomas Winkler @ 2016-11-29 12:44 UTC (permalink / raw)
  To: stable, Greg Kroah-Hartman; +Cc: linux-kernel, Alexander Usyskin

commit 2d4d5481e2d6f93b25fcfb13a9f20bbfbf54266a upstream.

Correct errno on client disconnection is -ENODEV not -EBUSY

Cc: <stable@vger.kernel.org> #4.4
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/misc/mei/bus.c  | 2 +-
 drivers/misc/mei/main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c
index a77643954523..e59838231703 100644
--- a/drivers/misc/mei/bus.c
+++ b/drivers/misc/mei/bus.c
@@ -144,7 +144,7 @@ ssize_t __mei_cl_recv(struct mei_cl *cl, u8 *buf, size_t length)
 		mutex_lock(&bus->device_lock);
 
 		if (!mei_cl_is_connected(cl)) {
-			rets = -EBUSY;
+			rets = -ENODEV;
 			goto out;
 		}
 	}
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index 80f9afcb1382..4ef189a7a2fb 100644
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -207,7 +207,7 @@ static ssize_t mei_read(struct file *file, char __user *ubuf,
 
 		mutex_lock(&dev->device_lock);
 		if (!mei_cl_is_connected(cl)) {
-			rets = -EBUSY;
+			rets = -ENODEV;
 			goto out;
 		}
 	}
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 17+ messages in thread

* Re: [char-msic 1/3] mei: me: disable driver on SPT SPS firmware
  2016-11-29 12:44 [char-msic 1/3] mei: me: disable driver on SPT SPS firmware Tomas Winkler
  2016-11-29 12:44 ` [char-msic 2/3] mei: me: fix place for kaby point device ids Tomas Winkler
  2016-11-29 12:44 ` [char-msic 3/3] mei: fix return value on disconnection Tomas Winkler
@ 2016-11-29 19:14 ` Greg Kroah-Hartman
  2016-11-29 19:21   ` Winkler, Tomas
  2 siblings, 1 reply; 17+ messages in thread
From: Greg Kroah-Hartman @ 2016-11-29 19:14 UTC (permalink / raw)
  To: Tomas Winkler; +Cc: stable, linux-kernel, Alexander Usyskin

On Tue, Nov 29, 2016 at 02:44:44PM +0200, Tomas Winkler wrote:
> commit 8c57cac1457f3125a5d13dc03635c0708c61bff0 upstream
> 
> Sunrise Point PCH with SPS Firmware doesn't expose working
> MEI interface, we need to quirk it out.
> The SPS Firmware is identifiable only on the first PCI function
> of the device.
> 
> Cc: <stable@vger.kernel.org> #4.4
> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
>  drivers/misc/mei/hw-me.c  | 10 ++++++++--
>  drivers/misc/mei/pci-me.c |  4 ++--
>  2 files changed, 10 insertions(+), 4 deletions(-)

I don't understand what this is for, it's already in the 4.8-stable
tree.  And there you said it only needed to go to 4.6 and newer, yet you
are saying 4.4 here?  What am I supposed to do?

confused,

greg k-h

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [char-msic 2/3] mei: me: fix place for kaby point device ids.
  2016-11-29 12:44 ` [char-msic 2/3] mei: me: fix place for kaby point device ids Tomas Winkler
@ 2016-11-29 19:15   ` Greg Kroah-Hartman
  2016-11-29 20:13     ` Winkler, Tomas
  2016-11-29 20:24     ` Winkler, Tomas
  0 siblings, 2 replies; 17+ messages in thread
From: Greg Kroah-Hartman @ 2016-11-29 19:15 UTC (permalink / raw)
  To: Tomas Winkler; +Cc: stable, linux-kernel, Alexander Usyskin

On Tue, Nov 29, 2016 at 02:44:45PM +0200, Tomas Winkler wrote:
> This is fix of the backported patch only, it places
> KBL DIDs on correct place to easy on backporting of
> further DIDs.
> 
> Fixes: 5c99f32c461c ('mei: me: add kaby point device ids')
> Cc: <stable@vger.kernel.org> #4.4
> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> ---
>  drivers/misc/mei/hw-me-regs.h | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)

What did I mess up?  And what tree is this for?

Still confused,

greg k-h

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [char-msic 3/3] mei: fix return value on disconnection
  2016-11-29 12:44 ` [char-msic 3/3] mei: fix return value on disconnection Tomas Winkler
@ 2016-11-29 19:15   ` Greg Kroah-Hartman
  2016-11-29 20:15     ` Winkler, Tomas
  2016-11-29 20:16     ` Winkler, Tomas
  0 siblings, 2 replies; 17+ messages in thread
From: Greg Kroah-Hartman @ 2016-11-29 19:15 UTC (permalink / raw)
  To: Tomas Winkler; +Cc: stable, linux-kernel, Alexander Usyskin

On Tue, Nov 29, 2016 at 02:44:46PM +0200, Tomas Winkler wrote:
> commit 2d4d5481e2d6f93b25fcfb13a9f20bbfbf54266a upstream.
> 
> Correct errno on client disconnection is -ENODEV not -EBUSY
> 
> Cc: <stable@vger.kernel.org> #4.4
> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
>  drivers/misc/mei/bus.c  | 2 +-
>  drivers/misc/mei/main.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Again, what kernel tree?

greg k-h

^ permalink raw reply	[flat|nested] 17+ messages in thread

* RE: [char-msic 1/3] mei: me: disable driver on SPT SPS firmware
  2016-11-29 19:14 ` [char-msic 1/3] mei: me: disable driver on SPT SPS firmware Greg Kroah-Hartman
@ 2016-11-29 19:21   ` Winkler, Tomas
  2016-11-29 21:31     ` Greg Kroah-Hartman
  0 siblings, 1 reply; 17+ messages in thread
From: Winkler, Tomas @ 2016-11-29 19:21 UTC (permalink / raw)
  To: Greg Kroah-Hartman; +Cc: stable, linux-kernel, Usyskin, Alexander

> 
> On Tue, Nov 29, 2016 at 02:44:44PM +0200, Tomas Winkler wrote:
> > commit 8c57cac1457f3125a5d13dc03635c0708c61bff0 upstream
> >
> > Sunrise Point PCH with SPS Firmware doesn't expose working MEI
> > interface, we need to quirk it out.
> > The SPS Firmware is identifiable only on the first PCI function of the
> > device.
> >
> > Cc: <stable@vger.kernel.org> #4.4
> > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > ---
> >  drivers/misc/mei/hw-me.c  | 10 ++++++++--  drivers/misc/mei/pci-me.c
> > |  4 ++--
> >  2 files changed, 10 insertions(+), 4 deletions(-)
> 
> I don't understand what this is for, it's already in the 4.8-stable tree.  And there
> you said it only needed to go to 4.6 and newer, yet you are saying 4.4 here?
> What am I supposed to do?
> 

It's needed 4.4, but the original patch does apply cleanly only from 4.6 up, so this is the rebased version over 4.4. Since 4.4 is a long term kernel this is important.
I  see from time to time broken patches in stable,  mostly in 3.X series, so I prefer to do the back port myself. 

Thanks
Tomas

^ permalink raw reply	[flat|nested] 17+ messages in thread

* RE: [char-msic 2/3] mei: me: fix place for kaby point device ids.
  2016-11-29 19:15   ` Greg Kroah-Hartman
@ 2016-11-29 20:13     ` Winkler, Tomas
  2016-11-29 20:24     ` Winkler, Tomas
  1 sibling, 0 replies; 17+ messages in thread
From: Winkler, Tomas @ 2016-11-29 20:13 UTC (permalink / raw)
  To: Greg Kroah-Hartman; +Cc: stable, linux-kernel, Usyskin, Alexander


> 
> On Tue, Nov 29, 2016 at 02:44:45PM +0200, Tomas Winkler wrote:
> > This is fix of the backported patch only, it places KBL DIDs on
> > correct place to easy on backporting of further DIDs.
> >
> > Fixes: 5c99f32c461c ('mei: me: add kaby point device ids')
> > Cc: <stable@vger.kernel.org> #4.4
> > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> > ---
> >  drivers/misc/mei/hw-me-regs.h | 7 ++++---
> >  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> What did I mess up?  And what tree is this for?

> 
> Still confused,
>
This is for 4.4 stable, not sure where I broke the protocol but according  the stable rules 
> Cc: <stable@vger.kernel.org> #4.4 this should indicate the intention.

Thanks
Tomas 

^ permalink raw reply	[flat|nested] 17+ messages in thread

* RE: [char-msic 3/3] mei: fix return value on disconnection
  2016-11-29 19:15   ` Greg Kroah-Hartman
@ 2016-11-29 20:15     ` Winkler, Tomas
  2016-11-29 20:16     ` Winkler, Tomas
  1 sibling, 0 replies; 17+ messages in thread
From: Winkler, Tomas @ 2016-11-29 20:15 UTC (permalink / raw)
  To: Greg Kroah-Hartman; +Cc: stable, linux-kernel, Usyskin, Alexander



> -----Original Message-----
> From: Greg Kroah-Hartman [mailto:gregkh@linuxfoundation.org]
> Sent: Tuesday, November 29, 2016 21:15
> To: Winkler, Tomas <tomas.winkler@intel.com>
> Cc: stable@vger.kernel.org; linux-kernel@vger.kernel.org; Usyskin, Alexander
> <alexander.usyskin@intel.com>
> Subject: Re: [char-msic 3/3] mei: fix return value on disconnection
> 
> On Tue, Nov 29, 2016 at 02:44:46PM +0200, Tomas Winkler wrote:
> > commit 2d4d5481e2d6f93b25fcfb13a9f20bbfbf54266a upstream.
> >
> > Correct errno on client disconnection is -ENODEV not -EBUSY
> >
> > Cc: <stable@vger.kernel.org> #4.4
> > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> > Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > ---
> >  drivers/misc/mei/bus.c  | 2 +-
> >  drivers/misc/mei/main.c | 2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> Again, what kernel tree?

Stable 4.4 
Cc: <stable@vger.kernel.org> #4.4

Thanks
Tomas 

^ permalink raw reply	[flat|nested] 17+ messages in thread

* RE: [char-msic 3/3] mei: fix return value on disconnection
  2016-11-29 19:15   ` Greg Kroah-Hartman
  2016-11-29 20:15     ` Winkler, Tomas
@ 2016-11-29 20:16     ` Winkler, Tomas
  1 sibling, 0 replies; 17+ messages in thread
From: Winkler, Tomas @ 2016-11-29 20:16 UTC (permalink / raw)
  To: Greg Kroah-Hartman; +Cc: stable, linux-kernel, Usyskin, Alexander



> -----Original Message-----
> From: Greg Kroah-Hartman [mailto:gregkh@linuxfoundation.org]
> Sent: Tuesday, November 29, 2016 21:15
> To: Winkler, Tomas <tomas.winkler@intel.com>
> Cc: stable@vger.kernel.org; linux-kernel@vger.kernel.org; Usyskin, Alexander
> <alexander.usyskin@intel.com>
> Subject: Re: [char-msic 3/3] mei: fix return value on disconnection
> 
> On Tue, Nov 29, 2016 at 02:44:46PM +0200, Tomas Winkler wrote:
> > commit 2d4d5481e2d6f93b25fcfb13a9f20bbfbf54266a upstream.
> >
> > Correct errno on client disconnection is -ENODEV not -EBUSY
> >
> > Cc: <stable@vger.kernel.org> #4.4
> > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> > Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > ---
> >  drivers/misc/mei/bus.c  | 2 +-
> >  drivers/misc/mei/main.c | 2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> Again, what kernel tree?
Stable 4.4 
Cc: <stable@vger.kernel.org> #4.4


Thanks
Tomas

^ permalink raw reply	[flat|nested] 17+ messages in thread

* RE: [char-msic 2/3] mei: me: fix place for kaby point device ids.
  2016-11-29 19:15   ` Greg Kroah-Hartman
  2016-11-29 20:13     ` Winkler, Tomas
@ 2016-11-29 20:24     ` Winkler, Tomas
  2016-11-29 21:32       ` Greg Kroah-Hartman
  1 sibling, 1 reply; 17+ messages in thread
From: Winkler, Tomas @ 2016-11-29 20:24 UTC (permalink / raw)
  To: Greg Kroah-Hartman; +Cc: stable, linux-kernel, Usyskin, Alexander



> > On Tue, Nov 29, 2016 at 02:44:45PM +0200, Tomas Winkler wrote:
> > > This is fix of the backported patch only, it places KBL DIDs on
> > > correct place to easy on backporting of further DIDs.
> > >
> > > Fixes: 5c99f32c461c ('mei: me: add kaby point device ids')
> > > Cc: <stable@vger.kernel.org> #4.4
> > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> > > ---
> > >  drivers/misc/mei/hw-me-regs.h | 7 ++++---
> > >  1 file changed, 4 insertions(+), 3 deletions(-)
> >
> > What did I mess up? 

The KBL DIDs were moved to a different part of the file during back port, than in the original patch hence the consequent 
patches will not apply cleanly.

 And what tree is this for?
> 
> >
> > Still confused,
> >
> This is for 4.4 stable, not sure where I broke the protocol but according  the
> stable rules
> > Cc: <stable@vger.kernel.org> #4.4 this should indicate the intention.
> 
> Thanks
> Tomas
> 

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [char-msic 1/3] mei: me: disable driver on SPT SPS firmware
  2016-11-29 19:21   ` Winkler, Tomas
@ 2016-11-29 21:31     ` Greg Kroah-Hartman
  2016-11-29 21:41       ` Winkler, Tomas
  0 siblings, 1 reply; 17+ messages in thread
From: Greg Kroah-Hartman @ 2016-11-29 21:31 UTC (permalink / raw)
  To: Winkler, Tomas; +Cc: stable, linux-kernel, Usyskin, Alexander

On Tue, Nov 29, 2016 at 07:21:43PM +0000, Winkler, Tomas wrote:
> > 
> > On Tue, Nov 29, 2016 at 02:44:44PM +0200, Tomas Winkler wrote:
> > > commit 8c57cac1457f3125a5d13dc03635c0708c61bff0 upstream
> > >
> > > Sunrise Point PCH with SPS Firmware doesn't expose working MEI
> > > interface, we need to quirk it out.
> > > The SPS Firmware is identifiable only on the first PCI function of the
> > > device.
> > >
> > > Cc: <stable@vger.kernel.org> #4.4
> > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > > ---
> > >  drivers/misc/mei/hw-me.c  | 10 ++++++++--  drivers/misc/mei/pci-me.c
> > > |  4 ++--
> > >  2 files changed, 10 insertions(+), 4 deletions(-)
> > 
> > I don't understand what this is for, it's already in the 4.8-stable tree.  And there
> > you said it only needed to go to 4.6 and newer, yet you are saying 4.4 here?
> > What am I supposed to do?
> > 
> 
> It's needed 4.4, but the original patch does apply cleanly only from 4.6 up, so this is the rebased version over 4.4. Since 4.4 is a long term kernel this is important.
> I  see from time to time broken patches in stable,  mostly in 3.X series, so I prefer to do the back port myself. 

Ok, but your [char-misc] in the subject confused me.  Please make this a
bit more explicit next time.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [char-msic 2/3] mei: me: fix place for kaby point device ids.
  2016-11-29 20:24     ` Winkler, Tomas
@ 2016-11-29 21:32       ` Greg Kroah-Hartman
  2016-11-29 21:43         ` Winkler, Tomas
  0 siblings, 1 reply; 17+ messages in thread
From: Greg Kroah-Hartman @ 2016-11-29 21:32 UTC (permalink / raw)
  To: Winkler, Tomas; +Cc: stable, linux-kernel, Usyskin, Alexander

On Tue, Nov 29, 2016 at 08:24:08PM +0000, Winkler, Tomas wrote:
> 
> 
> > > On Tue, Nov 29, 2016 at 02:44:45PM +0200, Tomas Winkler wrote:
> > > > This is fix of the backported patch only, it places KBL DIDs on
> > > > correct place to easy on backporting of further DIDs.
> > > >
> > > > Fixes: 5c99f32c461c ('mei: me: add kaby point device ids')
> > > > Cc: <stable@vger.kernel.org> #4.4
> > > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> > > > ---
> > > >  drivers/misc/mei/hw-me-regs.h | 7 ++++---
> > > >  1 file changed, 4 insertions(+), 3 deletions(-)
> > >
> > > What did I mess up? 
> 
> The KBL DIDs were moved to a different part of the file during back port, than in the original patch hence the consequent 
> patches will not apply cleanly.

What patch caused the ids to be moved around?  The one previous to this
in this series, or some other patch that is already in the tree?

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 17+ messages in thread

* RE: [char-msic 1/3] mei: me: disable driver on SPT SPS firmware
  2016-11-29 21:31     ` Greg Kroah-Hartman
@ 2016-11-29 21:41       ` Winkler, Tomas
  2016-11-30  9:24         ` Greg Kroah-Hartman
  0 siblings, 1 reply; 17+ messages in thread
From: Winkler, Tomas @ 2016-11-29 21:41 UTC (permalink / raw)
  To: Greg Kroah-Hartman; +Cc: stable, linux-kernel, Usyskin, Alexander



> 
> On Tue, Nov 29, 2016 at 07:21:43PM +0000, Winkler, Tomas wrote:
> > >
> > > On Tue, Nov 29, 2016 at 02:44:44PM +0200, Tomas Winkler wrote:
> > > > commit 8c57cac1457f3125a5d13dc03635c0708c61bff0 upstream
> > > >
> > > > Sunrise Point PCH with SPS Firmware doesn't expose working MEI
> > > > interface, we need to quirk it out.
> > > > The SPS Firmware is identifiable only on the first PCI function of
> > > > the device.
> > > >
> > > > Cc: <stable@vger.kernel.org> #4.4
> > > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> > > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > > > ---
> > > >  drivers/misc/mei/hw-me.c  | 10 ++++++++--
> > > > drivers/misc/mei/pci-me.c
> > > > |  4 ++--
> > > >  2 files changed, 10 insertions(+), 4 deletions(-)
> > >
> > > I don't understand what this is for, it's already in the 4.8-stable
> > > tree.  And there you said it only needed to go to 4.6 and newer, yet you are
> saying 4.4 here?
> > > What am I supposed to do?
> > >
> >
> > It's needed 4.4, but the original patch does apply cleanly only from 4.6 up, so
> this is the rebased version over 4.4. Since 4.4 is a long term kernel this is
> important.
> > I  see from time to time broken patches in stable,  mostly in 3.X series, so I
> prefer to do the back port myself.
> 
> Ok, but your [char-misc] in the subject confused me.  Please make this a bit
> more explicit next time.

I see, it's automated in my scripts. Will [char-misc 4.4] or [stable 4.4] works for you?
 
Thanks
Tomas

^ permalink raw reply	[flat|nested] 17+ messages in thread

* RE: [char-msic 2/3] mei: me: fix place for kaby point device ids.
  2016-11-29 21:32       ` Greg Kroah-Hartman
@ 2016-11-29 21:43         ` Winkler, Tomas
  0 siblings, 0 replies; 17+ messages in thread
From: Winkler, Tomas @ 2016-11-29 21:43 UTC (permalink / raw)
  To: Greg Kroah-Hartman; +Cc: stable, linux-kernel, Usyskin, Alexander

> 
> On Tue, Nov 29, 2016 at 08:24:08PM +0000, Winkler, Tomas wrote:
> >
> >
> > > > On Tue, Nov 29, 2016 at 02:44:45PM +0200, Tomas Winkler wrote:
> > > > > This is fix of the backported patch only, it places KBL DIDs on
> > > > > correct place to easy on backporting of further DIDs.
> > > > >
> > > > > Fixes: 5c99f32c461c ('mei: me: add kaby point device ids')
> > > > > Cc: <stable@vger.kernel.org> #4.4
> > > > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> > > > > ---
> > > > >  drivers/misc/mei/hw-me-regs.h | 7 ++++---
> > > > >  1 file changed, 4 insertions(+), 3 deletions(-)
> > > >
> > > > What did I mess up?
> >
> > The KBL DIDs were moved to a different part of the file during back
> > port, than in the original patch hence the consequent patches will not apply
> cleanly.
> 
> What patch caused the ids to be moved around?  The one previous to this in
> this series, or some other patch that is already in the tree?

This patch "Fixes: 5c99f32c461c ('mei: me: add kaby point device ids')" 
Which is already in the tree.
 Thanks
Tomas

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [char-msic 1/3] mei: me: disable driver on SPT SPS firmware
  2016-11-29 21:41       ` Winkler, Tomas
@ 2016-11-30  9:24         ` Greg Kroah-Hartman
  2016-11-30  9:40           ` Winkler, Tomas
  0 siblings, 1 reply; 17+ messages in thread
From: Greg Kroah-Hartman @ 2016-11-30  9:24 UTC (permalink / raw)
  To: Winkler, Tomas; +Cc: stable, linux-kernel, Usyskin, Alexander

On Tue, Nov 29, 2016 at 09:41:41PM +0000, Winkler, Tomas wrote:
> 
> 
> > 
> > On Tue, Nov 29, 2016 at 07:21:43PM +0000, Winkler, Tomas wrote:
> > > >
> > > > On Tue, Nov 29, 2016 at 02:44:44PM +0200, Tomas Winkler wrote:
> > > > > commit 8c57cac1457f3125a5d13dc03635c0708c61bff0 upstream
> > > > >
> > > > > Sunrise Point PCH with SPS Firmware doesn't expose working MEI
> > > > > interface, we need to quirk it out.
> > > > > The SPS Firmware is identifiable only on the first PCI function of
> > > > > the device.
> > > > >
> > > > > Cc: <stable@vger.kernel.org> #4.4
> > > > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> > > > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > > > > ---
> > > > >  drivers/misc/mei/hw-me.c  | 10 ++++++++--
> > > > > drivers/misc/mei/pci-me.c
> > > > > |  4 ++--
> > > > >  2 files changed, 10 insertions(+), 4 deletions(-)
> > > >
> > > > I don't understand what this is for, it's already in the 4.8-stable
> > > > tree.  And there you said it only needed to go to 4.6 and newer, yet you are
> > saying 4.4 here?
> > > > What am I supposed to do?
> > > >
> > >
> > > It's needed 4.4, but the original patch does apply cleanly only from 4.6 up, so
> > this is the rebased version over 4.4. Since 4.4 is a long term kernel this is
> > important.
> > > I  see from time to time broken patches in stable,  mostly in 3.X series, so I
> > prefer to do the back port myself.
> > 
> > Ok, but your [char-misc] in the subject confused me.  Please make this a bit
> > more explicit next time.
> 
> I see, it's automated in my scripts. Will [char-misc 4.4] or [stable 4.4] works for you?

It's not that automated as it is misspelled in this series :)

Anyway, stable would make more sense, char-misc 4.4 does not mean
anything...

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 17+ messages in thread

* RE: [char-msic 1/3] mei: me: disable driver on SPT SPS firmware
  2016-11-30  9:24         ` Greg Kroah-Hartman
@ 2016-11-30  9:40           ` Winkler, Tomas
  0 siblings, 0 replies; 17+ messages in thread
From: Winkler, Tomas @ 2016-11-30  9:40 UTC (permalink / raw)
  To: Greg Kroah-Hartman; +Cc: stable, linux-kernel, Usyskin, Alexander


> 
> On Tue, Nov 29, 2016 at 09:41:41PM +0000, Winkler, Tomas wrote:
> >
> >
> > >
> > > On Tue, Nov 29, 2016 at 07:21:43PM +0000, Winkler, Tomas wrote:
> > > > >
> > > > > On Tue, Nov 29, 2016 at 02:44:44PM +0200, Tomas Winkler wrote:
> > > > > > commit 8c57cac1457f3125a5d13dc03635c0708c61bff0 upstream
> > > > > >
> > > > > > Sunrise Point PCH with SPS Firmware doesn't expose working MEI
> > > > > > interface, we need to quirk it out.
> > > > > > The SPS Firmware is identifiable only on the first PCI
> > > > > > function of the device.
> > > > > >
> > > > > > Cc: <stable@vger.kernel.org> #4.4
> > > > > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> > > > > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > > > > > ---
> > > > > >  drivers/misc/mei/hw-me.c  | 10 ++++++++--
> > > > > > drivers/misc/mei/pci-me.c
> > > > > > |  4 ++--
> > > > > >  2 files changed, 10 insertions(+), 4 deletions(-)
> > > > >
> > > > > I don't understand what this is for, it's already in the
> > > > > 4.8-stable tree.  And there you said it only needed to go to 4.6
> > > > > and newer, yet you are
> > > saying 4.4 here?
> > > > > What am I supposed to do?
> > > > >
> > > >
> > > > It's needed 4.4, but the original patch does apply cleanly only
> > > > from 4.6 up, so
> > > this is the rebased version over 4.4. Since 4.4 is a long term
> > > kernel this is important.
> > > > I  see from time to time broken patches in stable,  mostly in 3.X
> > > > series, so I
> > > prefer to do the back port myself.
> > >
> > > Ok, but your [char-misc] in the subject confused me.  Please make
> > > this a bit more explicit next time.
> >
> > I see, it's automated in my scripts. Will [char-misc 4.4] or [stable 4.4] works
> for you?
> 
> It's not that automated as it is misspelled in this series :)

Yes I know, the script is a bit dyslectic., AI is going too far :)
> 
> Anyway, stable would make more sense, char-misc 4.4 does not mean
> anything...

Okay, will skip to that, Maybe Documentation/stable_kernel_rules.txt need some updates,
 also not sure you followed the mail thread regarding the git send-email issue 
https://lkml.org/lkml/2016/11/24/836
Your input will be valued. 

Thanks
Tomas 

^ permalink raw reply	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2016-11-30  9:42 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-29 12:44 [char-msic 1/3] mei: me: disable driver on SPT SPS firmware Tomas Winkler
2016-11-29 12:44 ` [char-msic 2/3] mei: me: fix place for kaby point device ids Tomas Winkler
2016-11-29 19:15   ` Greg Kroah-Hartman
2016-11-29 20:13     ` Winkler, Tomas
2016-11-29 20:24     ` Winkler, Tomas
2016-11-29 21:32       ` Greg Kroah-Hartman
2016-11-29 21:43         ` Winkler, Tomas
2016-11-29 12:44 ` [char-msic 3/3] mei: fix return value on disconnection Tomas Winkler
2016-11-29 19:15   ` Greg Kroah-Hartman
2016-11-29 20:15     ` Winkler, Tomas
2016-11-29 20:16     ` Winkler, Tomas
2016-11-29 19:14 ` [char-msic 1/3] mei: me: disable driver on SPT SPS firmware Greg Kroah-Hartman
2016-11-29 19:21   ` Winkler, Tomas
2016-11-29 21:31     ` Greg Kroah-Hartman
2016-11-29 21:41       ` Winkler, Tomas
2016-11-30  9:24         ` Greg Kroah-Hartman
2016-11-30  9:40           ` Winkler, Tomas

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).