2022-01-15 01:02:57

by Srinivas Pandruvada

Subject: [PATCH 0/3] DPTF IDs for Raptor Lake

Add ACPI and PCI device ids for Raptor Lake DPTF support.

Srinivas Pandruvada (3):
ACPI: DPTF: Support Raptor Lake
thermal: int340x: Support Raptor Lake
thermal: int340x: Add Raptor Lake PCI device id

drivers/acpi/dptf/dptf_pch_fivr.c | 1 +
drivers/acpi/dptf/dptf_power.c | 2 ++
drivers/acpi/dptf/int340x_thermal.c | 6 ++++++
drivers/acpi/fan.h | 1 +
drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 1 +
drivers/thermal/intel/int340x_thermal/int3403_thermal.c | 1 +
.../intel/int340x_thermal/processor_thermal_device.h | 1 +
.../intel/int340x_thermal/processor_thermal_device_pci.c | 1 +
8 files changed, 14 insertions(+)

--
2.34.1

2022-01-15 01:05:08

by Srinivas Pandruvada

Subject: [PATCH 1/3] ACPI: DPTF: Support Raptor Lake

Add Raptor Lake ACPI IDs for DPTF devices.

Signed-off-by: Srinivas Pandruvada <[email protected]>
---
drivers/acpi/dptf/dptf_pch_fivr.c | 1 +
drivers/acpi/dptf/dptf_power.c | 2 ++
drivers/acpi/dptf/int340x_thermal.c | 6 ++++++
drivers/acpi/fan.h | 1 +
4 files changed, 10 insertions(+)

diff --git a/drivers/acpi/dptf/dptf_pch_fivr.c b/drivers/acpi/dptf/dptf_pch_fivr.c
index e7ab0fc90db9..c0da24c9f8c3 100644
--- a/drivers/acpi/dptf/dptf_pch_fivr.c
+++ b/drivers/acpi/dptf/dptf_pch_fivr.c
@@ -151,6 +151,7 @@ static int pch_fivr_remove(struct platform_device *pdev)
static const struct acpi_device_id pch_fivr_device_ids[] = {
{"INTC1045", 0},
{"INTC1049", 0},
+ {"INTC10A3", 0},
{"", 0},
};
MODULE_DEVICE_TABLE(acpi, pch_fivr_device_ids);
diff --git a/drivers/acpi/dptf/dptf_power.c b/drivers/acpi/dptf/dptf_power.c
index a24d5d7aa117..dc1f52a5b3f4 100644
--- a/drivers/acpi/dptf/dptf_power.c
+++ b/drivers/acpi/dptf/dptf_power.c
@@ -231,6 +231,8 @@ static const struct acpi_device_id int3407_device_ids[] = {
{"INTC1050", 0},
{"INTC1060", 0},
{"INTC1061", 0},
+ {"INTC10A4", 0},
+ {"INTC10A5", 0},
{"", 0},
};
MODULE_DEVICE_TABLE(acpi, int3407_device_ids);
diff --git a/drivers/acpi/dptf/int340x_thermal.c b/drivers/acpi/dptf/int340x_thermal.c
index da5d5f0be2f2..42a556346548 100644
--- a/drivers/acpi/dptf/int340x_thermal.c
+++ b/drivers/acpi/dptf/int340x_thermal.c
@@ -37,6 +37,12 @@ static const struct acpi_device_id int340x_thermal_device_ids[] = {
{"INTC1050"},
{"INTC1060"},
{"INTC1061"},
+ {"INTC10A0"},
+ {"INTC10A1"},
+ {"INTC10A2"},
+ {"INTC10A3"},
+ {"INTC10A4"},
+ {"INTC10A5"},
{""},
};

diff --git a/drivers/acpi/fan.h b/drivers/acpi/fan.h
index dc9a6efa514b..dd9bb8ca2244 100644
--- a/drivers/acpi/fan.h
+++ b/drivers/acpi/fan.h
@@ -10,4 +10,5 @@
{"INT3404", }, /* Fan */ \
{"INTC1044", }, /* Fan for Tiger Lake generation */ \
{"INTC1048", }, /* Fan for Alder Lake generation */ \
+ {"INTC10A2", }, /* Fan for Raptor Lake generation */ \
{"PNP0C0B", } /* Generic ACPI fan */
--
2.34.1

2022-01-15 01:09:41

by Srinivas Pandruvada

Subject: [PATCH 2/3] thermal: int340x: Support Raptor Lake

Add Raptor Lake ACPI IDs for DPTF devices.

Signed-off-by: Srinivas Pandruvada <[email protected]>
---
drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 1 +
drivers/thermal/intel/int340x_thermal/int3403_thermal.c | 1 +
2 files changed, 2 insertions(+)

diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
index 8502b7d8df89..72acb1f61849 100644
--- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
+++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
@@ -596,6 +596,7 @@ static const struct acpi_device_id int3400_thermal_match[] = {
{"INT3400", 0},
{"INTC1040", 0},
{"INTC1041", 0},
+ {"INTC10A0", 0},
{}
};

diff --git a/drivers/thermal/intel/int340x_thermal/int3403_thermal.c b/drivers/thermal/intel/int340x_thermal/int3403_thermal.c
index c3c4c4d34542..07e25321dfe3 100644
--- a/drivers/thermal/intel/int340x_thermal/int3403_thermal.c
+++ b/drivers/thermal/intel/int340x_thermal/int3403_thermal.c
@@ -285,6 +285,7 @@ static const struct acpi_device_id int3403_device_ids[] = {
{"INT3403", 0},
{"INTC1043", 0},
{"INTC1046", 0},
+ {"INTC10A1", 0},
{"", 0},
};
MODULE_DEVICE_TABLE(acpi, int3403_device_ids);
--
2.34.1

2022-01-15 01:09:46

by Srinivas Pandruvada

Subject: [PATCH 3/3] thermal: int340x: Add Raptor Lake PCI device id

Add Raptor Lake PCI ID for processor thermal device.

Signed-off-by: Srinivas Pandruvada <[email protected]>
---
drivers/thermal/intel/int340x_thermal/processor_thermal_device.h | 1 +
.../thermal/intel/int340x_thermal/processor_thermal_device_pci.c | 1 +
2 files changed, 2 insertions(+)

diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.h b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.h
index 9b2a64ef55d0..49932a68abac 100644
--- a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.h
+++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.h
@@ -24,6 +24,7 @@
#define PCI_DEVICE_ID_INTEL_HSB_THERMAL 0x0A03
#define PCI_DEVICE_ID_INTEL_ICL_THERMAL 0x8a03
#define PCI_DEVICE_ID_INTEL_JSL_THERMAL 0x4E03
+#define PCI_DEVICE_ID_INTEL_RPL_THERMAL 0xA71D
#define PCI_DEVICE_ID_INTEL_SKL_THERMAL 0x1903
#define PCI_DEVICE_ID_INTEL_TGL_THERMAL 0x9A03

diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
index b4bcd3fe9eb2..ca40b0967cdd 100644
--- a/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
+++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
@@ -358,6 +358,7 @@ static SIMPLE_DEV_PM_OPS(proc_thermal_pci_pm, proc_thermal_pci_suspend,

static const struct pci_device_id proc_thermal_pci_ids[] = {
{ PCI_DEVICE_DATA(INTEL, ADL_THERMAL, PROC_THERMAL_FEATURE_RAPL | PROC_THERMAL_FEATURE_FIVR | PROC_THERMAL_FEATURE_DVFS | PROC_THERMAL_FEATURE_MBOX) },
+ { PCI_DEVICE_DATA(INTEL, RPL_THERMAL, PROC_THERMAL_FEATURE_RAPL | PROC_THERMAL_FEATURE_FIVR | PROC_THERMAL_FEATURE_DVFS | PROC_THERMAL_FEATURE_MBOX) },
{ },
};

--
2.34.1

2022-01-18 02:58:21

by Rafael J. Wysocki

Subject: Re: [PATCH 0/3] DPTF IDs for Raptor Lake

On Sat, Jan 15, 2022 at 12:24 AM Srinivas Pandruvada
<[email protected]> wrote:
>
> Add ACPI and PCI device ids for Raptor Lake DPTF support.
>
> Srinivas Pandruvada (3):
> ACPI: DPTF: Support Raptor Lake
> thermal: int340x: Support Raptor Lake
> thermal: int340x: Add Raptor Lake PCI device id
>
> drivers/acpi/dptf/dptf_pch_fivr.c | 1 +
> drivers/acpi/dptf/dptf_power.c | 2 ++
> drivers/acpi/dptf/int340x_thermal.c | 6 ++++++
> drivers/acpi/fan.h | 1 +
> drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 1 +
> drivers/thermal/intel/int340x_thermal/int3403_thermal.c | 1 +
> .../intel/int340x_thermal/processor_thermal_device.h | 1 +
> .../intel/int340x_thermal/processor_thermal_device_pci.c | 1 +
> 8 files changed, 14 insertions(+)
>
> --

All 3 patches applied as 5.17-rc material, thanks!