diff mbox series

[v11,24/42] mei: me: add ice lake point device ids

Message ID 1549487071-15343-25-git-send-email-ramalingam.c@intel.com (mailing list archive)
State New, archived
Headers show
Series drm/i915: Implement HDCP2.2 | expand

Commit Message

Ramalingam C Feb. 6, 2019, 9:04 p.m. UTC
From: Tomas Winkler <tomas.winkler@intel.com>

Add icelake device ids: ICP LP, N and H

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
 drivers/misc/mei/hw-me-regs.h | 4 ++++
 drivers/misc/mei/pci-me.c     | 4 ++++
 2 files changed, 8 insertions(+)

Comments

Winkler, Tomas Feb. 7, 2019, 7:16 a.m. UTC | #1
> 
> From: Tomas Winkler <tomas.winkler@intel.com>
> 
> Add icelake device ids: ICP LP, N and H
> 
> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
NACK, this goes via mei driver submission process.
Please drop it from the series. 

> ---
>  drivers/misc/mei/hw-me-regs.h | 4 ++++
>  drivers/misc/mei/pci-me.c     | 4 ++++
>  2 files changed, 8 insertions(+)
> 
> diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
> index 23739a60517f..086e557c2872 100644
> --- a/drivers/misc/mei/hw-me-regs.h
> +++ b/drivers/misc/mei/hw-me-regs.h
> @@ -139,6 +139,10 @@
>  #define MEI_DEV_ID_CNP_H      0xA360  /* Cannon Point H */
>  #define MEI_DEV_ID_CNP_H_4    0xA364  /* Cannon Point H 4 (iTouch) */
> 
> +#define MEI_DEV_ID_ICP_LP     0x34E0  /* Ice Lake Point LP */
> +#define MEI_DEV_ID_ICP_N      0x38E0  /* Ice Lake Point N */
> +#define MEI_DEV_ID_ICP_H      0x3DE0  /* Ice Lake Point H */
> +
>  /*
>   * MEI HW Section
>   */
> diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c index
> e89497f858ae..5ed5d28e6fe2 100644
> --- a/drivers/misc/mei/pci-me.c
> +++ b/drivers/misc/mei/pci-me.c
> @@ -105,6 +105,10 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
>  	{MEI_PCI_DEVICE(MEI_DEV_ID_CNP_H, MEI_ME_PCH12_CFG)},
>  	{MEI_PCI_DEVICE(MEI_DEV_ID_CNP_H_4, MEI_ME_PCH8_CFG)},
> 
> +	{MEI_PCI_DEVICE(MEI_DEV_ID_ICP_LP, MEI_ME_PCH12_CFG)},
> +	{MEI_PCI_DEVICE(MEI_DEV_ID_ICP_N, MEI_ME_PCH12_CFG)},
> +	{MEI_PCI_DEVICE(MEI_DEV_ID_ICP_H, MEI_ME_PCH12_CFG)},
> +
>  	/* required last entry */
>  	{0, }
>  };
> --
> 2.7.4
Ramalingam C Feb. 7, 2019, 7:22 a.m. UTC | #2
Sure. Intention was enabling the HDCP2.2 testing on CI for ICL. I will drop this patch, instead I will cherry-pick the one you have published for other branch.


Best Regards,
Ramalingam C


> -----Original Message-----
> From: Winkler, Tomas
> Sent: Thursday, February 7, 2019 12:47 PM
> To: C, Ramalingam <ramalingam.c@intel.com>; intel-gfx@lists.freedesktop.org;
> dri-devel@lists.freedesktop.org; daniel.vetter@ffwll.ch; Shankar, Uma
> <uma.shankar@intel.com>
> Subject: RE: [PATCH v11 24/42] mei: me: add ice lake point device ids
> 
> 
> >
> > From: Tomas Winkler <tomas.winkler@intel.com>
> >
> > Add icelake device ids: ICP LP, N and H
> >
> > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> NACK, this goes via mei driver submission process.
> Please drop it from the series.
> 
> > ---
> >  drivers/misc/mei/hw-me-regs.h | 4 ++++
> >  drivers/misc/mei/pci-me.c     | 4 ++++
> >  2 files changed, 8 insertions(+)
> >
> > diff --git a/drivers/misc/mei/hw-me-regs.h
> > b/drivers/misc/mei/hw-me-regs.h index 23739a60517f..086e557c2872
> > 100644
> > --- a/drivers/misc/mei/hw-me-regs.h
> > +++ b/drivers/misc/mei/hw-me-regs.h
> > @@ -139,6 +139,10 @@
> >  #define MEI_DEV_ID_CNP_H      0xA360  /* Cannon Point H */
> >  #define MEI_DEV_ID_CNP_H_4    0xA364  /* Cannon Point H 4 (iTouch) */
> >
> > +#define MEI_DEV_ID_ICP_LP     0x34E0  /* Ice Lake Point LP */
> > +#define MEI_DEV_ID_ICP_N      0x38E0  /* Ice Lake Point N */
> > +#define MEI_DEV_ID_ICP_H      0x3DE0  /* Ice Lake Point H */
> > +
> >  /*
> >   * MEI HW Section
> >   */
> > diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
> > index
> > e89497f858ae..5ed5d28e6fe2 100644
> > --- a/drivers/misc/mei/pci-me.c
> > +++ b/drivers/misc/mei/pci-me.c
> > @@ -105,6 +105,10 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
> >  	{MEI_PCI_DEVICE(MEI_DEV_ID_CNP_H, MEI_ME_PCH12_CFG)},
> >  	{MEI_PCI_DEVICE(MEI_DEV_ID_CNP_H_4, MEI_ME_PCH8_CFG)},
> >
> > +	{MEI_PCI_DEVICE(MEI_DEV_ID_ICP_LP, MEI_ME_PCH12_CFG)},
> > +	{MEI_PCI_DEVICE(MEI_DEV_ID_ICP_N, MEI_ME_PCH12_CFG)},
> > +	{MEI_PCI_DEVICE(MEI_DEV_ID_ICP_H, MEI_ME_PCH12_CFG)},
> > +
> >  	/* required last entry */
> >  	{0, }
> >  };
> > --
> > 2.7.4
Daniel Vetter Feb. 7, 2019, 7:48 a.m. UTC | #3
On Thu, Feb 07, 2019 at 07:22:37AM +0000, C, Ramalingam wrote:
> Sure. Intention was enabling the HDCP2.2 testing on CI for ICL. I will
> drop this patch, instead I will cherry-pick the one you have published
> for other branch.

We still need this for merging in some form, otherwise CI on our end can't
really test stuff. I think a topic branch with everything mei related
would be best.
> 
> 
> Best Regards,
> Ramalingam C
> 
> 
> > -----Original Message-----
> > From: Winkler, Tomas
> > Sent: Thursday, February 7, 2019 12:47 PM
> > To: C, Ramalingam <ramalingam.c@intel.com>; intel-gfx@lists.freedesktop.org;
> > dri-devel@lists.freedesktop.org; daniel.vetter@ffwll.ch; Shankar, Uma
> > <uma.shankar@intel.com>
> > Subject: RE: [PATCH v11 24/42] mei: me: add ice lake point device ids
> > 
> > 
> > >
> > > From: Tomas Winkler <tomas.winkler@intel.com>
> > >
> > > Add icelake device ids: ICP LP, N and H
> > >
> > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>

Aside from the actual discussion: When you send around a patch from
someone else, always add your own s-o-b line.
-Daniel

> > NACK, this goes via mei driver submission process.
> > Please drop it from the series.
> > 
> > > ---
> > >  drivers/misc/mei/hw-me-regs.h | 4 ++++
> > >  drivers/misc/mei/pci-me.c     | 4 ++++
> > >  2 files changed, 8 insertions(+)
> > >
> > > diff --git a/drivers/misc/mei/hw-me-regs.h
> > > b/drivers/misc/mei/hw-me-regs.h index 23739a60517f..086e557c2872
> > > 100644
> > > --- a/drivers/misc/mei/hw-me-regs.h
> > > +++ b/drivers/misc/mei/hw-me-regs.h
> > > @@ -139,6 +139,10 @@
> > >  #define MEI_DEV_ID_CNP_H      0xA360  /* Cannon Point H */
> > >  #define MEI_DEV_ID_CNP_H_4    0xA364  /* Cannon Point H 4 (iTouch) */
> > >
> > > +#define MEI_DEV_ID_ICP_LP     0x34E0  /* Ice Lake Point LP */
> > > +#define MEI_DEV_ID_ICP_N      0x38E0  /* Ice Lake Point N */
> > > +#define MEI_DEV_ID_ICP_H      0x3DE0  /* Ice Lake Point H */
> > > +
> > >  /*
> > >   * MEI HW Section
> > >   */
> > > diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
> > > index
> > > e89497f858ae..5ed5d28e6fe2 100644
> > > --- a/drivers/misc/mei/pci-me.c
> > > +++ b/drivers/misc/mei/pci-me.c
> > > @@ -105,6 +105,10 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
> > >  	{MEI_PCI_DEVICE(MEI_DEV_ID_CNP_H, MEI_ME_PCH12_CFG)},
> > >  	{MEI_PCI_DEVICE(MEI_DEV_ID_CNP_H_4, MEI_ME_PCH8_CFG)},
> > >
> > > +	{MEI_PCI_DEVICE(MEI_DEV_ID_ICP_LP, MEI_ME_PCH12_CFG)},
> > > +	{MEI_PCI_DEVICE(MEI_DEV_ID_ICP_N, MEI_ME_PCH12_CFG)},
> > > +	{MEI_PCI_DEVICE(MEI_DEV_ID_ICP_H, MEI_ME_PCH12_CFG)},
> > > +
> > >  	/* required last entry */
> > >  	{0, }
> > >  };
> > > --
> > > 2.7.4
>
diff mbox series

Patch

diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
index 23739a60517f..086e557c2872 100644
--- a/drivers/misc/mei/hw-me-regs.h
+++ b/drivers/misc/mei/hw-me-regs.h
@@ -139,6 +139,10 @@ 
 #define MEI_DEV_ID_CNP_H      0xA360  /* Cannon Point H */
 #define MEI_DEV_ID_CNP_H_4    0xA364  /* Cannon Point H 4 (iTouch) */
 
+#define MEI_DEV_ID_ICP_LP     0x34E0  /* Ice Lake Point LP */
+#define MEI_DEV_ID_ICP_N      0x38E0  /* Ice Lake Point N */
+#define MEI_DEV_ID_ICP_H      0x3DE0  /* Ice Lake Point H */
+
 /*
  * MEI HW Section
  */
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index e89497f858ae..5ed5d28e6fe2 100644
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -105,6 +105,10 @@  static const struct pci_device_id mei_me_pci_tbl[] = {
 	{MEI_PCI_DEVICE(MEI_DEV_ID_CNP_H, MEI_ME_PCH12_CFG)},
 	{MEI_PCI_DEVICE(MEI_DEV_ID_CNP_H_4, MEI_ME_PCH8_CFG)},
 
+	{MEI_PCI_DEVICE(MEI_DEV_ID_ICP_LP, MEI_ME_PCH12_CFG)},
+	{MEI_PCI_DEVICE(MEI_DEV_ID_ICP_N, MEI_ME_PCH12_CFG)},
+	{MEI_PCI_DEVICE(MEI_DEV_ID_ICP_H, MEI_ME_PCH12_CFG)},
+
 	/* required last entry */
 	{0, }
 };