| Message ID | 20230107192513.118172-1-tim@linux4.de |
|---|---|
| State | Accepted |
| Commit | 40dc1929089fc844ea06d9f8bdb6211ed4517c2e |
| Headers | show |
| Series | thermal: intel: pch: Add support for Wellsburg PCH | expand |
On Sat, Jan 7, 2023 at 8:42 PM Tim Zimmermann <tim@linux4.de> wrote: > > This adds the PCI ID for the Wellsburg C610 series chipset PCH. The > driver can read the temperature from the Wellsburg PCH with only the PCI > ID added and no other modifications. > > Signed-off-by: Tim Zimmermann <tim@linux4.de> Rui, Srinivas, any objections to this one? > --- > drivers/thermal/intel/intel_pch_thermal.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/thermal/intel/intel_pch_thermal.c b/drivers/thermal/intel/intel_pch_thermal.c > index dabf11a687a1..9e27f430e034 100644 > --- a/drivers/thermal/intel/intel_pch_thermal.c > +++ b/drivers/thermal/intel/intel_pch_thermal.c > @@ -29,6 +29,7 @@ > #define PCH_THERMAL_DID_CNL_LP 0x02F9 /* CNL-LP PCH */ > #define PCH_THERMAL_DID_CML_H 0X06F9 /* CML-H PCH */ > #define PCH_THERMAL_DID_LWB 0xA1B1 /* Lewisburg PCH */ > +#define PCH_THERMAL_DID_WBG 0x8D24 /* Wellsburg PCH */ > > /* Wildcat Point-LP PCH Thermal registers */ > #define WPT_TEMP 0x0000 /* Temperature */ > @@ -350,6 +351,7 @@ enum board_ids { > board_cnl, > board_cml, > board_lwb, > + board_wbg, > }; > > static const struct board_info { > @@ -380,6 +382,10 @@ static const struct board_info { > .name = "pch_lewisburg", > .ops = &pch_dev_ops_wpt, > }, > + [board_wbg] = { > + .name = "pch_wellsburg", > + .ops = &pch_dev_ops_wpt, > + }, > }; > > static int intel_pch_thermal_probe(struct pci_dev *pdev, > @@ -495,6 +501,8 @@ static const struct pci_device_id intel_pch_thermal_id[] = { > .driver_data = board_cml, }, > { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_LWB), > .driver_data = board_lwb, }, > + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_WBG), > + .driver_data = board_wbg, }, > { 0, }, > }; > MODULE_DEVICE_TABLE(pci, intel_pch_thermal_id); > -- > 2.39.0 >
On Fri, 2023-01-20 at 17:40 +0100, Rafael J. Wysocki wrote: > On Sat, Jan 7, 2023 at 8:42 PM Tim Zimmermann <tim@linux4.de> wrote: > > > > This adds the PCI ID for the Wellsburg C610 series chipset PCH. The > > driver can read the temperature from the Wellsburg PCH with only > > the PCI > > ID added and no other modifications. > > > > Signed-off-by: Tim Zimmermann <tim@linux4.de> > > Rui, Srinivas, any objections to this one? No objection. Thanks, Srinivas > > > --- > > drivers/thermal/intel/intel_pch_thermal.c | 8 ++++++++ > > 1 file changed, 8 insertions(+) > > > > diff --git a/drivers/thermal/intel/intel_pch_thermal.c > > b/drivers/thermal/intel/intel_pch_thermal.c > > index dabf11a687a1..9e27f430e034 100644 > > --- a/drivers/thermal/intel/intel_pch_thermal.c > > +++ b/drivers/thermal/intel/intel_pch_thermal.c > > @@ -29,6 +29,7 @@ > > #define PCH_THERMAL_DID_CNL_LP 0x02F9 /* CNL-LP PCH */ > > #define PCH_THERMAL_DID_CML_H 0X06F9 /* CML-H PCH */ > > #define PCH_THERMAL_DID_LWB 0xA1B1 /* Lewisburg PCH */ > > +#define PCH_THERMAL_DID_WBG 0x8D24 /* Wellsburg PCH */ > > > > /* Wildcat Point-LP PCH Thermal registers */ > > #define WPT_TEMP 0x0000 /* Temperature */ > > @@ -350,6 +351,7 @@ enum board_ids { > > board_cnl, > > board_cml, > > board_lwb, > > + board_wbg, > > }; > > > > static const struct board_info { > > @@ -380,6 +382,10 @@ static const struct board_info { > > .name = "pch_lewisburg", > > .ops = &pch_dev_ops_wpt, > > }, > > + [board_wbg] = { > > + .name = "pch_wellsburg", > > + .ops = &pch_dev_ops_wpt, > > + }, > > }; > > > > static int intel_pch_thermal_probe(struct pci_dev *pdev, > > @@ -495,6 +501,8 @@ static const struct pci_device_id > > intel_pch_thermal_id[] = { > > .driver_data = board_cml, }, > > { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_LWB), > > .driver_data = board_lwb, }, > > + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_WBG), > > + .driver_data = board_wbg, }, > > { 0, }, > > }; > > MODULE_DEVICE_TABLE(pci, intel_pch_thermal_id); > > -- > > 2.39.0 > >
On Fri, 2023-01-20 at 09:50 -0800, srinivas pandruvada wrote: > On Fri, 2023-01-20 at 17:40 +0100, Rafael J. Wysocki wrote: > > On Sat, Jan 7, 2023 at 8:42 PM Tim Zimmermann <tim@linux4.de> > > wrote: > > > This adds the PCI ID for the Wellsburg C610 series chipset PCH. > > > The > > > driver can read the temperature from the Wellsburg PCH with only > > > the PCI > > > ID added and no other modifications. > > > > > > Signed-off-by: Tim Zimmermann <tim@linux4.de> > > > > Rui, Srinivas, any objections to this one? > No objection. > And no objections from me. thanks, rui > Thanks, > Srinivas > > > > --- > > > drivers/thermal/intel/intel_pch_thermal.c | 8 ++++++++ > > > 1 file changed, 8 insertions(+) > > > > > > diff --git a/drivers/thermal/intel/intel_pch_thermal.c > > > b/drivers/thermal/intel/intel_pch_thermal.c > > > index dabf11a687a1..9e27f430e034 100644 > > > --- a/drivers/thermal/intel/intel_pch_thermal.c > > > +++ b/drivers/thermal/intel/intel_pch_thermal.c > > > @@ -29,6 +29,7 @@ > > > #define PCH_THERMAL_DID_CNL_LP 0x02F9 /* CNL-LP PCH */ > > > #define PCH_THERMAL_DID_CML_H 0X06F9 /* CML-H PCH */ > > > #define PCH_THERMAL_DID_LWB 0xA1B1 /* Lewisburg PCH */ > > > +#define PCH_THERMAL_DID_WBG 0x8D24 /* Wellsburg PCH */ > > > > > > /* Wildcat Point-LP PCH Thermal registers */ > > > #define WPT_TEMP 0x0000 /* Temperature */ > > > @@ -350,6 +351,7 @@ enum board_ids { > > > board_cnl, > > > board_cml, > > > board_lwb, > > > + board_wbg, > > > }; > > > > > > static const struct board_info { > > > @@ -380,6 +382,10 @@ static const struct board_info { > > > .name = "pch_lewisburg", > > > .ops = &pch_dev_ops_wpt, > > > }, > > > + [board_wbg] = { > > > + .name = "pch_wellsburg", > > > + .ops = &pch_dev_ops_wpt, > > > + }, > > > }; > > > > > > static int intel_pch_thermal_probe(struct pci_dev *pdev, > > > @@ -495,6 +501,8 @@ static const struct pci_device_id > > > intel_pch_thermal_id[] = { > > > .driver_data = board_cml, }, > > > { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_LWB), > > > .driver_data = board_lwb, }, > > > + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_WBG), > > > + .driver_data = board_wbg, }, > > > { 0, }, > > > }; > > > MODULE_DEVICE_TABLE(pci, intel_pch_thermal_id); > > > -- > > > 2.39.0 > > >
On Sat, Jan 21, 2023 at 6:01 AM Zhang, Rui <rui.zhang@intel.com> wrote: > > On Fri, 2023-01-20 at 09:50 -0800, srinivas pandruvada wrote: > > On Fri, 2023-01-20 at 17:40 +0100, Rafael J. Wysocki wrote: > > > On Sat, Jan 7, 2023 at 8:42 PM Tim Zimmermann <tim@linux4.de> > > > wrote: > > > > This adds the PCI ID for the Wellsburg C610 series chipset PCH. > > > > The > > > > driver can read the temperature from the Wellsburg PCH with only > > > > the PCI > > > > ID added and no other modifications. > > > > > > > > Signed-off-by: Tim Zimmermann <tim@linux4.de> > > > > > > Rui, Srinivas, any objections to this one? > > No objection. > > > And no objections from me. OK Applied as 6.3 material, thanks!
diff --git a/drivers/thermal/intel/intel_pch_thermal.c b/drivers/thermal/intel/intel_pch_thermal.c index dabf11a687a1..9e27f430e034 100644 --- a/drivers/thermal/intel/intel_pch_thermal.c +++ b/drivers/thermal/intel/intel_pch_thermal.c @@ -29,6 +29,7 @@ #define PCH_THERMAL_DID_CNL_LP 0x02F9 /* CNL-LP PCH */ #define PCH_THERMAL_DID_CML_H 0X06F9 /* CML-H PCH */ #define PCH_THERMAL_DID_LWB 0xA1B1 /* Lewisburg PCH */ +#define PCH_THERMAL_DID_WBG 0x8D24 /* Wellsburg PCH */ /* Wildcat Point-LP PCH Thermal registers */ #define WPT_TEMP 0x0000 /* Temperature */ @@ -350,6 +351,7 @@ enum board_ids { board_cnl, board_cml, board_lwb, + board_wbg, }; static const struct board_info { @@ -380,6 +382,10 @@ static const struct board_info { .name = "pch_lewisburg", .ops = &pch_dev_ops_wpt, }, + [board_wbg] = { + .name = "pch_wellsburg", + .ops = &pch_dev_ops_wpt, + }, }; static int intel_pch_thermal_probe(struct pci_dev *pdev, @@ -495,6 +501,8 @@ static const struct pci_device_id intel_pch_thermal_id[] = { .driver_data = board_cml, }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_LWB), .driver_data = board_lwb, }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_WBG), + .driver_data = board_wbg, }, { 0, }, }; MODULE_DEVICE_TABLE(pci, intel_pch_thermal_id);
This adds the PCI ID for the Wellsburg C610 series chipset PCH. The driver can read the temperature from the Wellsburg PCH with only the PCI ID added and no other modifications. Signed-off-by: Tim Zimmermann <tim@linux4.de> --- drivers/thermal/intel/intel_pch_thermal.c | 8 ++++++++ 1 file changed, 8 insertions(+)