LinuxLists.cc - [PATCH v3 0/3] Thermal ACPI APIs for generic trip points

2023-01-04 22:31:42

Subject: [PATCH v3 0/3] Thermal ACPI APIs for generic trip points

Recently sent as a RFC, the thermal ACPI for generic trip points is a set of
functions to fill the generic trip points structure which will become the
standard structure for the thermal framework and its users.

Different Intel drivers and the ACPI thermal driver are using the ACPI tables to
get the thermal zone information. As those are getting the same information,
providing this set of ACPI function with the generic trip points will
consolidate the code.

Also, the Intel PCH and the Intel 34xx drivers are converted to use the generic
trip points relying on the ACPI generic trip point parsing functions.

These changes have been tested on a Thinkpad Lenovo x280 with the PCH and
INT34xx drivers. No regression have been observed, the trip points remain the
same for what is described on this system.

Changelog:

- V3:
- Took into account Rafael's comments
- Used a silence option THERMAL_ACPI in order to stay consistent
with THERMAL_OF. It is up to the API user to select the option.

- V2:
- Fix the thermal ACPI patch where the thermal_acpi.c was not included in
the series
- Provide a couple of users of this API which could have been tested on a
real system

Daniel Lezcano (3):
thermal/acpi: Add ACPI trip point routines
thermal/drivers/intel: Use generic trip points for intel_pch
thermal/drivers/intel: Use generic trip points int340x

drivers/thermal/Kconfig | 4 +
drivers/thermal/Makefile | 1 +
drivers/thermal/intel/Kconfig | 1 +
drivers/thermal/intel/int340x_thermal/Kconfig | 1 +
.../int340x_thermal/int340x_thermal_zone.c | 177 ++++----------
.../int340x_thermal/int340x_thermal_zone.h | 10 +-
drivers/thermal/intel/intel_pch_thermal.c | 88 ++-----
drivers/thermal/thermal_acpi.c | 218 ++++++++++++++++++
include/linux/thermal.h | 8 +
9 files changed, 294 insertions(+), 214 deletions(-)
create mode 100644 drivers/thermal/thermal_acpi.c

--
2.34.1

2023-01-04 22:32:24

by Daniel Lezcano

[permalink] [raw]

Subject: [PATCH v3 2/3] thermal/drivers/intel: Use generic trip points for intel_pch

2023-01-04 22:56:51

by Daniel Lezcano

[permalink] [raw]

Subject: [PATCH v3 3/3] thermal/drivers/intel: Use generic trip points int340x

From: Daniel Lezcano <[email protected]>

The thermal framework gives the possibility to register the trip
points with the thermal zone. When that is done, no get_trip_* ops are
needed and they can be removed.

Convert the ops content logic into generic trip points and register
them with the thermal zone.

In order to consolidate the code, use the ACPI thermal framework API
to fill the generic trip point from the ACPI tables.

It has been tested on a Intel i7-8650U - x280 with the INT3400, the
PCH, ACPITZ, and x86_pkg_temp. No regression observed so far.

Signed-off-by: Daniel Lezcano <[email protected]>
---
V3:
- The driver Kconfig option selects CONFIG_THERMAL_ACPI
- Change the initialization to use GTSH for the hysteresis on
all the trip points

Signed-off-by: Daniel Lezcano <[email protected]>
---
drivers/thermal/intel/int340x_thermal/Kconfig | 1 +
.../int340x_thermal/int340x_thermal_zone.c | 177 ++++--------------
.../int340x_thermal/int340x_thermal_zone.h | 10 +-
3 files changed, 43 insertions(+), 145 deletions(-)

diff --git a/drivers/thermal/intel/int340x_thermal/Kconfig b/drivers/thermal/intel/int340x_thermal/Kconfig
index 5d046de96a5d..b7072d37101d 100644
--- a/drivers/thermal/intel/int340x_thermal/Kconfig
+++ b/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 PROC_THERMAL_MMIO_RAPL if POWERCAP
help
diff --git a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
index 228f44260b27..626b33253153 100644
--- a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
+++ b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
@@ -37,65 +37,6 @@ static int int340x_thermal_get_zone_temp(struct thermal_zone_device *zone,
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,25 +50,6 @@ static int int340x_thermal_set_trip_temp(struct thermal_zone_device *zone,
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)
-{
- struct int34x_thermal_zone *d = zone->devdata;
- acpi_status status;
- unsigned long long hyst;
-
- status = acpi_evaluate_integer(d->adev->handle, "GTSH", NULL, &hyst);
- if (ACPI_FAILURE(status))
- *temp = 0;
- else
- *temp = hyst * 100;
-
return 0;
}

@@ -138,58 +60,36 @@ static void int340x_thermal_critical(struct thermal_zone_device *zone)

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;
+
+ trip_cnt = int34x_zone->aux_trip_nr;

- 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++;
+ ret = thermal_acpi_trip_crit(int34x_zone->adev, &int34x_zone->trips[trip_cnt]);
+ if (!ret)
+ 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++;
+ ret = thermal_acpi_trip_hot(int34x_zone->adev, &int34x_zone->trips[trip_cnt]);
+ if (!ret)
+ 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++;
+ ret = thermal_acpi_trip_psv(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_act(int34x_zone->adev, &int34x_zone->trips[trip_cnt], i);
+ 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 +108,7 @@ struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev,
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 +128,35 @@ struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev,
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)
+ int34x_thermal_zone->trips[i].hysteresis = thermal_acpi_trip_gtsh(adev);
+
+ 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 +175,9 @@ struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev,
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 +190,7 @@ void int340x_thermal_zone_remove(struct int34x_thermal_zone
{
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);
}
diff --git a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h
index e28ab1ba5e06..0c2c8de92014 100644
--- a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h
+++ b/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;
--
2.34.1

2023-01-04 22:58:36

by Daniel Lezcano

[permalink] [raw]

Subject: [PATCH v3 1/3] thermal/acpi: Add ACPI trip point routines

From: Daniel Lezcano <[email protected]>

The ACPI specification describes the trip points, the device tree
bindings as well.

The OF code uses the generic trip point structures.

The ACPI has their own trip points structure and uses the get_trip_*
ops to retrieve them.

We can do the same as the OF code and create a set of ACPI functions
to retrieve a trip point description. Having a common code for ACPI
will help to cleanup the remaining Intel drivers and get rid of the
get_trip_* functions.

These changes add the ACPI thermal calls to retrieve the basic
information we need to be reused in the thermal ACPI and Intel
drivers.

The different ACPI functions have the generic trip point structure
passed as parameter where it is filled.

This structure aims to be the one used by all the thermal drivers and
the thermal framework.

After this series, a couple of Intel drivers and the ACPI thermal
driver will still have their own trip points definition but a new
series on top of this one will finish the conversion to the generic
trip point handling.

This series depends on the generic trip point added to the thermal
framework and available in the thermal/linux-next branch.

https://lkml.org/lkml/2022/10/3/456

It has been tested on a Intel i7-8650U - x280 with the INT3400, the
PCH, ACPITZ, and x86_pkg_temp. No regression observed so far.

Signed-off-by: Daniel Lezcano <[email protected]>
---
V3:
- Removed too simple wrappers
- Changed the API to return an error and check the validity of the value
- Removed the comments describing the objects
- Added kerneldoc
- Made the Kconfig option silent
- Set the hysteresis value to zero by default

V2:
- Fixed the missing thermal_acpi.c in the patch

Signed-off-by: Daniel Lezcano <[email protected]>
---
drivers/thermal/Kconfig | 4 +
drivers/thermal/Makefile | 1 +
drivers/thermal/thermal_acpi.c | 211 +++++++++++++++++++++++++++++++++
include/linux/thermal.h | 8 ++
4 files changed, 224 insertions(+)
create mode 100644 drivers/thermal/thermal_acpi.c

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index e052dae614eb..eaeb2b2ee6e9 100644
--- a/drivers/thermal/Kconfig
+++ b/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
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 2506c6c8ca83..60f0dfa9aae2 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -13,6 +13,7 @@ thermal_sys-$(CONFIG_THERMAL_NETLINK) += thermal_netlink.o
# 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
diff --git a/drivers/thermal/thermal_acpi.c b/drivers/thermal/thermal_acpi.c
new file mode 100644
index 000000000000..db0463ed05ec
--- /dev/null
+++ b/drivers/thermal/thermal_acpi.c
@@ -0,0 +1,211 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright 2022 Linaro Limited
+ *
+ * Author: Daniel Lezcano <[email protected]>
+ *
+ * ACPI thermal configuration
+ */
+#include <linux/acpi.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/units.h>
+#include <uapi/linux/thermal.h>
+
+#include "thermal_core.h"
+
+/*
+ * An hysteresis value below zero is invalid and we can consider a
+ * value greater than 20°K/°C is invalid too.
+ */
+#define HYSTERESIS_MIN_DECIK 0
+#define HYSTERESIS_MAX_DECIK 200
+
+/*
+ * 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 can be considered
+ * bogus and we can assume the firmware has no data to provide.
+ */
+#define TEMPERATURE_MIN_DECIK 2180
+#define TEMPERATURE_MAX_DECIK 4480
+
+static int thermal_acpi_get_temperature_object(struct acpi_device *adev,
+ char *object, int *temperature)
+{
+ unsigned long long temp;
+ acpi_status status;
+
+ status = acpi_evaluate_integer(adev->handle, object, NULL, &temp);
+ if (ACPI_FAILURE(status)) {
+ acpi_handle_debug(adev->handle, "No temperature object '%s'\n", object);
+ return -ENODEV;
+ }
+
+ if (temp < TEMPERATURE_MIN_DECIK || temp >= TEMPERATURE_MAX_DECIK) {
+ acpi_handle_info(adev->handle, "Invalid temperature '%llu deci°K' for object '%s'\n",
+ temp, object);
+ return -ENODATA;
+ }
+
+ *temperature = deci_kelvin_to_millicelsius(temp);
+
+ return 0;
+}
+
+/**
+ * thermal_acpi_trip_gtsh() - Get the global hysteresis value
+ * @adev: the acpi device to get the description from
+ *
+ * Get the global hysteresis value for the trip points. If any call
+ * fail, we shall return a zero hysteresis value.
+ *
+ * Return: An integer between %HYSTERESIS_MIN_DECIK and %HYSTERESIS_MAX_DECIK
+ */
+int thermal_acpi_trip_gtsh(struct acpi_device *adev)
+{
+ unsigned long long hyst;
+ acpi_status status;
+
+ status = acpi_evaluate_integer(adev->handle, "GTSH", NULL, &hyst);
+ if (ACPI_FAILURE(status))
+ return 0;
+
+ if (hyst < HYSTERESIS_MIN_DECIK || hyst >= HYSTERESIS_MAX_DECIK) {
+ acpi_handle_info(adev->handle, "Invalid hysteresis '%llu deci°K' for object 'GTSH'\n",
+ hyst);
+ return 0;
+ }
+
+ return (int)hyst;
+}
+EXPORT_SYMBOL_GPL(thermal_acpi_trip_gtsh);
+
+/**
+ * thermal_acpi_trip_act() - Get the specified active trip point
+ * @adev: the acpi device to get the description from
+ * @trip: a &struct thermal_trip to be filled if the function succeed
+ * @id: an integer speciyfing the active trip point id
+ *
+ * The function calls the ACPI framework to get the "_ACTx" and the
+ * 'GTSH' objects which describe the active trip points. The @id
+ * builds the "_ACTx" string with the numbered active trip point
+ * name. Then it fills the @trip structure with the information
+ * retrieved from those objects.
+ *
+ * Return:
+ * * 0 - Success
+ * * -ENODEV - Failed to retrieve the ACPI object
+ * * -ENODATA - The ACPI object value appears to be inconsistent
+ */
+int thermal_acpi_trip_act(struct acpi_device *adev,
+ struct thermal_trip *trip, int id)
+{
+ char name[5];
+ int ret;
+
+ sprintf(name, "_AC%d", id);
+
+ ret = thermal_acpi_get_temperature_object(adev, name, &trip->temperature);
+ if (ret)
+ return ret;
+
+ trip->hysteresis = 0;
+ trip->type = THERMAL_TRIP_ACTIVE;
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(thermal_acpi_trip_act);
+
+/**
+ * thermal_acpi_trip_psv() - Get the passive trip point
+ * @adev: the acpi device to get the description from
+ * @trip: a &struct thermal_trip to be filled if the function succeed
+ *
+ * The function calls the ACPI framework to get the "_PSV" object
+ * which describe the passive trip point. Then it fills the @trip
+ * structure with the information retrieved from those objects.
+ *
+ * Return:
+ * * 0 - Success
+ * * -ENODEV - Failed to retrieve the ACPI object
+ * * -ENODATA - The ACPI object value appears to be inconsistent
+ */
+int thermal_acpi_trip_psv(struct acpi_device *adev, struct thermal_trip *trip)
+{
+ int ret;
+
+ ret = thermal_acpi_get_temperature_object(adev, "_PSV", &trip->temperature);
+ if (ret)
+ return ret;
+
+ trip->hysteresis = 0;
+ trip->type = THERMAL_TRIP_PASSIVE;
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(thermal_acpi_trip_psv);
+
+/**
+ * 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
+ *
+ * The function calls the ACPI framework to get the "_HOT" and the
+ * 'GTSH' objects which describe the hot trip point. Then it fills the
+ * @trip structure with the information retrieved from those objects.
+ *
+ * Return:
+ * * 0 - Success
+ * * -ENODEV - Failed to retrieve the ACPI object
+ * * -ENODATA - The ACPI object appears to be inconsistent
+ */
+int thermal_acpi_trip_hot(struct acpi_device *adev, struct thermal_trip *trip)
+{
+ int ret;
+
+ ret = thermal_acpi_get_temperature_object(adev, "_HOT", &trip->temperature);
+ if (ret)
+ return ret;
+
+ trip->hysteresis = 0;
+ trip->type = THERMAL_TRIP_HOT;
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(thermal_acpi_trip_hot);
+
+/**
+ * thermal_acpi_trip_crit() - 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
+ *
+ * The function calls the ACPI framework to get the "_CRT" object
+ * which describe the critical trip point. Then it fills the @trip
+ * structure with the information retrieved from this object.
+ *
+ * Return:
+ * * 0 - Success
+ * * -ENODEV - Failed to retrieve the ACPI object
+ * * -ENODATA - The ACPI object value appears to be inconsistent
+ */
+int thermal_acpi_trip_crit(struct acpi_device *adev, struct thermal_trip *trip)
+{
+ int ret;
+
+ ret = thermal_acpi_get_temperature_object(adev, "_CRT", &trip->temperature);
+ if (ret)
+ return ret;
+
+ /*
+ * The hysteresis value has no sense here because critical
+ * trip point has no u-turn
+ */
+ trip->hysteresis = 0;
+ trip->type = THERMAL_TRIP_CRITICAL;
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(thermal_acpi_trip_crit);
+
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 30353e4b1424..ba2d5d4c23e2 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -334,6 +334,14 @@ static inline void devm_thermal_of_zone_unregister(struct device *dev,
}
#endif

+#ifdef CONFIG_THERMAL_ACPI
+int thermal_acpi_trip_gtsh(struct acpi_device *adev);
+int thermal_acpi_trip_crit(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_psv(struct acpi_device *adev, struct thermal_trip *trip);
+int thermal_acpi_trip_act(struct acpi_device *adev, struct thermal_trip *trip, int id);
+#endif
+
int __thermal_zone_get_trip(struct thermal_zone_device *tz, int trip_id,
struct thermal_trip *trip);
int thermal_zone_get_trip(struct thermal_zone_device *tz, int trip_id,
--
2.34.1

2023-01-06 08:47:59

by Zhang, Rui

[permalink] [raw]

Subject: Re: [PATCH v3 0/3] Thermal ACPI APIs for generic trip points

Hi, Daniel,

On Wed, 2023-01-04 at 23:21 +0100, Daniel Lezcano wrote:
> Recently sent as a RFC, the thermal ACPI for generic trip points is a
> set of
> functions to fill the generic trip points structure which will become
> the
> standard structure for the thermal framework and its users.
>
> Different Intel drivers and the ACPI thermal driver are using the
> ACPI tables to
> get the thermal zone information. As those are getting the same
> information,
> providing this set of ACPI function with the generic trip points will
> consolidate the code.

My understanding is that the ACPI thermal driver
(drivers/acpi/thermal.c) should be one of the top users of these APIs.

Is there any specific reason that it is not included in this patch
series? or is it just that you don't have ACPI thermal driver running
on your test platform?

thanks,
rui

> Also, the Intel PCH and the Intel 34xx drivers are converted to use
> the generic
> trip points relying on the ACPI generic trip point parsing functions.
>
> These changes have been tested on a Thinkpad Lenovo x280 with the PCH
> and
> INT34xx drivers. No regression have been observed, the trip points
> remain the
> same for what is described on this system.
>
> Changelog:
>
> - V3:
> - Took into account Rafael's comments
> - Used a silence option THERMAL_ACPI in order to stay consistent
> with THERMAL_OF. It is up to the API user to select the option.
>
> - V2:
> - Fix the thermal ACPI patch where the thermal_acpi.c was not
> included in
> the series
> - Provide a couple of users of this API which could have been
> tested on a
> real system
>
> Daniel Lezcano (3):
> thermal/acpi: Add ACPI trip point routines
> thermal/drivers/intel: Use generic trip points for intel_pch
> thermal/drivers/intel: Use generic trip points int340x
>
> drivers/thermal/Kconfig | 4 +
> drivers/thermal/Makefile | 1 +
> drivers/thermal/intel/Kconfig | 1 +
> drivers/thermal/intel/int340x_thermal/Kconfig | 1 +
> .../int340x_thermal/int340x_thermal_zone.c | 177 ++++----------
> .../int340x_thermal/int340x_thermal_zone.h | 10 +-
> drivers/thermal/intel/intel_pch_thermal.c | 88 ++-----
> drivers/thermal/thermal_acpi.c | 218
> ++++++++++++++++++
> include/linux/thermal.h | 8 +
> 9 files changed, 294 insertions(+), 214 deletions(-)
> create mode 100644 drivers/thermal/thermal_acpi.c
>

2023-01-06 08:47:59

by Zhang, Rui

[permalink] [raw]

Subject: Re: [PATCH v3 2/3] thermal/drivers/intel: Use generic trip points for intel_pch

On Wed, 2023-01-04 at 23:21 +0100, Daniel Lezcano wrote:
> From: Daniel Lezcano <[email protected]>
>
> The thermal framework gives the possibility to register the trip
> points with the thermal zone. When that is done, no get_trip_* ops
> are
> needed and they can be removed.
>
> Convert the ops content logic into generic trip points and register
> them with the thermal zone.
>
> In order to consolidate the code, use the ACPI thermal framework API
> to fill the generic trip point from the ACPI tables.
>
> It has been tested on a Intel i7-8650U - x280 with the INT3400, the
> PCH, ACPITZ, and x86_pkg_temp. No regression observed so far.
>
> Signed-off-by: Daniel Lezcano <[email protected]>
> ---
> V3:
> - The driver Kconfig option selects CONFIG_THERMAL_ACPI
> ---
> drivers/thermal/intel/Kconfig | 1 +
> drivers/thermal/intel/intel_pch_thermal.c | 88 +++++--------------
> ----
> 2 files changed, 20 insertions(+), 69 deletions(-)
>
> diff --git a/drivers/thermal/intel/Kconfig
> b/drivers/thermal/intel/Kconfig
> index f0c845679250..738b88b290f4 100644
> --- a/drivers/thermal/intel/Kconfig
> +++ b/drivers/thermal/intel/Kconfig
> @@ -75,6 +75,7 @@ config INTEL_BXT_PMIC_THERMAL
> config INTEL_PCH_THERMAL
> tristate "Intel PCH Thermal Reporting Driver"
> depends on X86 && PCI
> + select THERMAL_ACPI

THERMAL_ACPI depends on ACPI but the PCH thermal driver does not.
So we will run into "unmet dependencies" issue when CONFIG_ACPI is
cleared like below

WARNING: unmet direct dependencies detected for THERMAL_ACPI
Depends on [n]: THERMAL [=y] && ACPI [=n]
Selected by [m]:
- INTEL_PCH_THERMAL [=m] && THERMAL [=y] && (X86 [=y] ||
X86_INTEL_QUARK [=n] || COMPILE_TEST [=n]) && X86 [=y] && PCI [=y]

thanks,
rui
> help
> Enable this to support thermal reporting on certain intel
> PCHs.
> Thermal reporting device will provide temperature reading,
> diff --git a/drivers/thermal/intel/intel_pch_thermal.c
> b/drivers/thermal/intel/intel_pch_thermal.c
> index dabf11a687a1..530fe9b38381 100644
> --- a/drivers/thermal/intel/intel_pch_thermal.c
> +++ b/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(struct
> pch_thermal_device *ptd,
> 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_psv(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_thermal_device *ptd, int *nr_trips)
> }
>
> 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
> thermal_zone_device *tzd, int *temp)
> 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_zone_device *tzd)
>
> 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(struct pci_dev
> *pdev,
> 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);

2023-01-06 13:46:55

by Daniel Lezcano

[permalink] [raw]

Subject: Re: [PATCH v3 2/3] thermal/drivers/intel: Use generic trip points for intel_pch

Hi Rui,

On 06/01/2023 09:32, Zhang, Rui wrote:
> On Wed, 2023-01-04 at 23:21 +0100, Daniel Lezcano wrote:
>> From: Daniel Lezcano <[email protected]>
>>
>> The thermal framework gives the possibility to register the trip
>> points with the thermal zone. When that is done, no get_trip_* ops
>> are
>> needed and they can be removed.
>>
>> Convert the ops content logic into generic trip points and register
>> them with the thermal zone.
>>
>> In order to consolidate the code, use the ACPI thermal framework API
>> to fill the generic trip point from the ACPI tables.
>>
>> It has been tested on a Intel i7-8650U - x280 with the INT3400, the
>> PCH, ACPITZ, and x86_pkg_temp. No regression observed so far.
>>
>> Signed-off-by: Daniel Lezcano <[email protected]>
>> ---
>> V3:
>> - The driver Kconfig option selects CONFIG_THERMAL_ACPI
>> ---
>> drivers/thermal/intel/Kconfig | 1 +
>> drivers/thermal/intel/intel_pch_thermal.c | 88 +++++--------------
>> ----
>> 2 files changed, 20 insertions(+), 69 deletions(-)
>>
>> diff --git a/drivers/thermal/intel/Kconfig
>> b/drivers/thermal/intel/Kconfig
>> index f0c845679250..738b88b290f4 100644
>> --- a/drivers/thermal/intel/Kconfig
>> +++ b/drivers/thermal/intel/Kconfig
>> @@ -75,6 +75,7 @@ config INTEL_BXT_PMIC_THERMAL
>> config INTEL_PCH_THERMAL
>> tristate "Intel PCH Thermal Reporting Driver"
>> depends on X86 && PCI
>> + select THERMAL_ACPI
>
> THERMAL_ACPI depends on ACPI but the PCH thermal driver does not.
> So we will run into "unmet dependencies" issue when CONFIG_ACPI is
> cleared like below
>
> WARNING: unmet direct dependencies detected for THERMAL_ACPI
> Depends on [n]: THERMAL [=y] && ACPI [=n]
> Selected by [m]:
> - INTEL_PCH_THERMAL [=m] && THERMAL [=y] && (X86 [=y] ||
> X86_INTEL_QUARK [=n] || COMPILE_TEST [=n]) && X86 [=y] && PCI [=y]
>

Ah yes, indeed. Thanks for spotting this.

Given the code, I think we should do:

select THERMAL_ACPI if ACPI

it is from my POV semantically correct.

--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

2023-01-06 13:49:30

by Daniel Lezcano

[permalink] [raw]

Subject: Re: [PATCH v3 0/3] Thermal ACPI APIs for generic trip points

On 06/01/2023 09:25, Zhang, Rui wrote:
> Hi, Daniel,
>
> On Wed, 2023-01-04 at 23:21 +0100, Daniel Lezcano wrote:
>> Recently sent as a RFC, the thermal ACPI for generic trip points is a
>> set of
>> functions to fill the generic trip points structure which will become
>> the
>> standard structure for the thermal framework and its users.
>>
>> Different Intel drivers and the ACPI thermal driver are using the
>> ACPI tables to
>> get the thermal zone information. As those are getting the same
>> information,
>> providing this set of ACPI function with the generic trip points will
>> consolidate the code.
>
> My understanding is that the ACPI thermal driver
> (drivers/acpi/thermal.c) should be one of the top users of these APIs.

Yes, correct.

> Is there any specific reason that it is not included in this patch
> series? or is it just that you don't have ACPI thermal driver running
> on your test platform?

The generic trip point handling in the acpi thermal driver is another
story. Some code reorg and cleanup should be done before. I have a
series for that but I need to test it more. That is the reason why it
will be submitted after this series is reviewed, so the changes will be
focused on the acpi thermal driver only.

I have a laptop with acpitz but only the critical trip temp.

--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog