Skip to contentSkip to conversation

thermal: intel: Use generic trip points in 2 drivers

PATCH In review Rafael J. Wysocki 3 participants 12 messages Jan 23, 2023 – Jan 25, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v7 cover thermal: intel: Use generic trip points in 2 drivers

Hi All,

This is a new version of the series from Daniel posted as:

https://lore.kernel.org/linux-pm/[email protected]/

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?

Thanks!

#1 lore raw

PATCH v7 1/3 thermal: ACPI: Add ACPI trip point routines

From: Rafael J. Wysocki <[email protected]>

Add library routines to populate a generic thermal trip point structure with data obtained by evaluating a specific object in the ACPI Namespace.

---
 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
drivers/thermal/Kconfig +4 -0
Index: 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
drivers/thermal/Makefile +1 -0
Index: 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
drivers/thermal/thermal_acpi.c new file +150 -0

150 lines not on this page · raw message

include/linux/thermal.h +8 -0
Index: 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 *,
#2 lore raw

PATCH v7 2/3 thermal: intel: intel_pch: Use generic trip points

In reply to Rafael J. Wysocki

From: Daniel Lezcano <[email protected]>

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.

[ rjw: Subject and changelog edits, rebase ]
---
 drivers/thermal/intel/Kconfig             |    1 
 drivers/thermal/intel/intel_pch_thermal.c |   88 ++++++------------------------
 2 files changed, 20 insertions(+), 69 deletions(-)
drivers/thermal/intel/Kconfig +1 -0
Index: 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,
drivers/thermal/intel/intel_pch_thermal.c +19 -69

146 lines not on this page · raw message

#3 lore raw

PATCH v7 3/3 thermal: intel: int340x: Use generic trip points

In reply to Rafael J. Wysocki

From: Daniel Lezcano <[email protected]>

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.

[ rjw: Subject and changelog edits, rebase ]
---
 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(-)
drivers/thermal/intel/int340x_thermal/Kconfig +1 -0
Index: 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
drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c +45 -127

249 lines not on this page · raw message

drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h +2 -8
Index: 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;
#4 lore raw

Re: [PATCH v7 3/3] thermal: intel: int340x: Use generic trip points

Quoted 10 lines · Rafael J. Wysocki

From: Daniel Lezcano <[email protected]>

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.

Quoted 7 lines

In order to consolidate the code, use ACPI trip library functions to populate generic trip points.

[ rjw: Subject and changelog edits, rebase ]

This fix from Srinivas:

https://lore.kernel.org/linux-pm/[email protected]/

clearly shows that there are problems with this patch.

Quoted 136 lines
---
 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
===================================================================

drivers/thermal/intel/int340x_thermal/Kconfig +1 -0
@@ -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
===================================================================

drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c +3 -75
@@ -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;
-

drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c static void int340x_thermal_critical(str · line 82

Quoted 10 lines
drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c +0 -9
-       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.

Quoted 165 lines
drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c +42 -43
 {
-       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
===================================================================

drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h +2 -8
@@ -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;
#5 lore raw

Re: [PATCH v7 3/3] thermal: intel: int340x: Use generic trip points

Quoted 180 lines · Rafael J. Wysocki
Quoted 10 lines · Rafael J. Wysocki

From: Daniel Lezcano <[email protected]>

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.

Quoted 7 lines

In order to consolidate the code, use ACPI trip library functions to populate generic trip points.

[ rjw: Subject and changelog edits, rebase ]

This fix from Srinivas:

https://lore.kernel.org/linux-pm/[email protected]/

clearly shows that there are problems with this patch.

Quoted 136 lines
---
 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
===================================================================

drivers/thermal/intel/int340x_thermal/Kconfig +1 -0
@@ -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
===================================================================

drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c +3 -75
@@ -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;
-

drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c static void int340x_thermal_critical(str · line 82

Quoted 10 lines
drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c +0 -9
-       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.

Quoted 5 lines

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.

Quoted 165 lines
Quoted 165 lines
drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c +42 -43
 {
-       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
===================================================================

drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h +2 -8
@@ -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;
#6 lore raw
In reply to Rafael J. Wysocki
Quoted 6 lines · CET Rafael J. Wysocki

Hi All,

This is a new version of the series from Daniel posted as:

https://lore.kernel.org/linux-pm/[email protected]/

Quoted 7 lines

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.

#7 lore raw
Quoted 10 lines · CET Rafael J. Wysocki
Quoted 9 lines · CET Rafael J. Wysocki

Hi All,

This is a new version of the series from Daniel posted as:

https://lore.kernel.org/linux-pm/[email protected]/

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.

Quoted 8 lines
Quoted 4 lines

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!

#8 lore raw
Quoted 27 lines · Rafael J. Wysocki
Quoted 16 lines · CET Rafael J. Wysocki
Quoted 15 lines · CET Rafael J. Wysocki

Hi All,

This is a new version of the series from Daniel posted as:

https://lore.kernel.org/linux-pm/[email protected]/

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.

Quoted 5 lines
Quoted 1 line

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.

Quoted 8 lines

Please test!

It will be easy if you have some test branch to avoid dependecies on other patches.

Thanks,
Srinivas

Quoted 2 lines
#9 lore raw
Quoted 29 lines · srinivas pandruvada
Quoted 27 lines · Rafael J. Wysocki
Quoted 16 lines · CET Rafael J. Wysocki
Quoted 15 lines · CET Rafael J. Wysocki

Hi All,

This is a new version of the series from Daniel posted as:

https://lore.kernel.org/linux-pm/[email protected]/

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.

Quoted 5 lines
Quoted 1 line

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.

Quoted 8 lines
Quoted 6 lines

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.

#10 lore raw
Quoted 43 lines · Rafael J. Wysocki
Quoted 41 lines · srinivas pandruvada
Quoted 39 lines · Rafael J. Wysocki
Quoted 20 lines · CET Rafael J. Wysocki
Quoted 18 lines · CET Rafael J. Wysocki

Hi All,

This is a new version of the series from Daniel posted as:

https://lore.kernel.org/linux-pm/[email protected]/

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.

Quoted 5 lines
Quoted 1 line

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!

Quoted 6 lines
Quoted 3 lines

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

#11 lore raw
Quoted 45 lines · srinivas pandruvada
Quoted 43 lines · Rafael J. Wysocki
Quoted 41 lines · srinivas pandruvada
Quoted 39 lines · Rafael J. Wysocki
Quoted 20 lines · CET Rafael J. Wysocki
Quoted 18 lines · CET Rafael J. Wysocki

Hi All,

This is a new version of the series from Daniel posted as:

https://lore.kernel.org/linux-pm/[email protected]/

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.

Quoted 5 lines
Quoted 1 line

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!

Quoted 7 lines
Quoted 6 lines
Quoted 3 lines

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