From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
Make the ACPI thermal driver use thermal_zone_device_register_with_trips()
to register its thermal zones.
For this purpose, make it create a trip point table that will be passed to
thermal_zone_device_register_with_trips() as an argument.
Also use the thermal_zone_update_trip_temp() helper introduced
previously to update temperatures of the passive and active trip
points after a trip points change notification from the platform
firmware.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
---
This is a bug fix update of just this patch that doesn't affect any other
patches in the series, which is why it is sent separately.
v5 -> v5.1:
* Terminate the loop over active trip points in
acpi_thermal_register_thermal_zone() on the first invalid one to
avoid reaching out of array bounds.
* Use acpi_trip instead of computing its value from scratch in two
places.
* Fix up white space.
v4 -> v5:
* Use for_each_thermal_trip() introduced previously to update trip
temperatures with the help of a new trip callback function.
* Drop a function that has no users after the above change.
* Rebase on top of patch [07/11].
v3 -> v4:
* Rework to use thermal_zone_update_trip_temp() for updating trip point
temperatures.
* Rebase on top of the new version of the previous patch.
v2 -> v3:
* Fix error code path memory leak in acpi_thermal_register_thermal_zone().
* Notice that the critical and hot trips never change after initialization,
so don't add struct thermal_trip_ref to any of them.
v1 -> v2:
* Use thermal_zone_device_lock()/thermal_zone_device_unlock() in
acpi_thermal_check_fn() explicitly and call __thermal_zone_device_update()
from there without unlocking the thermal zone.
* Export __thermal_zone_device_update() to modules (so it can be called by
the ACPI thermal code).
---
drivers/acpi/thermal.c | 93 +++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 86 insertions(+), 7 deletions(-)
Index: linux-pm/drivers/acpi/thermal.c
===================================================================
--- linux-pm.orig/drivers/acpi/thermal.c
+++ linux-pm/drivers/acpi/thermal.c
@@ -125,6 +125,7 @@ struct acpi_thermal {
unsigned long polling_frequency;
volatile u8 zombie;
struct acpi_thermal_trips trips;
+ struct thermal_trip *trip_table;
struct acpi_handle_list devices;
struct thermal_zone_device *thermal_zone;
int kelvin_offset; /* in millidegrees */
@@ -178,6 +179,15 @@ static int acpi_thermal_get_polling_freq
return 0;
}
+static int acpi_thermal_temp(struct acpi_thermal *tz, int temp_deci_k)
+{
+ if (temp_deci_k == THERMAL_TEMP_INVALID)
+ return THERMAL_TEMP_INVALID;
+
+ return deci_kelvin_to_millicelsius_with_offset(temp_deci_k,
+ tz->kelvin_offset);
+}
+
static void __acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
{
acpi_status status;
@@ -389,10 +399,30 @@ static void __acpi_thermal_trips_update(
}
}
+static int acpi_thermal_adjust_trip(struct thermal_trip *trip, void *data)
+{
+ struct acpi_thermal_trip *acpi_trip = trip->priv;
+ struct acpi_thermal *tz = data;
+
+ if (!acpi_trip)
+ return 0;
+
+ if (acpi_trip->valid)
+ trip->temperature = acpi_thermal_temp(tz, acpi_trip->temperature);
+ else
+ trip->temperature = THERMAL_TEMP_INVALID;
+
+ return 0;
+}
+
static void acpi_thermal_adjust_thermal_zone(struct thermal_zone_device *thermal,
unsigned long data)
{
- __acpi_thermal_trips_update(thermal_zone_device_priv(thermal), data);
+ struct acpi_thermal *tz = thermal_zone_device_priv(thermal);
+
+ __acpi_thermal_trips_update(tz, data);
+
+ for_each_thermal_trip(tz->thermal_zone, acpi_thermal_adjust_trip, tz);
}
static void acpi_queue_thermal_check(struct acpi_thermal *tz)
@@ -757,6 +787,8 @@ static void acpi_thermal_zone_sysfs_remo
static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
{
+ struct acpi_thermal_trip *acpi_trip;
+ struct thermal_trip *trip;
int passive_delay = 0;
int trip_count = 0;
int result;
@@ -776,12 +808,56 @@ static int acpi_thermal_register_thermal
for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE && tz->trips.active[i].trip.valid; i++)
trip_count++;
- tz->thermal_zone = thermal_zone_device_register("acpitz", trip_count, 0,
- tz, &acpi_thermal_zone_ops,
- NULL, passive_delay,
- tz->polling_frequency * 100);
- if (IS_ERR(tz->thermal_zone))
- return -ENODEV;
+ trip = kcalloc(trip_count, sizeof(*trip), GFP_KERNEL);
+ if (!trip)
+ return -ENOMEM;
+
+ tz->trip_table = trip;
+
+ if (tz->trips.critical.valid) {
+ trip->type = THERMAL_TRIP_CRITICAL;
+ trip->temperature = acpi_thermal_temp(tz, tz->trips.critical.temperature);
+ trip++;
+ }
+
+ if (tz->trips.hot.valid) {
+ trip->type = THERMAL_TRIP_HOT;
+ trip->temperature = acpi_thermal_temp(tz, tz->trips.hot.temperature);
+ trip++;
+ }
+
+ acpi_trip = &tz->trips.passive.trip;
+ if (acpi_trip->valid) {
+ trip->type = THERMAL_TRIP_PASSIVE;
+ trip->temperature = acpi_thermal_temp(tz, acpi_trip->temperature);
+ trip->priv = acpi_trip;
+ trip++;
+ }
+
+ for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) {
+ acpi_trip = &tz->trips.active[i].trip;
+
+ if (!acpi_trip->valid)
+ break;
+
+ trip->type = THERMAL_TRIP_ACTIVE;
+ trip->temperature = acpi_thermal_temp(tz, acpi_trip->temperature);
+ trip->priv = acpi_trip;
+ trip++;
+ }
+
+ tz->thermal_zone = thermal_zone_device_register_with_trips("acpitz",
+ tz->trip_table,
+ trip_count,
+ 0, tz,
+ &acpi_thermal_zone_ops,
+ NULL,
+ passive_delay,
+ tz->polling_frequency * 100);
+ if (IS_ERR(tz->thermal_zone)) {
+ result = PTR_ERR(tz->thermal_zone);
+ goto free_trip_table;
+ }
result = acpi_thermal_zone_sysfs_add(tz);
if (result)
@@ -800,6 +876,8 @@ remove_links:
acpi_thermal_zone_sysfs_remove(tz);
unregister_tzd:
thermal_zone_device_unregister(tz->thermal_zone);
+free_trip_table:
+ kfree(tz->trip_table);
return result;
}
@@ -808,6 +886,7 @@ static void acpi_thermal_unregister_ther
{
acpi_thermal_zone_sysfs_remove(tz);
thermal_zone_device_unregister(tz->thermal_zone);
+ kfree(tz->trip_table);
tz->thermal_zone = NULL;
}
