* [PATCH v7 1/3] thermal: ACPI: Add ACPI trip point routines
2023-01-23 18:36 [PATCH v7 0/3] thermal: intel: Use generic trip points in 2 drivers Rafael J. Wysocki
@ 2023-01-23 18:38 ` Rafael J. Wysocki
2023-01-23 18:40 ` [PATCH v7 2/3] thermal: intel: intel_pch: Use generic trip points Rafael J. Wysocki
` (2 subsequent siblings)
3 siblings, 0 replies; 12+ messages in thread
From: Rafael J. Wysocki @ 2023-01-23 18:38 UTC (permalink / raw)
To: Linux PM, Srinivas Pandruvada; +Cc: LKML, Linux ACPI, Daniel Lezcano, Zhang Rui
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Add library routines to populate a generic thermal trip point
structure with data obtained by evaluating a specific object in the
ACPI Namespace.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Co-developed-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/thermal/Kconfig | 4 +
drivers/thermal/Makefile | 1
drivers/thermal/thermal_acpi.c | 150 +++++++++++++++++++++++++++++++++++++++++
include/linux/thermal.h | 8 ++
4 files changed, 163 insertions(+)
create mode 100644 drivers/thermal/thermal_acpi.c
Index: linux-pm/drivers/thermal/Kconfig
===================================================================
--- linux-pm.orig/drivers/thermal/Kconfig
+++ linux-pm/drivers/thermal/Kconfig
@@ -76,6 +76,10 @@ config THERMAL_OF
Say 'Y' here if you need to build thermal infrastructure
based on device tree.
+config THERMAL_ACPI
+ depends on ACPI
+ bool
+
config THERMAL_WRITABLE_TRIPS
bool "Enable writable trip points"
help
Index: linux-pm/drivers/thermal/Makefile
===================================================================
--- linux-pm.orig/drivers/thermal/Makefile
+++ linux-pm/drivers/thermal/Makefile
@@ -13,6 +13,7 @@ thermal_sys-$(CONFIG_THERMAL_NETLINK) +
# interface to/from other layers providing sensors
thermal_sys-$(CONFIG_THERMAL_HWMON) += thermal_hwmon.o
thermal_sys-$(CONFIG_THERMAL_OF) += thermal_of.o
+thermal_sys-$(CONFIG_THERMAL_ACPI) += thermal_acpi.o
# governors
thermal_sys-$(CONFIG_THERMAL_GOV_FAIR_SHARE) += gov_fair_share.o
Index: linux-pm/drivers/thermal/thermal_acpi.c
===================================================================
--- /dev/null
+++ linux-pm/drivers/thermal/thermal_acpi.c
@@ -0,0 +1,150 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright 2023 Linaro Limited
+ * Copyright 2023 Intel Corporation
+ *
+ * Library routines for populating a generic thermal trip point structure
+ * with data obtained by evaluating a specific object in the ACPI Namespace.
+ */
+#include <linux/acpi.h>
+#include <linux/units.h>
+
+#include "thermal_core.h"
+
+/*
+ * Minimum temperature for full military grade is 218°K (-55°C) and
+ * max temperature is 448°K (175°C). We can consider those values as
+ * the boundaries for the [trips] temperature returned by the
+ * firmware. Any values out of these boundaries may be considered
+ * bogus and we can assume the firmware has no data to provide.
+ */
+#define TEMP_MIN_DECIK 2180
+#define TEMP_MAX_DECIK 4480
+
+static int thermal_acpi_trip_init(struct acpi_device *adev,
+ enum thermal_trip_type type, int id,
+ struct thermal_trip *trip)
+{
+ unsigned long long temp;
+ acpi_status status;
+ char obj_name[5];
+
+ switch (type) {
+ case THERMAL_TRIP_ACTIVE:
+ if (id < 0 || id > 9)
+ return -EINVAL;
+
+ obj_name[1] = 'A';
+ obj_name[2] = 'C';
+ obj_name[3] = '0' + id;
+ break;
+ case THERMAL_TRIP_PASSIVE:
+ obj_name[1] = 'P';
+ obj_name[2] = 'S';
+ obj_name[3] = 'V';
+ break;
+ case THERMAL_TRIP_HOT:
+ obj_name[1] = 'H';
+ obj_name[2] = 'O';
+ obj_name[3] = 'T';
+ break;
+ case THERMAL_TRIP_CRITICAL:
+ obj_name[1] = 'C';
+ obj_name[2] = 'R';
+ obj_name[3] = 'T';
+ break;
+ }
+
+ obj_name[0] = '_';
+ obj_name[4] = '\0';
+
+ status = acpi_evaluate_integer(adev->handle, obj_name, NULL, &temp);
+ if (ACPI_FAILURE(status)) {
+ acpi_handle_debug(adev->handle, "%s evaluation failed\n", obj_name);
+ return -ENODATA;
+ }
+
+ if (temp < TEMP_MIN_DECIK || temp >= TEMP_MAX_DECIK) {
+ acpi_handle_debug(adev->handle, "%s result %llu out of range\n",
+ obj_name, temp);
+ return -ENODATA;
+ }
+
+ trip->temperature = deci_kelvin_to_millicelsius(temp);
+ trip->hysteresis = 0;
+ trip->type = type;
+
+ return 0;
+}
+
+/**
+ * thermal_acpi_trip_active - Get the specified active trip point
+ * @adev: Thermal zone ACPI device object to get the description from.
+ * @id: Active cooling level (0 - 9).
+ * @trip: Trip point structure to be populated on success.
+ *
+ * Evaluate the _ACx object for the thermal zone represented by @adev to obtain
+ * the temperature of the active cooling trip point corresponding to the active
+ * cooling level given by @id and initialize @trip as an active trip point using
+ * that temperature value.
+ *
+ * Return 0 on success or a negative error value on failure.
+ */
+int thermal_acpi_trip_active(struct acpi_device *adev, int id,
+ struct thermal_trip *trip)
+{
+ return thermal_acpi_trip_init(adev, THERMAL_TRIP_ACTIVE, id, trip);
+}
+EXPORT_SYMBOL_GPL(thermal_acpi_trip_active);
+
+/**
+ * thermal_acpi_trip_passive - Get the passive trip point
+ * @adev: Thermal zone ACPI device object to get the description from.
+ * @trip: Trip point structure to be populated on success.
+ *
+ * Evaluate the _PSV object for the thermal zone represented by @adev to obtain
+ * the temperature of the passive cooling trip point and initialize @trip as a
+ * passive trip point using that temperature value.
+ *
+ * Return 0 on success or -ENODATA on failure.
+ */
+int thermal_acpi_trip_passive(struct acpi_device *adev, struct thermal_trip *trip)
+{
+ return thermal_acpi_trip_init(adev, THERMAL_TRIP_PASSIVE, INT_MAX, trip);
+}
+EXPORT_SYMBOL_GPL(thermal_acpi_trip_passive);
+
+/**
+ * thermal_acpi_trip_hot - Get the near critical trip point
+ * @adev: the ACPI device to get the description from.
+ * @trip: a &struct thermal_trip to be filled if the function succeed.
+ *
+ * Evaluate the _HOT object for the thermal zone represented by @adev to obtain
+ * the temperature of the trip point at which the system is expected to be put
+ * into the S4 sleep state and initialize @trip as a hot trip point using that
+ * temperature value.
+ *
+ * Return 0 on success or -ENODATA on failure.
+ */
+int thermal_acpi_trip_hot(struct acpi_device *adev, struct thermal_trip *trip)
+{
+ return thermal_acpi_trip_init(adev, THERMAL_TRIP_HOT, INT_MAX, trip);
+}
+EXPORT_SYMBOL_GPL(thermal_acpi_trip_hot);
+
+/**
+ * thermal_acpi_trip_critical - Get the critical trip point
+ * @adev: the ACPI device to get the description from.
+ * @trip: a &struct thermal_trip to be filled if the function succeed.
+ *
+ * Evaluate the _CRT object for the thermal zone represented by @adev to obtain
+ * the temperature of the critical cooling trip point and initialize @trip as a
+ * critical trip point using that temperature value.
+ *
+ * Return 0 on success or -ENODATA on failure.
+ */
+int thermal_acpi_trip_critical(struct acpi_device *adev, struct thermal_trip *trip)
+{
+ return thermal_acpi_trip_init(adev, THERMAL_TRIP_CRITICAL, INT_MAX, trip);
+}
+EXPORT_SYMBOL_GPL(thermal_acpi_trip_critical);
Index: linux-pm/include/linux/thermal.h
===================================================================
--- linux-pm.orig/include/linux/thermal.h
+++ linux-pm/include/linux/thermal.h
@@ -346,6 +346,14 @@ int thermal_zone_get_num_trips(struct th
int thermal_zone_get_crit_temp(struct thermal_zone_device *tz, int *temp);
+#ifdef CONFIG_THERMAL_ACPI
+int thermal_acpi_trip_active(struct acpi_device *adev, int id,
+ struct thermal_trip *trip);
+int thermal_acpi_trip_passive(struct acpi_device *adev, struct thermal_trip *trip);
+int thermal_acpi_trip_hot(struct acpi_device *adev, struct thermal_trip *trip);
+int thermal_acpi_trip_critical(struct acpi_device *adev, struct thermal_trip *trip);
+#endif
+
#ifdef CONFIG_THERMAL
struct thermal_zone_device *thermal_zone_device_register(const char *, int, int,
void *, struct thermal_zone_device_ops *,
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH v7 2/3] thermal: intel: intel_pch: Use generic trip points
2023-01-23 18:36 [PATCH v7 0/3] thermal: intel: Use generic trip points in 2 drivers Rafael J. Wysocki
2023-01-23 18:38 ` [PATCH v7 1/3] thermal: ACPI: Add ACPI trip point routines Rafael J. Wysocki
@ 2023-01-23 18:40 ` Rafael J. Wysocki
2023-01-23 18:41 ` [PATCH v7 3/3] thermal: intel: int340x: " Rafael J. Wysocki
2023-01-23 18:45 ` [PATCH v7 0/3] thermal: intel: Use generic trip points in 2 drivers Rafael J. Wysocki
3 siblings, 0 replies; 12+ messages in thread
From: Rafael J. Wysocki @ 2023-01-23 18:40 UTC (permalink / raw)
To: Linux PM, Srinivas Pandruvada; +Cc: LKML, Linux ACPI, Daniel Lezcano, Zhang Rui
From: Daniel Lezcano <daniel.lezcano@linaro.org>
The thermal framework gives the possibility to register the trip
points along with the thermal zone. When that is done, no get_trip_*
callbacks are needed and they can be removed.
Convert the existing callbacks content logic into generic trip points
initialization code and register them along with the thermal zone.
In order to consolidate the code, use an ACPI trip library function
to populate a generic trip point.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: Zhang Rui <rui.zhang@intel.com>
[ rjw: Subject and changelog edits, rebase ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/thermal/intel/Kconfig | 1
drivers/thermal/intel/intel_pch_thermal.c | 88 ++++++------------------------
2 files changed, 20 insertions(+), 69 deletions(-)
Index: linux-pm/drivers/thermal/intel/Kconfig
===================================================================
--- linux-pm.orig/drivers/thermal/intel/Kconfig
+++ linux-pm/drivers/thermal/intel/Kconfig
@@ -81,6 +81,7 @@ config INTEL_BXT_PMIC_THERMAL
config INTEL_PCH_THERMAL
tristate "Intel PCH Thermal Reporting Driver"
depends on X86 && PCI
+ select THERMAL_ACPI if ACPI
help
Enable this to support thermal reporting on certain intel PCHs.
Thermal reporting device will provide temperature reading,
Index: linux-pm/drivers/thermal/intel/intel_pch_thermal.c
===================================================================
--- linux-pm.orig/drivers/thermal/intel/intel_pch_thermal.c
+++ linux-pm/drivers/thermal/intel/intel_pch_thermal.c
@@ -65,6 +65,8 @@
#define WPT_TEMP_OFFSET (PCH_TEMP_OFFSET * MILLIDEGREE_PER_DEGREE)
#define GET_PCH_TEMP(x) (((x) / 2) + PCH_TEMP_OFFSET)
+#define PCH_MAX_TRIPS 3 /* critical, hot, passive */
+
/* Amount of time for each cooling delay, 100ms by default for now */
static unsigned int delay_timeout = 100;
module_param(delay_timeout, int, 0644);
@@ -82,12 +84,7 @@ struct pch_thermal_device {
const struct pch_dev_ops *ops;
struct pci_dev *pdev;
struct thermal_zone_device *tzd;
- int crt_trip_id;
- unsigned long crt_temp;
- int hot_trip_id;
- unsigned long hot_temp;
- int psv_trip_id;
- unsigned long psv_temp;
+ struct thermal_trip trips[PCH_MAX_TRIPS];
bool bios_enabled;
};
@@ -102,33 +99,22 @@ static void pch_wpt_add_acpi_psv_trip(st
int *nr_trips)
{
struct acpi_device *adev;
-
- ptd->psv_trip_id = -1;
+ int ret;
adev = ACPI_COMPANION(&ptd->pdev->dev);
- if (adev) {
- unsigned long long r;
- acpi_status status;
-
- status = acpi_evaluate_integer(adev->handle, "_PSV", NULL,
- &r);
- if (ACPI_SUCCESS(status)) {
- unsigned long trip_temp;
-
- trip_temp = deci_kelvin_to_millicelsius(r);
- if (trip_temp) {
- ptd->psv_temp = trip_temp;
- ptd->psv_trip_id = *nr_trips;
- ++(*nr_trips);
- }
- }
- }
+ if (!adev)
+ return;
+
+ ret = thermal_acpi_trip_passive(adev, &ptd->trips[*nr_trips]);
+ if (ret)
+ return;
+
+ ++(*nr_trips);
}
#else
static void pch_wpt_add_acpi_psv_trip(struct pch_thermal_device *ptd,
int *nr_trips)
{
- ptd->psv_trip_id = -1;
}
#endif
@@ -163,21 +149,19 @@ static int pch_wpt_init(struct pch_therm
}
read_trips:
- ptd->crt_trip_id = -1;
trip_temp = readw(ptd->hw_base + WPT_CTT);
trip_temp &= 0x1FF;
if (trip_temp) {
- ptd->crt_temp = GET_WPT_TEMP(trip_temp);
- ptd->crt_trip_id = 0;
+ ptd->trips[*nr_trips].temperature = GET_WPT_TEMP(trip_temp);
+ ptd->trips[*nr_trips].type = THERMAL_TRIP_CRITICAL;
++(*nr_trips);
}
- ptd->hot_trip_id = -1;
trip_temp = readw(ptd->hw_base + WPT_PHL);
trip_temp &= 0x1FF;
if (trip_temp) {
- ptd->hot_temp = GET_WPT_TEMP(trip_temp);
- ptd->hot_trip_id = *nr_trips;
+ ptd->trips[*nr_trips].temperature = GET_WPT_TEMP(trip_temp);
+ ptd->trips[*nr_trips].type = THERMAL_TRIP_HOT;
++(*nr_trips);
}
@@ -298,39 +282,6 @@ static int pch_thermal_get_temp(struct t
return ptd->ops->get_temp(ptd, temp);
}
-static int pch_get_trip_type(struct thermal_zone_device *tzd, int trip,
- enum thermal_trip_type *type)
-{
- struct pch_thermal_device *ptd = tzd->devdata;
-
- if (ptd->crt_trip_id == trip)
- *type = THERMAL_TRIP_CRITICAL;
- else if (ptd->hot_trip_id == trip)
- *type = THERMAL_TRIP_HOT;
- else if (ptd->psv_trip_id == trip)
- *type = THERMAL_TRIP_PASSIVE;
- else
- return -EINVAL;
-
- return 0;
-}
-
-static int pch_get_trip_temp(struct thermal_zone_device *tzd, int trip, int *temp)
-{
- struct pch_thermal_device *ptd = tzd->devdata;
-
- if (ptd->crt_trip_id == trip)
- *temp = ptd->crt_temp;
- else if (ptd->hot_trip_id == trip)
- *temp = ptd->hot_temp;
- else if (ptd->psv_trip_id == trip)
- *temp = ptd->psv_temp;
- else
- return -EINVAL;
-
- return 0;
-}
-
static void pch_critical(struct thermal_zone_device *tzd)
{
dev_dbg(&tzd->device, "%s: critical temperature reached\n", tzd->type);
@@ -338,8 +289,6 @@ static void pch_critical(struct thermal_
static struct thermal_zone_device_ops tzd_ops = {
.get_temp = pch_thermal_get_temp,
- .get_trip_type = pch_get_trip_type,
- .get_trip_temp = pch_get_trip_temp,
.critical = pch_critical,
};
@@ -423,8 +372,9 @@ static int intel_pch_thermal_probe(struc
if (err)
goto error_cleanup;
- ptd->tzd = thermal_zone_device_register(bi->name, nr_trips, 0, ptd,
- &tzd_ops, NULL, 0, 0);
+ ptd->tzd = thermal_zone_device_register_with_trips(bi->name, ptd->trips,
+ nr_trips, 0, ptd,
+ &tzd_ops, NULL, 0, 0);
if (IS_ERR(ptd->tzd)) {
dev_err(&pdev->dev, "Failed to register thermal zone %s\n",
bi->name);
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH v7 3/3] thermal: intel: int340x: Use generic trip points
2023-01-23 18:36 [PATCH v7 0/3] thermal: intel: Use generic trip points in 2 drivers Rafael J. Wysocki
2023-01-23 18:38 ` [PATCH v7 1/3] thermal: ACPI: Add ACPI trip point routines Rafael J. Wysocki
2023-01-23 18:40 ` [PATCH v7 2/3] thermal: intel: intel_pch: Use generic trip points Rafael J. Wysocki
@ 2023-01-23 18:41 ` Rafael J. Wysocki
2023-01-24 20:43 ` Rafael J. Wysocki
2023-01-23 18:45 ` [PATCH v7 0/3] thermal: intel: Use generic trip points in 2 drivers Rafael J. Wysocki
3 siblings, 1 reply; 12+ messages in thread
From: Rafael J. Wysocki @ 2023-01-23 18:41 UTC (permalink / raw)
To: Linux PM, Srinivas Pandruvada; +Cc: LKML, Linux ACPI, Daniel Lezcano, Zhang Rui
From: Daniel Lezcano <daniel.lezcano@linaro.org>
The thermal framework gives the possibility to register the trip
points along with the thermal zone. When that is done, no get_trip_*
callbacks are needed and they can be removed.
Convert the existing callbacks content logic into generic trip points
initialization code and register them along with the thermal zone.
In order to consolidate the code, use ACPI trip library functions to
populate generic trip points.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: Zhang Rui <rui.zhang@intel.com>
[ rjw: Subject and changelog edits, rebase ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/thermal/intel/int340x_thermal/Kconfig | 1
drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c | 172 ++---------
drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h | 10
3 files changed, 48 insertions(+), 135 deletions(-)
Index: linux-pm/drivers/thermal/intel/int340x_thermal/Kconfig
===================================================================
--- linux-pm.orig/drivers/thermal/intel/int340x_thermal/Kconfig
+++ linux-pm/drivers/thermal/intel/int340x_thermal/Kconfig
@@ -9,6 +9,7 @@ config INT340X_THERMAL
select THERMAL_GOV_USER_SPACE
select ACPI_THERMAL_REL
select ACPI_FAN
+ select THERMAL_ACPI
select INTEL_SOC_DTS_IOSF_CORE
select INTEL_TCC
select PROC_THERMAL_MMIO_RAPL if POWERCAP
Index: linux-pm/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
===================================================================
--- linux-pm.orig/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
+++ linux-pm/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
@@ -37,65 +37,6 @@ static int int340x_thermal_get_zone_temp
return 0;
}
-static int int340x_thermal_get_trip_temp(struct thermal_zone_device *zone,
- int trip, int *temp)
-{
- struct int34x_thermal_zone *d = zone->devdata;
- int i;
-
- if (trip < d->aux_trip_nr)
- *temp = d->aux_trips[trip];
- else if (trip == d->crt_trip_id)
- *temp = d->crt_temp;
- else if (trip == d->psv_trip_id)
- *temp = d->psv_temp;
- else if (trip == d->hot_trip_id)
- *temp = d->hot_temp;
- else {
- for (i = 0; i < INT340X_THERMAL_MAX_ACT_TRIP_COUNT; i++) {
- if (d->act_trips[i].valid &&
- d->act_trips[i].id == trip) {
- *temp = d->act_trips[i].temp;
- break;
- }
- }
- if (i == INT340X_THERMAL_MAX_ACT_TRIP_COUNT)
- return -EINVAL;
- }
-
- return 0;
-}
-
-static int int340x_thermal_get_trip_type(struct thermal_zone_device *zone,
- int trip,
- enum thermal_trip_type *type)
-{
- struct int34x_thermal_zone *d = zone->devdata;
- int i;
-
- if (trip < d->aux_trip_nr)
- *type = THERMAL_TRIP_PASSIVE;
- else if (trip == d->crt_trip_id)
- *type = THERMAL_TRIP_CRITICAL;
- else if (trip == d->hot_trip_id)
- *type = THERMAL_TRIP_HOT;
- else if (trip == d->psv_trip_id)
- *type = THERMAL_TRIP_PASSIVE;
- else {
- for (i = 0; i < INT340X_THERMAL_MAX_ACT_TRIP_COUNT; i++) {
- if (d->act_trips[i].valid &&
- d->act_trips[i].id == trip) {
- *type = THERMAL_TRIP_ACTIVE;
- break;
- }
- }
- if (i == INT340X_THERMAL_MAX_ACT_TRIP_COUNT)
- return -EINVAL;
- }
-
- return 0;
-}
-
static int int340x_thermal_set_trip_temp(struct thermal_zone_device *zone,
int trip, int temp)
{
@@ -109,20 +50,15 @@ static int int340x_thermal_set_trip_temp
if (ACPI_FAILURE(status))
return -EIO;
- d->aux_trips[trip] = temp;
-
return 0;
}
-
-static int int340x_thermal_get_trip_hyst(struct thermal_zone_device *zone,
- int trip, int *temp)
+static int int340x_thermal_get_global_hyst(struct acpi_device *adev, int *temp)
{
- struct int34x_thermal_zone *d = zone->devdata;
acpi_status status;
unsigned long long hyst;
- status = acpi_evaluate_integer(d->adev->handle, "GTSH", NULL, &hyst);
+ status = acpi_evaluate_integer(adev->handle, "GTSH", NULL, &hyst);
if (ACPI_FAILURE(status))
*temp = 0;
else
@@ -131,6 +67,7 @@ static int int340x_thermal_get_trip_hyst
return 0;
}
+
static void int340x_thermal_critical(struct thermal_zone_device *zone)
{
dev_dbg(&zone->device, "%s: critical temperature reached\n", zone->type);
@@ -138,58 +75,36 @@ static void int340x_thermal_critical(str
static struct thermal_zone_device_ops int340x_thermal_zone_ops = {
.get_temp = int340x_thermal_get_zone_temp,
- .get_trip_temp = int340x_thermal_get_trip_temp,
- .get_trip_type = int340x_thermal_get_trip_type,
.set_trip_temp = int340x_thermal_set_trip_temp,
- .get_trip_hyst = int340x_thermal_get_trip_hyst,
.critical = int340x_thermal_critical,
};
-static int int340x_thermal_get_trip_config(acpi_handle handle, char *name,
- int *temp)
-{
- unsigned long long r;
- acpi_status status;
-
- status = acpi_evaluate_integer(handle, name, NULL, &r);
- if (ACPI_FAILURE(status))
- return -EIO;
-
- *temp = deci_kelvin_to_millicelsius(r);
-
- return 0;
-}
-
int int340x_thermal_read_trips(struct int34x_thermal_zone *int34x_zone)
{
- int trip_cnt = int34x_zone->aux_trip_nr;
- int i;
+ int trip_cnt;
+ int i, ret;
- int34x_zone->crt_trip_id = -1;
- if (!int340x_thermal_get_trip_config(int34x_zone->adev->handle, "_CRT",
- &int34x_zone->crt_temp))
- int34x_zone->crt_trip_id = trip_cnt++;
-
- int34x_zone->hot_trip_id = -1;
- if (!int340x_thermal_get_trip_config(int34x_zone->adev->handle, "_HOT",
- &int34x_zone->hot_temp))
- int34x_zone->hot_trip_id = trip_cnt++;
-
- int34x_zone->psv_trip_id = -1;
- if (!int340x_thermal_get_trip_config(int34x_zone->adev->handle, "_PSV",
- &int34x_zone->psv_temp))
- int34x_zone->psv_trip_id = trip_cnt++;
+ trip_cnt = int34x_zone->aux_trip_nr;
+
+ ret = thermal_acpi_trip_critical(int34x_zone->adev, &int34x_zone->trips[trip_cnt]);
+ if (!ret)
+ trip_cnt++;
+
+ ret = thermal_acpi_trip_hot(int34x_zone->adev, &int34x_zone->trips[trip_cnt]);
+ if (!ret)
+ trip_cnt++;
+
+ ret = thermal_acpi_trip_passive(int34x_zone->adev, &int34x_zone->trips[trip_cnt]);
+ if (!ret)
+ trip_cnt++;
for (i = 0; i < INT340X_THERMAL_MAX_ACT_TRIP_COUNT; i++) {
- char name[5] = { '_', 'A', 'C', '0' + i, '\0' };
- if (int340x_thermal_get_trip_config(int34x_zone->adev->handle,
- name,
- &int34x_zone->act_trips[i].temp))
+ ret = thermal_acpi_trip_active(int34x_zone->adev, i, &int34x_zone->trips[trip_cnt]);
+ if (ret)
break;
- int34x_zone->act_trips[i].id = trip_cnt++;
- int34x_zone->act_trips[i].valid = true;
+ trip_cnt++;
}
return trip_cnt;
@@ -208,7 +123,7 @@ struct int34x_thermal_zone *int340x_ther
acpi_status status;
unsigned long long trip_cnt;
int trip_mask = 0;
- int ret;
+ int i, ret;
int34x_thermal_zone = kzalloc(sizeof(*int34x_thermal_zone),
GFP_KERNEL);
@@ -228,32 +143,35 @@ struct int34x_thermal_zone *int340x_ther
int34x_thermal_zone->ops->get_temp = get_temp;
status = acpi_evaluate_integer(adev->handle, "PATC", NULL, &trip_cnt);
- if (ACPI_FAILURE(status))
- trip_cnt = 0;
- else {
- int i;
-
- int34x_thermal_zone->aux_trips =
- kcalloc(trip_cnt,
- sizeof(*int34x_thermal_zone->aux_trips),
- GFP_KERNEL);
- if (!int34x_thermal_zone->aux_trips) {
- ret = -ENOMEM;
- goto err_trip_alloc;
- }
- trip_mask = BIT(trip_cnt) - 1;
+ if (!ACPI_FAILURE(status)) {
int34x_thermal_zone->aux_trip_nr = trip_cnt;
- for (i = 0; i < trip_cnt; ++i)
- int34x_thermal_zone->aux_trips[i] = THERMAL_TEMP_INVALID;
+ trip_mask = BIT(trip_cnt) - 1;
+ }
+
+ int34x_thermal_zone->trips = kzalloc(sizeof(*int34x_thermal_zone->trips) *
+ (INT340X_THERMAL_MAX_TRIP_COUNT + trip_cnt),
+ GFP_KERNEL);
+ if (!int34x_thermal_zone->trips) {
+ ret = -ENOMEM;
+ goto err_trips_alloc;
}
trip_cnt = int340x_thermal_read_trips(int34x_thermal_zone);
+ for (i = 0; i < trip_cnt; ++i)
+ int340x_thermal_get_global_hyst(adev, &int34x_thermal_zone->trips[i].hysteresis);
+
+ for (i = 0; i < int34x_thermal_zone->aux_trip_nr; i++) {
+ int34x_thermal_zone->trips[i].type = THERMAL_TRIP_PASSIVE;
+ int34x_thermal_zone->trips[i].temperature = THERMAL_TEMP_INVALID;
+ }
+
int34x_thermal_zone->lpat_table = acpi_lpat_get_conversion_table(
adev->handle);
- int34x_thermal_zone->zone = thermal_zone_device_register(
+ int34x_thermal_zone->zone = thermal_zone_device_register_with_trips(
acpi_device_bid(adev),
+ int34x_thermal_zone->trips,
trip_cnt,
trip_mask, int34x_thermal_zone,
int34x_thermal_zone->ops,
@@ -272,9 +190,9 @@ struct int34x_thermal_zone *int340x_ther
err_enable:
thermal_zone_device_unregister(int34x_thermal_zone->zone);
err_thermal_zone:
+ kfree(int34x_thermal_zone->trips);
acpi_lpat_free_conversion_table(int34x_thermal_zone->lpat_table);
- kfree(int34x_thermal_zone->aux_trips);
-err_trip_alloc:
+err_trips_alloc:
kfree(int34x_thermal_zone->ops);
err_ops_alloc:
kfree(int34x_thermal_zone);
@@ -287,7 +205,7 @@ void int340x_thermal_zone_remove(struct
{
thermal_zone_device_unregister(int34x_thermal_zone->zone);
acpi_lpat_free_conversion_table(int34x_thermal_zone->lpat_table);
- kfree(int34x_thermal_zone->aux_trips);
+ kfree(int34x_thermal_zone->trips);
kfree(int34x_thermal_zone->ops);
kfree(int34x_thermal_zone);
}
Index: linux-pm/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h
===================================================================
--- linux-pm.orig/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h
+++ linux-pm/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h
@@ -10,6 +10,7 @@
#include <acpi/acpi_lpat.h>
#define INT340X_THERMAL_MAX_ACT_TRIP_COUNT 10
+#define INT340X_THERMAL_MAX_TRIP_COUNT INT340X_THERMAL_MAX_ACT_TRIP_COUNT + 3
struct active_trip {
int temp;
@@ -19,15 +20,8 @@ struct active_trip {
struct int34x_thermal_zone {
struct acpi_device *adev;
- struct active_trip act_trips[INT340X_THERMAL_MAX_ACT_TRIP_COUNT];
- unsigned long *aux_trips;
+ struct thermal_trip *trips;
int aux_trip_nr;
- int psv_temp;
- int psv_trip_id;
- int crt_temp;
- int crt_trip_id;
- int hot_temp;
- int hot_trip_id;
struct thermal_zone_device *zone;
struct thermal_zone_device_ops *ops;
void *priv_data;
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH v7 3/3] thermal: intel: int340x: Use generic trip points
2023-01-23 18:41 ` [PATCH v7 3/3] thermal: intel: int340x: " Rafael J. Wysocki
@ 2023-01-24 20:43 ` Rafael J. Wysocki
2023-01-25 11:42 ` Rafael J. Wysocki
0 siblings, 1 reply; 12+ messages in thread
From: Rafael J. Wysocki @ 2023-01-24 20:43 UTC (permalink / raw)
To: Daniel Lezcano
Cc: Linux PM, Srinivas Pandruvada, LKML, Linux ACPI, Zhang Rui,
Rafael J. Wysocki
On Mon, Jan 23, 2023 at 7:41 PM Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
>
> From: Daniel Lezcano <daniel.lezcano@linaro.org>
>
> The thermal framework gives the possibility to register the trip
> points along with the thermal zone. When that is done, no get_trip_*
> callbacks are needed and they can be removed.
>
> Convert the existing callbacks content logic into generic trip points
> initialization code and register them along with the thermal zone.
>
> In order to consolidate the code, use ACPI trip library functions to
> populate generic trip points.
>
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> Reviewed-by: Zhang Rui <rui.zhang@intel.com>
> [ rjw: Subject and changelog edits, rebase ]
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This fix from Srinivas:
https://lore.kernel.org/linux-pm/20230123172110.376549-1-srinivas.pandruvada@linux.intel.com/
clearly shows that there are problems with this patch.
> ---
> drivers/thermal/intel/int340x_thermal/Kconfig | 1
> drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c | 172 ++---------
> drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h | 10
> 3 files changed, 48 insertions(+), 135 deletions(-)
>
> Index: linux-pm/drivers/thermal/intel/int340x_thermal/Kconfig
> ===================================================================
> --- linux-pm.orig/drivers/thermal/intel/int340x_thermal/Kconfig
> +++ linux-pm/drivers/thermal/intel/int340x_thermal/Kconfig
> @@ -9,6 +9,7 @@ config INT340X_THERMAL
> select THERMAL_GOV_USER_SPACE
> select ACPI_THERMAL_REL
> select ACPI_FAN
> + select THERMAL_ACPI
> select INTEL_SOC_DTS_IOSF_CORE
> select INTEL_TCC
> select PROC_THERMAL_MMIO_RAPL if POWERCAP
> Index: linux-pm/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
> ===================================================================
> --- linux-pm.orig/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
> +++ linux-pm/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
> @@ -37,65 +37,6 @@ static int int340x_thermal_get_zone_temp
> return 0;
> }
>
> -static int int340x_thermal_get_trip_temp(struct thermal_zone_device *zone,
> - int trip, int *temp)
> -{
> - struct int34x_thermal_zone *d = zone->devdata;
> - int i;
> -
> - if (trip < d->aux_trip_nr)
> - *temp = d->aux_trips[trip];
> - else if (trip == d->crt_trip_id)
> - *temp = d->crt_temp;
> - else if (trip == d->psv_trip_id)
> - *temp = d->psv_temp;
> - else if (trip == d->hot_trip_id)
> - *temp = d->hot_temp;
> - else {
> - for (i = 0; i < INT340X_THERMAL_MAX_ACT_TRIP_COUNT; i++) {
> - if (d->act_trips[i].valid &&
> - d->act_trips[i].id == trip) {
> - *temp = d->act_trips[i].temp;
> - break;
> - }
> - }
> - if (i == INT340X_THERMAL_MAX_ACT_TRIP_COUNT)
> - return -EINVAL;
> - }
> -
> - return 0;
> -}
> -
> -static int int340x_thermal_get_trip_type(struct thermal_zone_device *zone,
> - int trip,
> - enum thermal_trip_type *type)
> -{
> - struct int34x_thermal_zone *d = zone->devdata;
> - int i;
> -
> - if (trip < d->aux_trip_nr)
> - *type = THERMAL_TRIP_PASSIVE;
> - else if (trip == d->crt_trip_id)
> - *type = THERMAL_TRIP_CRITICAL;
> - else if (trip == d->hot_trip_id)
> - *type = THERMAL_TRIP_HOT;
> - else if (trip == d->psv_trip_id)
> - *type = THERMAL_TRIP_PASSIVE;
> - else {
> - for (i = 0; i < INT340X_THERMAL_MAX_ACT_TRIP_COUNT; i++) {
> - if (d->act_trips[i].valid &&
> - d->act_trips[i].id == trip) {
> - *type = THERMAL_TRIP_ACTIVE;
> - break;
> - }
> - }
> - if (i == INT340X_THERMAL_MAX_ACT_TRIP_COUNT)
> - return -EINVAL;
> - }
> -
> - return 0;
> -}
> -
> static int int340x_thermal_set_trip_temp(struct thermal_zone_device *zone,
> int trip, int temp)
> {
> @@ -109,20 +50,15 @@ static int int340x_thermal_set_trip_temp
> if (ACPI_FAILURE(status))
> return -EIO;
>
> - d->aux_trips[trip] = temp;
> -
> return 0;
> }
>
> -
> -static int int340x_thermal_get_trip_hyst(struct thermal_zone_device *zone,
> - int trip, int *temp)
> +static int int340x_thermal_get_global_hyst(struct acpi_device *adev, int *temp)
> {
> - struct int34x_thermal_zone *d = zone->devdata;
> acpi_status status;
> unsigned long long hyst;
>
> - status = acpi_evaluate_integer(d->adev->handle, "GTSH", NULL, &hyst);
> + status = acpi_evaluate_integer(adev->handle, "GTSH", NULL, &hyst);
> if (ACPI_FAILURE(status))
> *temp = 0;
> else
> @@ -131,6 +67,7 @@ static int int340x_thermal_get_trip_hyst
> return 0;
> }
>
> +
> static void int340x_thermal_critical(struct thermal_zone_device *zone)
> {
> dev_dbg(&zone->device, "%s: critical temperature reached\n", zone->type);
> @@ -138,58 +75,36 @@ static void int340x_thermal_critical(str
>
> static struct thermal_zone_device_ops int340x_thermal_zone_ops = {
> .get_temp = int340x_thermal_get_zone_temp,
> - .get_trip_temp = int340x_thermal_get_trip_temp,
> - .get_trip_type = int340x_thermal_get_trip_type,
> .set_trip_temp = int340x_thermal_set_trip_temp,
> - .get_trip_hyst = int340x_thermal_get_trip_hyst,
> .critical = int340x_thermal_critical,
> };
>
> -static int int340x_thermal_get_trip_config(acpi_handle handle, char *name,
> - int *temp)
> -{
> - unsigned long long r;
> - acpi_status status;
> -
> - status = acpi_evaluate_integer(handle, name, NULL, &r);
> - if (ACPI_FAILURE(status))
> - return -EIO;
> -
> - *temp = deci_kelvin_to_millicelsius(r);
> -
> - return 0;
> -}
> -
> int int340x_thermal_read_trips(struct int34x_thermal_zone *int34x_zone)
First of all, this function can be invoked from int3403_notify() to
update the trip points in the case of a firmware notification.
This, of course, can be racing with the thermal core's use of the trip
points and I don't think that there is a way to synchronize that right
now.
Second, the hysteresis value set by int340x_thermal_zone_add() will be
overwritten with zero by the new code below.
I'm dropping this one for now (and the fix on top of it) and we'll
need to revisit it.
> {
> - int trip_cnt = int34x_zone->aux_trip_nr;
> - int i;
> + int trip_cnt;
> + int i, ret;
>
> - int34x_zone->crt_trip_id = -1;
> - if (!int340x_thermal_get_trip_config(int34x_zone->adev->handle, "_CRT",
> - &int34x_zone->crt_temp))
> - int34x_zone->crt_trip_id = trip_cnt++;
> -
> - int34x_zone->hot_trip_id = -1;
> - if (!int340x_thermal_get_trip_config(int34x_zone->adev->handle, "_HOT",
> - &int34x_zone->hot_temp))
> - int34x_zone->hot_trip_id = trip_cnt++;
> -
> - int34x_zone->psv_trip_id = -1;
> - if (!int340x_thermal_get_trip_config(int34x_zone->adev->handle, "_PSV",
> - &int34x_zone->psv_temp))
> - int34x_zone->psv_trip_id = trip_cnt++;
> + trip_cnt = int34x_zone->aux_trip_nr;
> +
> + ret = thermal_acpi_trip_critical(int34x_zone->adev, &int34x_zone->trips[trip_cnt]);
> + if (!ret)
> + trip_cnt++;
> +
> + ret = thermal_acpi_trip_hot(int34x_zone->adev, &int34x_zone->trips[trip_cnt]);
> + if (!ret)
> + trip_cnt++;
> +
> + ret = thermal_acpi_trip_passive(int34x_zone->adev, &int34x_zone->trips[trip_cnt]);
> + if (!ret)
> + trip_cnt++;
>
> for (i = 0; i < INT340X_THERMAL_MAX_ACT_TRIP_COUNT; i++) {
> - char name[5] = { '_', 'A', 'C', '0' + i, '\0' };
>
> - if (int340x_thermal_get_trip_config(int34x_zone->adev->handle,
> - name,
> - &int34x_zone->act_trips[i].temp))
> + ret = thermal_acpi_trip_active(int34x_zone->adev, i, &int34x_zone->trips[trip_cnt]);
> + if (ret)
> break;
>
> - int34x_zone->act_trips[i].id = trip_cnt++;
> - int34x_zone->act_trips[i].valid = true;
> + trip_cnt++;
> }
>
> return trip_cnt;
> @@ -208,7 +123,7 @@ struct int34x_thermal_zone *int340x_ther
> acpi_status status;
> unsigned long long trip_cnt;
> int trip_mask = 0;
> - int ret;
> + int i, ret;
>
> int34x_thermal_zone = kzalloc(sizeof(*int34x_thermal_zone),
> GFP_KERNEL);
> @@ -228,32 +143,35 @@ struct int34x_thermal_zone *int340x_ther
> int34x_thermal_zone->ops->get_temp = get_temp;
>
> status = acpi_evaluate_integer(adev->handle, "PATC", NULL, &trip_cnt);
> - if (ACPI_FAILURE(status))
> - trip_cnt = 0;
> - else {
> - int i;
> -
> - int34x_thermal_zone->aux_trips =
> - kcalloc(trip_cnt,
> - sizeof(*int34x_thermal_zone->aux_trips),
> - GFP_KERNEL);
> - if (!int34x_thermal_zone->aux_trips) {
> - ret = -ENOMEM;
> - goto err_trip_alloc;
> - }
> - trip_mask = BIT(trip_cnt) - 1;
> + if (!ACPI_FAILURE(status)) {
> int34x_thermal_zone->aux_trip_nr = trip_cnt;
> - for (i = 0; i < trip_cnt; ++i)
> - int34x_thermal_zone->aux_trips[i] = THERMAL_TEMP_INVALID;
> + trip_mask = BIT(trip_cnt) - 1;
> + }
> +
> + int34x_thermal_zone->trips = kzalloc(sizeof(*int34x_thermal_zone->trips) *
> + (INT340X_THERMAL_MAX_TRIP_COUNT + trip_cnt),
> + GFP_KERNEL);
> + if (!int34x_thermal_zone->trips) {
> + ret = -ENOMEM;
> + goto err_trips_alloc;
> }
>
> trip_cnt = int340x_thermal_read_trips(int34x_thermal_zone);
>
> + for (i = 0; i < trip_cnt; ++i)
> + int340x_thermal_get_global_hyst(adev, &int34x_thermal_zone->trips[i].hysteresis);
> +
> + for (i = 0; i < int34x_thermal_zone->aux_trip_nr; i++) {
> + int34x_thermal_zone->trips[i].type = THERMAL_TRIP_PASSIVE;
> + int34x_thermal_zone->trips[i].temperature = THERMAL_TEMP_INVALID;
> + }
> +
> int34x_thermal_zone->lpat_table = acpi_lpat_get_conversion_table(
> adev->handle);
>
> - int34x_thermal_zone->zone = thermal_zone_device_register(
> + int34x_thermal_zone->zone = thermal_zone_device_register_with_trips(
> acpi_device_bid(adev),
> + int34x_thermal_zone->trips,
> trip_cnt,
> trip_mask, int34x_thermal_zone,
> int34x_thermal_zone->ops,
> @@ -272,9 +190,9 @@ struct int34x_thermal_zone *int340x_ther
> err_enable:
> thermal_zone_device_unregister(int34x_thermal_zone->zone);
> err_thermal_zone:
> + kfree(int34x_thermal_zone->trips);
> acpi_lpat_free_conversion_table(int34x_thermal_zone->lpat_table);
> - kfree(int34x_thermal_zone->aux_trips);
> -err_trip_alloc:
> +err_trips_alloc:
> kfree(int34x_thermal_zone->ops);
> err_ops_alloc:
> kfree(int34x_thermal_zone);
> @@ -287,7 +205,7 @@ void int340x_thermal_zone_remove(struct
> {
> thermal_zone_device_unregister(int34x_thermal_zone->zone);
> acpi_lpat_free_conversion_table(int34x_thermal_zone->lpat_table);
> - kfree(int34x_thermal_zone->aux_trips);
> + kfree(int34x_thermal_zone->trips);
> kfree(int34x_thermal_zone->ops);
> kfree(int34x_thermal_zone);
> }
> Index: linux-pm/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h
> ===================================================================
> --- linux-pm.orig/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h
> +++ linux-pm/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h
> @@ -10,6 +10,7 @@
> #include <acpi/acpi_lpat.h>
>
> #define INT340X_THERMAL_MAX_ACT_TRIP_COUNT 10
> +#define INT340X_THERMAL_MAX_TRIP_COUNT INT340X_THERMAL_MAX_ACT_TRIP_COUNT + 3
>
> struct active_trip {
> int temp;
> @@ -19,15 +20,8 @@ struct active_trip {
>
> struct int34x_thermal_zone {
> struct acpi_device *adev;
> - struct active_trip act_trips[INT340X_THERMAL_MAX_ACT_TRIP_COUNT];
> - unsigned long *aux_trips;
> + struct thermal_trip *trips;
> int aux_trip_nr;
> - int psv_temp;
> - int psv_trip_id;
> - int crt_temp;
> - int crt_trip_id;
> - int hot_temp;
> - int hot_trip_id;
> struct thermal_zone_device *zone;
> struct thermal_zone_device_ops *ops;
> void *priv_data;
>
>
>
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH v7 3/3] thermal: intel: int340x: Use generic trip points
2023-01-24 20:43 ` Rafael J. Wysocki
@ 2023-01-25 11:42 ` Rafael J. Wysocki
0 siblings, 0 replies; 12+ messages in thread
From: Rafael J. Wysocki @ 2023-01-25 11:42 UTC (permalink / raw)
To: Daniel Lezcano
Cc: Linux PM, Srinivas Pandruvada, LKML, Linux ACPI, Zhang Rui,
Rafael J. Wysocki
On Tue, Jan 24, 2023 at 9:43 PM Rafael J. Wysocki <rafael@kernel.org> wrote:
>
> On Mon, Jan 23, 2023 at 7:41 PM Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
> >
> > From: Daniel Lezcano <daniel.lezcano@linaro.org>
> >
> > The thermal framework gives the possibility to register the trip
> > points along with the thermal zone. When that is done, no get_trip_*
> > callbacks are needed and they can be removed.
> >
> > Convert the existing callbacks content logic into generic trip points
> > initialization code and register them along with the thermal zone.
> >
> > In order to consolidate the code, use ACPI trip library functions to
> > populate generic trip points.
> >
> > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> > Reviewed-by: Zhang Rui <rui.zhang@intel.com>
> > [ rjw: Subject and changelog edits, rebase ]
> > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> This fix from Srinivas:
>
> https://lore.kernel.org/linux-pm/20230123172110.376549-1-srinivas.pandruvada@linux.intel.com/
>
> clearly shows that there are problems with this patch.
>
> > ---
> > drivers/thermal/intel/int340x_thermal/Kconfig | 1
> > drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c | 172 ++---------
> > drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h | 10
> > 3 files changed, 48 insertions(+), 135 deletions(-)
> >
> > Index: linux-pm/drivers/thermal/intel/int340x_thermal/Kconfig
> > ===================================================================
> > --- linux-pm.orig/drivers/thermal/intel/int340x_thermal/Kconfig
> > +++ linux-pm/drivers/thermal/intel/int340x_thermal/Kconfig
> > @@ -9,6 +9,7 @@ config INT340X_THERMAL
> > select THERMAL_GOV_USER_SPACE
> > select ACPI_THERMAL_REL
> > select ACPI_FAN
> > + select THERMAL_ACPI
> > select INTEL_SOC_DTS_IOSF_CORE
> > select INTEL_TCC
> > select PROC_THERMAL_MMIO_RAPL if POWERCAP
> > Index: linux-pm/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
> > ===================================================================
> > --- linux-pm.orig/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
> > +++ linux-pm/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
> > @@ -37,65 +37,6 @@ static int int340x_thermal_get_zone_temp
> > return 0;
> > }
> >
> > -static int int340x_thermal_get_trip_temp(struct thermal_zone_device *zone,
> > - int trip, int *temp)
> > -{
> > - struct int34x_thermal_zone *d = zone->devdata;
> > - int i;
> > -
> > - if (trip < d->aux_trip_nr)
> > - *temp = d->aux_trips[trip];
> > - else if (trip == d->crt_trip_id)
> > - *temp = d->crt_temp;
> > - else if (trip == d->psv_trip_id)
> > - *temp = d->psv_temp;
> > - else if (trip == d->hot_trip_id)
> > - *temp = d->hot_temp;
> > - else {
> > - for (i = 0; i < INT340X_THERMAL_MAX_ACT_TRIP_COUNT; i++) {
> > - if (d->act_trips[i].valid &&
> > - d->act_trips[i].id == trip) {
> > - *temp = d->act_trips[i].temp;
> > - break;
> > - }
> > - }
> > - if (i == INT340X_THERMAL_MAX_ACT_TRIP_COUNT)
> > - return -EINVAL;
> > - }
> > -
> > - return 0;
> > -}
> > -
> > -static int int340x_thermal_get_trip_type(struct thermal_zone_device *zone,
> > - int trip,
> > - enum thermal_trip_type *type)
> > -{
> > - struct int34x_thermal_zone *d = zone->devdata;
> > - int i;
> > -
> > - if (trip < d->aux_trip_nr)
> > - *type = THERMAL_TRIP_PASSIVE;
> > - else if (trip == d->crt_trip_id)
> > - *type = THERMAL_TRIP_CRITICAL;
> > - else if (trip == d->hot_trip_id)
> > - *type = THERMAL_TRIP_HOT;
> > - else if (trip == d->psv_trip_id)
> > - *type = THERMAL_TRIP_PASSIVE;
> > - else {
> > - for (i = 0; i < INT340X_THERMAL_MAX_ACT_TRIP_COUNT; i++) {
> > - if (d->act_trips[i].valid &&
> > - d->act_trips[i].id == trip) {
> > - *type = THERMAL_TRIP_ACTIVE;
> > - break;
> > - }
> > - }
> > - if (i == INT340X_THERMAL_MAX_ACT_TRIP_COUNT)
> > - return -EINVAL;
> > - }
> > -
> > - return 0;
> > -}
> > -
> > static int int340x_thermal_set_trip_temp(struct thermal_zone_device *zone,
> > int trip, int temp)
> > {
> > @@ -109,20 +50,15 @@ static int int340x_thermal_set_trip_temp
> > if (ACPI_FAILURE(status))
> > return -EIO;
> >
> > - d->aux_trips[trip] = temp;
> > -
> > return 0;
> > }
> >
> > -
> > -static int int340x_thermal_get_trip_hyst(struct thermal_zone_device *zone,
> > - int trip, int *temp)
> > +static int int340x_thermal_get_global_hyst(struct acpi_device *adev, int *temp)
> > {
> > - struct int34x_thermal_zone *d = zone->devdata;
> > acpi_status status;
> > unsigned long long hyst;
> >
> > - status = acpi_evaluate_integer(d->adev->handle, "GTSH", NULL, &hyst);
> > + status = acpi_evaluate_integer(adev->handle, "GTSH", NULL, &hyst);
> > if (ACPI_FAILURE(status))
> > *temp = 0;
> > else
> > @@ -131,6 +67,7 @@ static int int340x_thermal_get_trip_hyst
> > return 0;
> > }
> >
> > +
> > static void int340x_thermal_critical(struct thermal_zone_device *zone)
> > {
> > dev_dbg(&zone->device, "%s: critical temperature reached\n", zone->type);
> > @@ -138,58 +75,36 @@ static void int340x_thermal_critical(str
> >
> > static struct thermal_zone_device_ops int340x_thermal_zone_ops = {
> > .get_temp = int340x_thermal_get_zone_temp,
> > - .get_trip_temp = int340x_thermal_get_trip_temp,
> > - .get_trip_type = int340x_thermal_get_trip_type,
> > .set_trip_temp = int340x_thermal_set_trip_temp,
> > - .get_trip_hyst = int340x_thermal_get_trip_hyst,
> > .critical = int340x_thermal_critical,
> > };
> >
> > -static int int340x_thermal_get_trip_config(acpi_handle handle, char *name,
> > - int *temp)
> > -{
> > - unsigned long long r;
> > - acpi_status status;
> > -
> > - status = acpi_evaluate_integer(handle, name, NULL, &r);
> > - if (ACPI_FAILURE(status))
> > - return -EIO;
> > -
> > - *temp = deci_kelvin_to_millicelsius(r);
> > -
> > - return 0;
> > -}
> > -
> > int int340x_thermal_read_trips(struct int34x_thermal_zone *int34x_zone)
>
> First of all, this function can be invoked from int3403_notify() to
> update the trip points in the case of a firmware notification.
>
> This, of course, can be racing with the thermal core's use of the trip
> points and I don't think that there is a way to synchronize that right
> now.
>
> Second, the hysteresis value set by int340x_thermal_zone_add() will be
> overwritten with zero by the new code below.
>
> I'm dropping this one for now (and the fix on top of it) and we'll
> need to revisit it.
Fortunately, it looks like tz->lock is held around all invocations of
__thermal_zone_get_trip(), or at least it should be, so in principle
int3403_notify() can be made acquire tz->lock around trip updates too,
so the local mutex won't be needed any more.
Now, int3403_notify() cannot just call int340x_thermal_read_trips() as
it does now, because the trips have already been exposed via sysfs at
that point and they pretty much have to continue to be what they are,
only the temperature may change (or become invalid).
Let me try to sort this out before we continue with the transition to
the trips table.
> > {
> > - int trip_cnt = int34x_zone->aux_trip_nr;
> > - int i;
> > + int trip_cnt;
> > + int i, ret;
> >
> > - int34x_zone->crt_trip_id = -1;
> > - if (!int340x_thermal_get_trip_config(int34x_zone->adev->handle, "_CRT",
> > - &int34x_zone->crt_temp))
> > - int34x_zone->crt_trip_id = trip_cnt++;
> > -
> > - int34x_zone->hot_trip_id = -1;
> > - if (!int340x_thermal_get_trip_config(int34x_zone->adev->handle, "_HOT",
> > - &int34x_zone->hot_temp))
> > - int34x_zone->hot_trip_id = trip_cnt++;
> > -
> > - int34x_zone->psv_trip_id = -1;
> > - if (!int340x_thermal_get_trip_config(int34x_zone->adev->handle, "_PSV",
> > - &int34x_zone->psv_temp))
> > - int34x_zone->psv_trip_id = trip_cnt++;
> > + trip_cnt = int34x_zone->aux_trip_nr;
> > +
> > + ret = thermal_acpi_trip_critical(int34x_zone->adev, &int34x_zone->trips[trip_cnt]);
> > + if (!ret)
> > + trip_cnt++;
> > +
> > + ret = thermal_acpi_trip_hot(int34x_zone->adev, &int34x_zone->trips[trip_cnt]);
> > + if (!ret)
> > + trip_cnt++;
> > +
> > + ret = thermal_acpi_trip_passive(int34x_zone->adev, &int34x_zone->trips[trip_cnt]);
> > + if (!ret)
> > + trip_cnt++;
> >
> > for (i = 0; i < INT340X_THERMAL_MAX_ACT_TRIP_COUNT; i++) {
> > - char name[5] = { '_', 'A', 'C', '0' + i, '\0' };
> >
> > - if (int340x_thermal_get_trip_config(int34x_zone->adev->handle,
> > - name,
> > - &int34x_zone->act_trips[i].temp))
> > + ret = thermal_acpi_trip_active(int34x_zone->adev, i, &int34x_zone->trips[trip_cnt]);
> > + if (ret)
> > break;
> >
> > - int34x_zone->act_trips[i].id = trip_cnt++;
> > - int34x_zone->act_trips[i].valid = true;
> > + trip_cnt++;
> > }
> >
> > return trip_cnt;
> > @@ -208,7 +123,7 @@ struct int34x_thermal_zone *int340x_ther
> > acpi_status status;
> > unsigned long long trip_cnt;
> > int trip_mask = 0;
> > - int ret;
> > + int i, ret;
> >
> > int34x_thermal_zone = kzalloc(sizeof(*int34x_thermal_zone),
> > GFP_KERNEL);
> > @@ -228,32 +143,35 @@ struct int34x_thermal_zone *int340x_ther
> > int34x_thermal_zone->ops->get_temp = get_temp;
> >
> > status = acpi_evaluate_integer(adev->handle, "PATC", NULL, &trip_cnt);
> > - if (ACPI_FAILURE(status))
> > - trip_cnt = 0;
> > - else {
> > - int i;
> > -
> > - int34x_thermal_zone->aux_trips =
> > - kcalloc(trip_cnt,
> > - sizeof(*int34x_thermal_zone->aux_trips),
> > - GFP_KERNEL);
> > - if (!int34x_thermal_zone->aux_trips) {
> > - ret = -ENOMEM;
> > - goto err_trip_alloc;
> > - }
> > - trip_mask = BIT(trip_cnt) - 1;
> > + if (!ACPI_FAILURE(status)) {
> > int34x_thermal_zone->aux_trip_nr = trip_cnt;
> > - for (i = 0; i < trip_cnt; ++i)
> > - int34x_thermal_zone->aux_trips[i] = THERMAL_TEMP_INVALID;
> > + trip_mask = BIT(trip_cnt) - 1;
> > + }
> > +
> > + int34x_thermal_zone->trips = kzalloc(sizeof(*int34x_thermal_zone->trips) *
> > + (INT340X_THERMAL_MAX_TRIP_COUNT + trip_cnt),
> > + GFP_KERNEL);
> > + if (!int34x_thermal_zone->trips) {
> > + ret = -ENOMEM;
> > + goto err_trips_alloc;
> > }
> >
> > trip_cnt = int340x_thermal_read_trips(int34x_thermal_zone);
> >
> > + for (i = 0; i < trip_cnt; ++i)
> > + int340x_thermal_get_global_hyst(adev, &int34x_thermal_zone->trips[i].hysteresis);
> > +
> > + for (i = 0; i < int34x_thermal_zone->aux_trip_nr; i++) {
> > + int34x_thermal_zone->trips[i].type = THERMAL_TRIP_PASSIVE;
> > + int34x_thermal_zone->trips[i].temperature = THERMAL_TEMP_INVALID;
> > + }
> > +
> > int34x_thermal_zone->lpat_table = acpi_lpat_get_conversion_table(
> > adev->handle);
> >
> > - int34x_thermal_zone->zone = thermal_zone_device_register(
> > + int34x_thermal_zone->zone = thermal_zone_device_register_with_trips(
> > acpi_device_bid(adev),
> > + int34x_thermal_zone->trips,
> > trip_cnt,
> > trip_mask, int34x_thermal_zone,
> > int34x_thermal_zone->ops,
> > @@ -272,9 +190,9 @@ struct int34x_thermal_zone *int340x_ther
> > err_enable:
> > thermal_zone_device_unregister(int34x_thermal_zone->zone);
> > err_thermal_zone:
> > + kfree(int34x_thermal_zone->trips);
> > acpi_lpat_free_conversion_table(int34x_thermal_zone->lpat_table);
> > - kfree(int34x_thermal_zone->aux_trips);
> > -err_trip_alloc:
> > +err_trips_alloc:
> > kfree(int34x_thermal_zone->ops);
> > err_ops_alloc:
> > kfree(int34x_thermal_zone);
> > @@ -287,7 +205,7 @@ void int340x_thermal_zone_remove(struct
> > {
> > thermal_zone_device_unregister(int34x_thermal_zone->zone);
> > acpi_lpat_free_conversion_table(int34x_thermal_zone->lpat_table);
> > - kfree(int34x_thermal_zone->aux_trips);
> > + kfree(int34x_thermal_zone->trips);
> > kfree(int34x_thermal_zone->ops);
> > kfree(int34x_thermal_zone);
> > }
> > Index: linux-pm/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h
> > ===================================================================
> > --- linux-pm.orig/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h
> > +++ linux-pm/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h
> > @@ -10,6 +10,7 @@
> > #include <acpi/acpi_lpat.h>
> >
> > #define INT340X_THERMAL_MAX_ACT_TRIP_COUNT 10
> > +#define INT340X_THERMAL_MAX_TRIP_COUNT INT340X_THERMAL_MAX_ACT_TRIP_COUNT + 3
> >
> > struct active_trip {
> > int temp;
> > @@ -19,15 +20,8 @@ struct active_trip {
> >
> > struct int34x_thermal_zone {
> > struct acpi_device *adev;
> > - struct active_trip act_trips[INT340X_THERMAL_MAX_ACT_TRIP_COUNT];
> > - unsigned long *aux_trips;
> > + struct thermal_trip *trips;
> > int aux_trip_nr;
> > - int psv_temp;
> > - int psv_trip_id;
> > - int crt_temp;
> > - int crt_trip_id;
> > - int hot_temp;
> > - int hot_trip_id;
> > struct thermal_zone_device *zone;
> > struct thermal_zone_device_ops *ops;
> > void *priv_data;
> >
> >
> >
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v7 0/3] thermal: intel: Use generic trip points in 2 drivers
2023-01-23 18:36 [PATCH v7 0/3] thermal: intel: Use generic trip points in 2 drivers Rafael J. Wysocki
` (2 preceding siblings ...)
2023-01-23 18:41 ` [PATCH v7 3/3] thermal: intel: int340x: " Rafael J. Wysocki
@ 2023-01-23 18:45 ` Rafael J. Wysocki
2023-01-23 18:52 ` Rafael J. Wysocki
3 siblings, 1 reply; 12+ messages in thread
From: Rafael J. Wysocki @ 2023-01-23 18:45 UTC (permalink / raw)
To: Linux PM, Srinivas Pandruvada; +Cc: LKML, Linux ACPI, Daniel Lezcano, Zhang Rui
On Monday, January 23, 2023 7:36:52 PM CET Rafael J. Wysocki wrote:
> Hi All,
>
> This is a new version of the series from Daniel posted as:
>
> https://lore.kernel.org/linux-pm/20230120231530.2368330-1-daniel.lezcano@linaro.org/
>
> The first patch has been reworked (see https://lore.kernel.org/linux-pm/5911499.lOV4Wx5bFT@kreacher/)
> and the other two have been rebased on top of it.
>
> I have retained the R-by tags from Rui, because the changes in patches [2-3/3] are
> not essential, but I think that this new set needs to be tested again.
>
> Srinivas, can you test it please?
Something's wrong, sorry.
I get some invalid trip temperatures with this set.
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH v7 0/3] thermal: intel: Use generic trip points in 2 drivers
2023-01-23 18:45 ` [PATCH v7 0/3] thermal: intel: Use generic trip points in 2 drivers Rafael J. Wysocki
@ 2023-01-23 18:52 ` Rafael J. Wysocki
2023-01-23 19:26 ` srinivas pandruvada
0 siblings, 1 reply; 12+ messages in thread
From: Rafael J. Wysocki @ 2023-01-23 18:52 UTC (permalink / raw)
To: Linux PM, Srinivas Pandruvada; +Cc: LKML, Linux ACPI, Daniel Lezcano, Zhang Rui
On Monday, January 23, 2023 7:45:30 PM CET Rafael J. Wysocki wrote:
> On Monday, January 23, 2023 7:36:52 PM CET Rafael J. Wysocki wrote:
> > Hi All,
> >
> > This is a new version of the series from Daniel posted as:
> >
> > https://lore.kernel.org/linux-pm/20230120231530.2368330-1-daniel.lezcano@linaro.org/
> >
> > The first patch has been reworked (see https://lore.kernel.org/linux-pm/5911499.lOV4Wx5bFT@kreacher/)
> > and the other two have been rebased on top of it.
> >
> > I have retained the R-by tags from Rui, because the changes in patches [2-3/3] are
> > not essential, but I think that this new set needs to be tested again.
> >
> > Srinivas, can you test it please?
>
> Something's wrong, sorry.
>
> I get some invalid trip temperatures with this set.
Sorry, scratch this, I got confused by THERMAL_TEMP_INVALID showing up in
sysfs, but it did show up before too.
Please test!
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v7 0/3] thermal: intel: Use generic trip points in 2 drivers
2023-01-23 18:52 ` Rafael J. Wysocki
@ 2023-01-23 19:26 ` srinivas pandruvada
2023-01-23 19:54 ` Rafael J. Wysocki
0 siblings, 1 reply; 12+ messages in thread
From: srinivas pandruvada @ 2023-01-23 19:26 UTC (permalink / raw)
To: Rafael J. Wysocki, Linux PM; +Cc: LKML, Linux ACPI, Daniel Lezcano, Zhang Rui
On Mon, 2023-01-23 at 19:52 +0100, Rafael J. Wysocki wrote:
> On Monday, January 23, 2023 7:45:30 PM CET Rafael J. Wysocki wrote:
> > On Monday, January 23, 2023 7:36:52 PM CET Rafael J. Wysocki wrote:
> > > Hi All,
> > >
> > > This is a new version of the series from Daniel posted as:
> > >
> > > https://lore.kernel.org/linux-pm/20230120231530.2368330-1-daniel.lezcano@linaro.org/
> > >
> > > The first patch has been reworked (see
> > > https://lore.kernel.org/linux-pm/5911499.lOV4Wx5bFT@kreacher/)
> > > and the other two have been rebased on top of it.
> > >
> > > I have retained the R-by tags from Rui, because the changes in
> > > patches [2-3/3] are
> > > not essential, but I think that this new set needs to be tested
> > > again.
> > >
> > > Srinivas, can you test it please?
> >
> > Something's wrong, sorry.
> >
> > I get some invalid trip temperatures with this set.
>
> Sorry, scratch this, I got confused by THERMAL_TEMP_INVALID showing
> up in
> sysfs, but it did show up before too.
>
> Please test!
>
>
>
> It will be easy if you have some test branch to avoid dependecies on
> other patches.
Thanks,
Srinivas
>
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v7 0/3] thermal: intel: Use generic trip points in 2 drivers
2023-01-23 19:26 ` srinivas pandruvada
@ 2023-01-23 19:54 ` Rafael J. Wysocki
2023-01-23 21:35 ` srinivas pandruvada
0 siblings, 1 reply; 12+ messages in thread
From: Rafael J. Wysocki @ 2023-01-23 19:54 UTC (permalink / raw)
To: srinivas pandruvada
Cc: Rafael J. Wysocki, Linux PM, LKML, Linux ACPI, Daniel Lezcano,
Zhang Rui
On Mon, Jan 23, 2023 at 8:26 PM srinivas pandruvada
<srinivas.pandruvada@linux.intel.com> wrote:
>
> On Mon, 2023-01-23 at 19:52 +0100, Rafael J. Wysocki wrote:
> > On Monday, January 23, 2023 7:45:30 PM CET Rafael J. Wysocki wrote:
> > > On Monday, January 23, 2023 7:36:52 PM CET Rafael J. Wysocki wrote:
> > > > Hi All,
> > > >
> > > > This is a new version of the series from Daniel posted as:
> > > >
> > > > https://lore.kernel.org/linux-pm/20230120231530.2368330-1-daniel.lezcano@linaro.org/
> > > >
> > > > The first patch has been reworked (see
> > > > https://lore.kernel.org/linux-pm/5911499.lOV4Wx5bFT@kreacher/)
> > > > and the other two have been rebased on top of it.
> > > >
> > > > I have retained the R-by tags from Rui, because the changes in
> > > > patches [2-3/3] are
> > > > not essential, but I think that this new set needs to be tested
> > > > again.
> > > >
> > > > Srinivas, can you test it please?
> > >
> > > Something's wrong, sorry.
> > >
> > > I get some invalid trip temperatures with this set.
> >
> > Sorry, scratch this, I got confused by THERMAL_TEMP_INVALID showing
> > up in
> > sysfs, but it did show up before too.
> >
> > Please test!
> >
>
> >
>
> >
> It will be easy if you have some test branch to avoid dependecies on
> other patches.
Please see the thermal-intel-test branch in linux-pm.git. It's this
series on top of the core thermal stuff + ARM drivers.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v7 0/3] thermal: intel: Use generic trip points in 2 drivers
2023-01-23 19:54 ` Rafael J. Wysocki
@ 2023-01-23 21:35 ` srinivas pandruvada
2023-01-24 14:52 ` Rafael J. Wysocki
0 siblings, 1 reply; 12+ messages in thread
From: srinivas pandruvada @ 2023-01-23 21:35 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Rafael J. Wysocki, Linux PM, LKML, Linux ACPI, Daniel Lezcano,
Zhang Rui
On Mon, 2023-01-23 at 20:54 +0100, Rafael J. Wysocki wrote:
> On Mon, Jan 23, 2023 at 8:26 PM srinivas pandruvada
> <srinivas.pandruvada@linux.intel.com> wrote:
> >
> > On Mon, 2023-01-23 at 19:52 +0100, Rafael J. Wysocki wrote:
> > > On Monday, January 23, 2023 7:45:30 PM CET Rafael J. Wysocki
> > > wrote:
> > > > On Monday, January 23, 2023 7:36:52 PM CET Rafael J. Wysocki
> > > > wrote:
> > > > > Hi All,
> > > > >
> > > > > This is a new version of the series from Daniel posted as:
> > > > >
> > > > > https://lore.kernel.org/linux-pm/20230120231530.2368330-1-daniel.lezcano@linaro.org/
> > > > >
> > > > > The first patch has been reworked (see
> > > > > https://lore.kernel.org/linux-pm/5911499.lOV4Wx5bFT@kreacher/
> > > > > )
> > > > > and the other two have been rebased on top of it.
> > > > >
> > > > > I have retained the R-by tags from Rui, because the changes
> > > > > in
> > > > > patches [2-3/3] are
> > > > > not essential, but I think that this new set needs to be
> > > > > tested
> > > > > again.
> > > > >
> > > > > Srinivas, can you test it please?
> > > >
> > > > Something's wrong, sorry.
> > > >
> > > > I get some invalid trip temperatures with this set.
> > >
> > > Sorry, scratch this, I got confused by THERMAL_TEMP_INVALID
> > > showing
> > > up in
> > > sysfs, but it did show up before too.
> > >
> > > Please test!
> > >
> >
> > >
> >
> > >
> > It will be easy if you have some test branch to avoid dependecies
> > on
> > other patches.
>
> Please see the thermal-intel-test branch in linux-pm.git. It's this
> series on top of the core thermal stuff + ARM drivers.
Tested on one system. Works fine.
Thanks,
Srinivas
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v7 0/3] thermal: intel: Use generic trip points in 2 drivers
2023-01-23 21:35 ` srinivas pandruvada
@ 2023-01-24 14:52 ` Rafael J. Wysocki
0 siblings, 0 replies; 12+ messages in thread
From: Rafael J. Wysocki @ 2023-01-24 14:52 UTC (permalink / raw)
To: srinivas pandruvada
Cc: Rafael J. Wysocki, Rafael J. Wysocki, Linux PM, LKML, Linux ACPI,
Daniel Lezcano, Zhang Rui
On Mon, Jan 23, 2023 at 10:35 PM srinivas pandruvada
<srinivas.pandruvada@linux.intel.com> wrote:
>
> On Mon, 2023-01-23 at 20:54 +0100, Rafael J. Wysocki wrote:
> > On Mon, Jan 23, 2023 at 8:26 PM srinivas pandruvada
> > <srinivas.pandruvada@linux.intel.com> wrote:
> > >
> > > On Mon, 2023-01-23 at 19:52 +0100, Rafael J. Wysocki wrote:
> > > > On Monday, January 23, 2023 7:45:30 PM CET Rafael J. Wysocki
> > > > wrote:
> > > > > On Monday, January 23, 2023 7:36:52 PM CET Rafael J. Wysocki
> > > > > wrote:
> > > > > > Hi All,
> > > > > >
> > > > > > This is a new version of the series from Daniel posted as:
> > > > > >
> > > > > > https://lore.kernel.org/linux-pm/20230120231530.2368330-1-daniel.lezcano@linaro.org/
> > > > > >
> > > > > > The first patch has been reworked (see
> > > > > > https://lore.kernel.org/linux-pm/5911499.lOV4Wx5bFT@kreacher/
> > > > > > )
> > > > > > and the other two have been rebased on top of it.
> > > > > >
> > > > > > I have retained the R-by tags from Rui, because the changes
> > > > > > in
> > > > > > patches [2-3/3] are
> > > > > > not essential, but I think that this new set needs to be
> > > > > > tested
> > > > > > again.
> > > > > >
> > > > > > Srinivas, can you test it please?
> > > > >
> > > > > Something's wrong, sorry.
> > > > >
> > > > > I get some invalid trip temperatures with this set.
> > > >
> > > > Sorry, scratch this, I got confused by THERMAL_TEMP_INVALID
> > > > showing
> > > > up in
> > > > sysfs, but it did show up before too.
> > > >
> > > > Please test!
> > > >
> > >
> > > >
> > >
> > > >
> > > It will be easy if you have some test branch to avoid dependecies
> > > on
> > > other patches.
> >
> > Please see the thermal-intel-test branch in linux-pm.git. It's this
> > series on top of the core thermal stuff + ARM drivers.
> Tested on one system. Works fine.
Thanks!
I'll add a T-by from you to the series (which will be moved to the
thermal-intel branch).
^ permalink raw reply [flat|nested] 12+ messages in thread