lkml.org 
[lkml]   [2022]   [Oct]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH RFC 3/9] thermal/acpi: Convert the acpi thermal trips to an array
Date
Instead of having multiple trip points in the structure fields for
each trip type, let's create an array of trip points.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/acpi/thermal.c | 131 ++++++++++++++++++++++-------------------
1 file changed, 69 insertions(+), 62 deletions(-)

diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 9620128f05d2..8bf2b25acdf1 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -104,6 +104,15 @@ static struct acpi_driver acpi_thermal_driver = {
.drv.pm = &acpi_thermal_pm,
};

+enum {
+ ACPI_THERMAL_TRIP_CRITICAL,
+ ACPI_THERMAL_TRIP_HOT,
+ ACPI_THERMAL_TRIP_PASSIVE,
+ ACPI_THERMAL_TRIP_ACTIVE
+};
+
+#define ACPI_THERMAL_TRIP_MAX (ACPI_THERMAL_TRIP_ACTIVE + ACPI_THERMAL_MAX_ACTIVE)
+
struct acpi_thermal_state {
u8 critical:1;
u8 hot:1;
@@ -143,9 +152,7 @@ struct acpi_thermal {
volatile u8 zombie;
struct acpi_thermal_flags flags;
struct acpi_thermal_state state;
- struct acpi_thermal_trip critical;
- struct acpi_thermal_trip hot;
- struct acpi_thermal_trip passive;
+ struct acpi_thermal_trip trips[ACPI_THERMAL_TRIP_MAX];
struct acpi_thermal_trip active[ACPI_THERMAL_MAX_ACTIVE];
struct acpi_handle_list devices;
struct thermal_zone_device *thermal_zone;
@@ -252,7 +259,7 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
if (flag & ACPI_TRIPS_CRITICAL) {
status = acpi_evaluate_integer(tz->device->handle,
"_CRT", NULL, &tmp);
- tz->critical.temperature = tmp;
+ tz->trips[ACPI_THERMAL_TRIP_CRITICAL].temperature = tmp;
/*
* Treat freezing temperatures as invalid as well; some
* BIOSes return really low values and cause reboots at startup.
@@ -260,32 +267,32 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
* ... so lets discard those as invalid.
*/
if (ACPI_FAILURE(status)) {
- tz->critical.flags.valid = 0;
+ tz->trips[ACPI_THERMAL_TRIP_CRITICAL].flags.valid = 0;
acpi_handle_debug(tz->device->handle,
"No critical threshold\n");
} else if (tmp <= 2732) {
pr_info(FW_BUG "Invalid critical threshold (%llu)\n",
tmp);
- tz->critical.flags.valid = 0;
+ tz->trips[ACPI_THERMAL_TRIP_CRITICAL].flags.valid = 0;
} else {
- tz->critical.flags.valid = 1;
+ tz->trips[ACPI_THERMAL_TRIP_CRITICAL].flags.valid = 1;
acpi_handle_debug(tz->device->handle,
"Found critical threshold [%lu]\n",
- tz->critical.temperature);
+ tz->trips[ACPI_THERMAL_TRIP_CRITICAL].temperature);
}
- if (tz->critical.flags.valid == 1) {
+ if (tz->trips[ACPI_THERMAL_TRIP_CRITICAL].flags.valid == 1) {
if (crt == -1) {
- tz->critical.flags.valid = 0;
+ tz->trips[ACPI_THERMAL_TRIP_CRITICAL].flags.valid = 0;
} else if (crt > 0) {
unsigned long crt_k = celsius_to_deci_kelvin(crt);

/*
* Allow override critical threshold
*/
- if (crt_k > tz->critical.temperature)
+ if (crt_k > tz->trips[ACPI_THERMAL_TRIP_CRITICAL].temperature)
pr_info("Critical threshold %d C\n", crt);

- tz->critical.temperature = crt_k;
+ tz->trips[ACPI_THERMAL_TRIP_CRITICAL].temperature = crt_k;
}
}
}
@@ -295,22 +302,22 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
status = acpi_evaluate_integer(tz->device->handle,
"_HOT", NULL, &tmp);
if (ACPI_FAILURE(status)) {
- tz->hot.flags.valid = 0;
+ tz->trips[ACPI_THERMAL_TRIP_HOT].flags.valid = 0;
acpi_handle_debug(tz->device->handle,
"No hot threshold\n");
} else {
- tz->hot.temperature = tmp;
- tz->hot.flags.valid = 1;
+ tz->trips[ACPI_THERMAL_TRIP_HOT].temperature = tmp;
+ tz->trips[ACPI_THERMAL_TRIP_HOT].flags.valid = 1;
acpi_handle_debug(tz->device->handle,
"Found hot threshold [%lu]\n",
- tz->hot.temperature);
+ tz->trips[ACPI_THERMAL_TRIP_HOT].temperature);
}
}

/* Passive (optional) */
- if (((flag & ACPI_TRIPS_PASSIVE) && tz->passive.flags.valid) ||
+ if (((flag & ACPI_TRIPS_PASSIVE) && tz->trips[ACPI_THERMAL_TRIP_PASSIVE].flags.valid) ||
(flag == ACPI_TRIPS_INIT)) {
- valid = tz->passive.flags.valid;
+ valid = tz->trips[ACPI_THERMAL_TRIP_PASSIVE].flags.valid;
if (psv == -1) {
status = AE_SUPPORT;
} else if (psv > 0) {
@@ -322,56 +329,56 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
}

if (ACPI_FAILURE(status))
- tz->passive.flags.valid = 0;
+ tz->trips[ACPI_THERMAL_TRIP_PASSIVE].flags.valid = 0;
else {
- tz->passive.temperature = tmp;
- tz->passive.flags.valid = 1;
+ tz->trips[ACPI_THERMAL_TRIP_PASSIVE].temperature = tmp;
+ tz->trips[ACPI_THERMAL_TRIP_PASSIVE].flags.valid = 1;
if (flag == ACPI_TRIPS_INIT) {
status = acpi_evaluate_integer(
tz->device->handle, "_TC1",
NULL, &tmp);
if (ACPI_FAILURE(status))
- tz->passive.flags.valid = 0;
+ tz->trips[ACPI_THERMAL_TRIP_PASSIVE].flags.valid = 0;
else
- tz->passive.tc1 = tmp;
+ tz->trips[ACPI_THERMAL_TRIP_PASSIVE].tc1 = tmp;
status = acpi_evaluate_integer(
tz->device->handle, "_TC2",
NULL, &tmp);
if (ACPI_FAILURE(status))
- tz->passive.flags.valid = 0;
+ tz->trips[ACPI_THERMAL_TRIP_PASSIVE].flags.valid = 0;
else
- tz->passive.tc2 = tmp;
+ tz->trips[ACPI_THERMAL_TRIP_PASSIVE].tc2 = tmp;
status = acpi_evaluate_integer(
tz->device->handle, "_TSP",
NULL, &tmp);
if (ACPI_FAILURE(status))
- tz->passive.flags.valid = 0;
+ tz->trips[ACPI_THERMAL_TRIP_PASSIVE].flags.valid = 0;
else
- tz->passive.tsp = tmp;
+ tz->trips[ACPI_THERMAL_TRIP_PASSIVE].tsp = tmp;
}
}
}
- if ((flag & ACPI_TRIPS_DEVICES) && tz->passive.flags.valid) {
+ if ((flag & ACPI_TRIPS_DEVICES) && tz->trips[ACPI_THERMAL_TRIP_PASSIVE].flags.valid) {
memset(&devices, 0, sizeof(struct acpi_handle_list));
status = acpi_evaluate_reference(tz->device->handle, "_PSL",
NULL, &devices);
if (ACPI_FAILURE(status)) {
acpi_handle_info(tz->device->handle,
"Invalid passive threshold\n");
- tz->passive.flags.valid = 0;
+ tz->trips[ACPI_THERMAL_TRIP_PASSIVE].flags.valid = 0;
}
else
- tz->passive.flags.valid = 1;
+ tz->trips[ACPI_THERMAL_TRIP_PASSIVE].flags.valid = 1;

- if (memcmp(&tz->passive.devices, &devices,
+ if (memcmp(&tz->trips[ACPI_THERMAL_TRIP_PASSIVE].devices, &devices,
sizeof(struct acpi_handle_list))) {
- memcpy(&tz->passive.devices, &devices,
+ memcpy(&tz->trips[ACPI_THERMAL_TRIP_PASSIVE].devices, &devices,
sizeof(struct acpi_handle_list));
ACPI_THERMAL_TRIPS_EXCEPTION(flag, tz, "device");
}
}
if ((flag & ACPI_TRIPS_PASSIVE) || (flag & ACPI_TRIPS_DEVICES)) {
- if (valid != tz->passive.flags.valid)
+ if (valid != tz->trips[ACPI_THERMAL_TRIP_PASSIVE].flags.valid)
ACPI_THERMAL_TRIPS_EXCEPTION(flag, tz, "state");
}

@@ -462,9 +469,9 @@ static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)
if (ret)
return ret;

- valid = tz->critical.flags.valid |
- tz->hot.flags.valid |
- tz->passive.flags.valid;
+ valid = tz->trips[ACPI_THERMAL_TRIP_CRITICAL].flags.valid |
+ tz->trips[ACPI_THERMAL_TRIP_HOT].flags.valid |
+ tz->trips[ACPI_THERMAL_TRIP_PASSIVE].flags.valid;

for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++)
valid |= tz->active[i].flags.valid;
@@ -504,7 +511,7 @@ static int thermal_get_trip_type(struct thermal_zone_device *thermal,
if (!tz || trip < 0)
return -EINVAL;

- if (tz->critical.flags.valid) {
+ if (tz->trips[ACPI_THERMAL_TRIP_CRITICAL].flags.valid) {
if (!trip) {
*type = THERMAL_TRIP_CRITICAL;
return 0;
@@ -512,7 +519,7 @@ static int thermal_get_trip_type(struct thermal_zone_device *thermal,
trip--;
}

- if (tz->hot.flags.valid) {
+ if (tz->trips[ACPI_THERMAL_TRIP_HOT].flags.valid) {
if (!trip) {
*type = THERMAL_TRIP_HOT;
return 0;
@@ -520,7 +527,7 @@ static int thermal_get_trip_type(struct thermal_zone_device *thermal,
trip--;
}

- if (tz->passive.flags.valid) {
+ if (tz->trips[ACPI_THERMAL_TRIP_PASSIVE].flags.valid) {
if (!trip) {
*type = THERMAL_TRIP_PASSIVE;
return 0;
@@ -549,30 +556,30 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal,
if (!tz || trip < 0)
return -EINVAL;

- if (tz->critical.flags.valid) {
+ if (tz->trips[ACPI_THERMAL_TRIP_CRITICAL].flags.valid) {
if (!trip) {
*temp = deci_kelvin_to_millicelsius_with_offset(
- tz->critical.temperature,
+ tz->trips[ACPI_THERMAL_TRIP_CRITICAL].temperature,
tz->kelvin_offset);
return 0;
}
trip--;
}

- if (tz->hot.flags.valid) {
+ if (tz->trips[ACPI_THERMAL_TRIP_HOT].flags.valid) {
if (!trip) {
*temp = deci_kelvin_to_millicelsius_with_offset(
- tz->hot.temperature,
+ tz->trips[ACPI_THERMAL_TRIP_HOT].temperature,
tz->kelvin_offset);
return 0;
}
trip--;
}

- if (tz->passive.flags.valid) {
+ if (tz->trips[ACPI_THERMAL_TRIP_PASSIVE].flags.valid) {
if (!trip) {
*temp = deci_kelvin_to_millicelsius_with_offset(
- tz->passive.temperature,
+ tz->trips[ACPI_THERMAL_TRIP_PASSIVE].temperature,
tz->kelvin_offset);
return 0;
}
@@ -598,9 +605,9 @@ static int thermal_get_crit_temp(struct thermal_zone_device *thermal,
{
struct acpi_thermal *tz = thermal->devdata;

- if (tz->critical.flags.valid) {
+ if (tz->trips[ACPI_THERMAL_TRIP_CRITICAL].flags.valid) {
*temperature = deci_kelvin_to_millicelsius_with_offset(
- tz->critical.temperature,
+ tz->trips[ACPI_THERMAL_TRIP_CRITICAL].temperature,
tz->kelvin_offset);
return 0;
} else
@@ -637,9 +644,9 @@ static int thermal_get_trend(struct thermal_zone_device *thermal,
* tz->temperature has already been updated by generic thermal layer,
* before this callback being invoked
*/
- i = (tz->passive.tc1 * (tz->temperature - tz->last_temperature))
- + (tz->passive.tc2
- * (tz->temperature - tz->passive.temperature));
+ i = (tz->trips[ACPI_THERMAL_TRIP_PASSIVE].tc1 * (tz->temperature - tz->last_temperature))
+ + (tz->trips[ACPI_THERMAL_TRIP_PASSIVE].tc2
+ * (tz->temperature - tz->trips[ACPI_THERMAL_TRIP_PASSIVE].temperature));

if (i > 0)
*trend = THERMAL_TREND_RAISING;
@@ -683,17 +690,17 @@ static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal,
int trip = -1;
int result = 0;

- if (tz->critical.flags.valid)
+ if (tz->trips[ACPI_THERMAL_TRIP_CRITICAL].flags.valid)
trip++;

- if (tz->hot.flags.valid)
+ if (tz->trips[ACPI_THERMAL_TRIP_HOT].flags.valid)
trip++;

- if (tz->passive.flags.valid) {
+ if (tz->trips[ACPI_THERMAL_TRIP_PASSIVE].flags.valid) {
trip++;
- for (i = 0; i < tz->passive.devices.count;
+ for (i = 0; i < tz->trips[ACPI_THERMAL_TRIP_PASSIVE].devices.count;
i++) {
- handle = tz->passive.devices.handles[i];
+ handle = tz->trips[ACPI_THERMAL_TRIP_PASSIVE].devices.handles[i];
dev = acpi_fetch_acpi_dev(handle);
if (dev != device)
continue;
@@ -773,23 +780,23 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
acpi_status status;
int i;

- if (tz->critical.flags.valid)
+ if (tz->trips[ACPI_THERMAL_TRIP_CRITICAL].flags.valid)
trips++;

- if (tz->hot.flags.valid)
+ if (tz->trips[ACPI_THERMAL_TRIP_HOT].flags.valid)
trips++;

- if (tz->passive.flags.valid)
+ if (tz->trips[ACPI_THERMAL_TRIP_PASSIVE].flags.valid)
trips++;

for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE &&
tz->active[i].flags.valid; i++, trips++);

- if (tz->passive.flags.valid)
+ if (tz->trips[ACPI_THERMAL_TRIP_PASSIVE].flags.valid)
tz->thermal_zone =
thermal_zone_device_register("acpitz", trips, 0, tz,
&acpi_thermal_zone_ops, NULL,
- tz->passive.tsp*100,
+ tz->trips[ACPI_THERMAL_TRIP_PASSIVE].tsp*100,
tz->polling_frequency*100);
else
tz->thermal_zone =
@@ -966,8 +973,8 @@ static int acpi_thermal_get_info(struct acpi_thermal *tz)
*/
static void acpi_thermal_guess_offset(struct acpi_thermal *tz)
{
- if (tz->critical.flags.valid &&
- (tz->critical.temperature % 5) == 1)
+ if (tz->trips[ACPI_THERMAL_TRIP_CRITICAL].flags.valid &&
+ (tz->trips[ACPI_THERMAL_TRIP_CRITICAL].temperature % 5) == 1)
tz->kelvin_offset = 273100;
else
tz->kelvin_offset = 273200;
--
2.34.1
\
 
 \ /
  Last update: 2022-10-04 19:28    [W:0.091 / U:0.248 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site