Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1532206 > unrolled thread

[char-msic 2/3] mei: me: fix place for kaby point device ids.

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [char-msic 2/3] mei: me: fix place for kaby point device ids. Tomas Winkler <tomas.winkler@intel.com> - 2016-11-29 12:50 +0100
    Re: [char-msic 2/3] mei: me: fix place for kaby point device ids. Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-29 20:20 +0100
      RE: [char-msic 2/3] mei: me: fix place for kaby point device ids. "Winkler, Tomas" <tomas.winkler@intel.com> - 2016-11-29 21:20 +0100
      RE: [char-msic 2/3] mei: me: fix place for kaby point device ids. "Winkler, Tomas" <tomas.winkler@intel.com> - 2016-11-29 21:30 +0100
        Re: [char-msic 2/3] mei: me: fix place for kaby point device ids. Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-29 22:40 +0100
          RE: [char-msic 2/3] mei: me: fix place for kaby point device ids. "Winkler, Tomas" <tomas.winkler@intel.com> - 2016-11-29 22:50 +0100

#1532206 — [char-msic 2/3] mei: me: fix place for kaby point device ids.

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

[toc] | [next] | [standalone]

#1532691

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

[toc] | [prev] | [next] | [standalone]

#1532736

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

[toc] | [prev] | [next] | [standalone]

#1532743

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

[toc] | [prev] | [next] | [standalone]

#1532792

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

[toc] | [prev] | [next] | [standalone]

#1532798

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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web