linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/3] thermal: Support for Coffee Lake and Cannon Lake
@ 2017-10-19 21:51 Srinivas Pandruvada
  2017-10-19 21:51 ` [PATCH 1/3] thermal: int340x: processor_thermal: Add Cannon Lake support Srinivas Pandruvada
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Srinivas Pandruvada @ 2017-10-19 21:51 UTC (permalink / raw)
  To: rui.zhang, edubezval; +Cc: linux-pm, linux-kernel, Srinivas Pandruvada

Added support for PCH and processor thermal device.

Srinivas Pandruvada (3):
  thermal: int340x: processor_thermal: Add Cannon Lake support
  thermal: int340x: processor_thermal: Add Coffee Lake support
  thermal: pch: Add Cannon Lake support

 drivers/thermal/int340x_thermal/processor_thermal_device.c |  5 +++++
 drivers/thermal/intel_pch_thermal.c                        | 11 +++++++++++
 2 files changed, 16 insertions(+)

-- 
2.7.5

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

* [PATCH 1/3] thermal: int340x: processor_thermal: Add Cannon Lake support
  2017-10-19 21:51 [PATCH 0/3] thermal: Support for Coffee Lake and Cannon Lake Srinivas Pandruvada
@ 2017-10-19 21:51 ` Srinivas Pandruvada
  2017-10-19 21:51 ` [PATCH 2/3] thermal: int340x: processor_thermal: Add Coffee " Srinivas Pandruvada
  2017-10-19 21:51 ` [PATCH 3/3] thermal: pch: Add Cannon " Srinivas Pandruvada
  2 siblings, 0 replies; 6+ messages in thread
From: Srinivas Pandruvada @ 2017-10-19 21:51 UTC (permalink / raw)
  To: rui.zhang, edubezval; +Cc: linux-pm, linux-kernel, Srinivas Pandruvada

Added PCI-ID of Cannon Lake thermal device.

Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
---
 drivers/thermal/int340x_thermal/processor_thermal_device.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/thermal/int340x_thermal/processor_thermal_device.c b/drivers/thermal/int340x_thermal/processor_thermal_device.c
index f02341f..e724a23 100644
--- a/drivers/thermal/int340x_thermal/processor_thermal_device.c
+++ b/drivers/thermal/int340x_thermal/processor_thermal_device.c
@@ -30,6 +30,9 @@
 /* Skylake thermal reporting device */
 #define PCI_DEVICE_ID_PROC_SKL_THERMAL	0x1903
 
+/* CannonLake thermal reporting device */
+#define PCI_DEVICE_ID_PROC_CNL_THERMAL	0x5a03
+
 /* Braswell thermal reporting device */
 #define PCI_DEVICE_ID_PROC_BSW_THERMAL	0x22DC
 
@@ -461,6 +464,7 @@ static const struct pci_device_id proc_thermal_pci_ids[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PROC_BXT1_THERMAL)},
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PROC_BXTX_THERMAL)},
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PROC_BXTP_THERMAL)},
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PROC_CNL_THERMAL)},
 	{ 0, },
 };
 
-- 
2.7.5

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

* [PATCH 2/3] thermal: int340x: processor_thermal: Add Coffee Lake support
  2017-10-19 21:51 [PATCH 0/3] thermal: Support for Coffee Lake and Cannon Lake Srinivas Pandruvada
  2017-10-19 21:51 ` [PATCH 1/3] thermal: int340x: processor_thermal: Add Cannon Lake support Srinivas Pandruvada
@ 2017-10-19 21:51 ` Srinivas Pandruvada
  2017-11-01  3:33   ` Zhang Rui
  2017-10-19 21:51 ` [PATCH 3/3] thermal: pch: Add Cannon " Srinivas Pandruvada
  2 siblings, 1 reply; 6+ messages in thread
From: Srinivas Pandruvada @ 2017-10-19 21:51 UTC (permalink / raw)
  To: rui.zhang, edubezval; +Cc: linux-pm, linux-kernel, Srinivas Pandruvada

Add new PCI id for Coffee lake processor thermal device.

Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
---
 drivers/thermal/int340x_thermal/processor_thermal_device.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/thermal/int340x_thermal/processor_thermal_device.c b/drivers/thermal/int340x_thermal/processor_thermal_device.c
index e724a23..1d9f524 100644
--- a/drivers/thermal/int340x_thermal/processor_thermal_device.c
+++ b/drivers/thermal/int340x_thermal/processor_thermal_device.c
@@ -32,6 +32,7 @@
 
 /* CannonLake thermal reporting device */
 #define PCI_DEVICE_ID_PROC_CNL_THERMAL	0x5a03
+#define PCI_DEVICE_ID_PROC_CFL_THERMAL	0x3E83
 
 /* Braswell thermal reporting device */
 #define PCI_DEVICE_ID_PROC_BSW_THERMAL	0x22DC
-- 
2.7.5

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

* [PATCH 3/3] thermal: pch: Add Cannon Lake support
  2017-10-19 21:51 [PATCH 0/3] thermal: Support for Coffee Lake and Cannon Lake Srinivas Pandruvada
  2017-10-19 21:51 ` [PATCH 1/3] thermal: int340x: processor_thermal: Add Cannon Lake support Srinivas Pandruvada
  2017-10-19 21:51 ` [PATCH 2/3] thermal: int340x: processor_thermal: Add Coffee " Srinivas Pandruvada
@ 2017-10-19 21:51 ` Srinivas Pandruvada
  2 siblings, 0 replies; 6+ messages in thread
From: Srinivas Pandruvada @ 2017-10-19 21:51 UTC (permalink / raw)
  To: rui.zhang, edubezval; +Cc: linux-pm, linux-kernel, Srinivas Pandruvada

Added Cannon Lake PCH ids.

Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
---
 drivers/thermal/intel_pch_thermal.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/thermal/intel_pch_thermal.c b/drivers/thermal/intel_pch_thermal.c
index c60b1cf..8a7f69b 100644
--- a/drivers/thermal/intel_pch_thermal.c
+++ b/drivers/thermal/intel_pch_thermal.c
@@ -30,6 +30,8 @@
 #define PCH_THERMAL_DID_WPT	0x9CA4 /* Wildcat Point */
 #define PCH_THERMAL_DID_SKL	0x9D31 /* Skylake PCH */
 #define PCH_THERMAL_DID_SKL_H	0xA131 /* Skylake PCH 100 series */
+#define PCH_THERMAL_DID_CNL	0x9Df9 /* CNL PCH */
+#define PCH_THERMAL_DID_CNL_H	0xA379 /* CNL-H PCH */
 
 /* Wildcat Point-LP  PCH Thermal registers */
 #define WPT_TEMP	0x0000	/* Temperature */
@@ -278,6 +280,7 @@ enum board_ids {
 	board_hsw,
 	board_wpt,
 	board_skl,
+	board_cnl,
 };
 
 static const struct board_info {
@@ -296,6 +299,10 @@ static const struct board_info {
 		.name = "pch_skylake",
 		.ops = &pch_dev_ops_wpt,
 	},
+	[board_cnl] = {
+		.name = "pch_cannonlake",
+		.ops = &pch_dev_ops_wpt,
+	},
 };
 
 static int intel_pch_thermal_probe(struct pci_dev *pdev,
@@ -398,6 +405,10 @@ static const struct pci_device_id intel_pch_thermal_id[] = {
 		.driver_data = board_skl, },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_SKL_H),
 		.driver_data = board_skl, },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_CNL),
+		.driver_data = board_cnl, },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_CNL_H),
+		.driver_data = board_cnl, },
 	{ 0, },
 };
 MODULE_DEVICE_TABLE(pci, intel_pch_thermal_id);
-- 
2.7.5

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

* Re: [PATCH 2/3] thermal: int340x: processor_thermal: Add Coffee Lake support
  2017-10-19 21:51 ` [PATCH 2/3] thermal: int340x: processor_thermal: Add Coffee " Srinivas Pandruvada
@ 2017-11-01  3:33   ` Zhang Rui
  2017-11-01 16:38     ` Srinivas Pandruvada
  0 siblings, 1 reply; 6+ messages in thread
From: Zhang Rui @ 2017-11-01  3:33 UTC (permalink / raw)
  To: Srinivas Pandruvada, edubezval; +Cc: linux-pm, linux-kernel

On Thu, 2017-10-19 at 14:51 -0700, Srinivas Pandruvada wrote:
> Add new PCI id for Coffee lake processor thermal device.
> 
> Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.c
> om>
> ---
>  drivers/thermal/int340x_thermal/processor_thermal_device.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git
> a/drivers/thermal/int340x_thermal/processor_thermal_device.c
> b/drivers/thermal/int340x_thermal/processor_thermal_device.c
> index e724a23..1d9f524 100644
> --- a/drivers/thermal/int340x_thermal/processor_thermal_device.c
> +++ b/drivers/thermal/int340x_thermal/processor_thermal_device.c
> @@ -32,6 +32,7 @@
>  
>  /* CannonLake thermal reporting device */
>  #define PCI_DEVICE_ID_PROC_CNL_THERMAL	0x5a03
> +#define PCI_DEVICE_ID_PROC_CFL_THERMAL	0x3E83
>  
shouldn't it be added into proc_thermal_pci_ids[]?

thanks,
rui
>  /* Braswell thermal reporting device */
>  #define PCI_DEVICE_ID_PROC_BSW_THERMAL	0x22DC

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

* Re: [PATCH 2/3] thermal: int340x: processor_thermal: Add Coffee Lake support
  2017-11-01  3:33   ` Zhang Rui
@ 2017-11-01 16:38     ` Srinivas Pandruvada
  0 siblings, 0 replies; 6+ messages in thread
From: Srinivas Pandruvada @ 2017-11-01 16:38 UTC (permalink / raw)
  To: Zhang Rui, edubezval; +Cc: linux-pm, linux-kernel

On Wed, 2017-11-01 at 11:33 +0800, Zhang Rui wrote:
> On Thu, 2017-10-19 at 14:51 -0700, Srinivas Pandruvada wrote:
> > Add new PCI id for Coffee lake processor thermal device.
> > 
> > Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel
> > .c
> > om>
> > ---
> >  drivers/thermal/int340x_thermal/processor_thermal_device.c | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git
> > a/drivers/thermal/int340x_thermal/processor_thermal_device.c
> > b/drivers/thermal/int340x_thermal/processor_thermal_device.c
> > index e724a23..1d9f524 100644
> > --- a/drivers/thermal/int340x_thermal/processor_thermal_device.c
> > +++ b/drivers/thermal/int340x_thermal/processor_thermal_device.c
> > @@ -32,6 +32,7 @@
> >  
> >  /* CannonLake thermal reporting device */
> >  #define PCI_DEVICE_ID_PROC_CNL_THERMAL	0x5a03
> > +#define PCI_DEVICE_ID_PROC_CFL_THERMAL	0x3E83
> >  
> 
> shouldn't it be added into proc_thermal_pci_ids[]?
Yes. Lost during rebase.
Thanks for finding. I am sending whole series again.

-Srinivas

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

end of thread, other threads:[~2017-11-01 16:38 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-19 21:51 [PATCH 0/3] thermal: Support for Coffee Lake and Cannon Lake Srinivas Pandruvada
2017-10-19 21:51 ` [PATCH 1/3] thermal: int340x: processor_thermal: Add Cannon Lake support Srinivas Pandruvada
2017-10-19 21:51 ` [PATCH 2/3] thermal: int340x: processor_thermal: Add Coffee " Srinivas Pandruvada
2017-11-01  3:33   ` Zhang Rui
2017-11-01 16:38     ` Srinivas Pandruvada
2017-10-19 21:51 ` [PATCH 3/3] thermal: pch: Add Cannon " Srinivas Pandruvada

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