From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: rjw@rjwysocki.net
Cc: daniel.lezcano@linaro.org, linux-acpi@vger.kernel.org,
linux-pm@vger.kernel.org, "Rafael J. Wysocki" <rafael@kernel.org>,
Zhang Rui <rui.zhang@intel.com>, Len Brown <lenb@kernel.org>,
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v2 04/11] thermal/acpi: Move the active trip points to the same array
Date: Fri, 3 Feb 2023 18:44:22 +0100 [thread overview]
Message-ID: <20230203174429.3375691-5-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <20230203174429.3375691-1-daniel.lezcano@linaro.org>
This change does the second pass to move the active trip points in the
thermal trip array.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/acpi/thermal.c | 71 +++++++++++++++++++++---------------------
1 file changed, 35 insertions(+), 36 deletions(-)
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 6b07de78c4c6..903f0e3d95f5 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -153,7 +153,6 @@ struct acpi_thermal {
struct acpi_thermal_flags flags;
struct acpi_thermal_state state;
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;
int kelvin_offset; /* in millidegrees */
@@ -379,19 +378,19 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
}
/* Active (optional) */
- for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) {
+ for (i = ACPI_THERMAL_TRIP_ACTIVE; i < ACPI_THERMAL_MAX_ACTIVE; i++) {
char name[5] = { '_', 'A', 'C', ('0' + i), '\0' };
- valid = tz->active[i].flags.valid;
+ valid = tz->trips[i].flags.valid;
if (act == -1)
break; /* disable all active trip points */
if (flag == ACPI_TRIPS_INIT || ((flag & ACPI_TRIPS_ACTIVE) &&
- tz->active[i].flags.valid)) {
+ tz->trips[i].flags.valid)) {
status = acpi_evaluate_integer(tz->device->handle,
name, NULL, &tmp);
if (ACPI_FAILURE(status)) {
- tz->active[i].flags.valid = 0;
+ tz->trips[i].flags.valid = 0;
if (i == 0)
break;
@@ -399,50 +398,50 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
break;
if (i == 1)
- tz->active[0].temperature = celsius_to_deci_kelvin(act);
+ tz->trips[0].temperature = celsius_to_deci_kelvin(act);
else
/*
* Don't allow override higher than
* the next higher trip point
*/
- tz->active[i - 1].temperature =
- (tz->active[i - 2].temperature <
+ tz->trips[i - 1].temperature =
+ (tz->trips[i - 2].temperature <
celsius_to_deci_kelvin(act) ?
- tz->active[i - 2].temperature :
+ tz->trips[i - 2].temperature :
celsius_to_deci_kelvin(act));
break;
} else {
- tz->active[i].temperature = tmp;
- tz->active[i].flags.valid = 1;
+ tz->trips[i].temperature = tmp;
+ tz->trips[i].flags.valid = 1;
}
}
name[2] = 'L';
- if ((flag & ACPI_TRIPS_DEVICES) && tz->active[i].flags.valid ) {
+ if ((flag & ACPI_TRIPS_DEVICES) && tz->trips[i].flags.valid ) {
memset(&devices, 0, sizeof(struct acpi_handle_list));
status = acpi_evaluate_reference(tz->device->handle,
name, NULL, &devices);
if (ACPI_FAILURE(status)) {
acpi_handle_info(tz->device->handle,
"Invalid active%d threshold\n", i);
- tz->active[i].flags.valid = 0;
+ tz->trips[i].flags.valid = 0;
} else {
- tz->active[i].flags.valid = 1;
+ tz->trips[i].flags.valid = 1;
}
- if (memcmp(&tz->active[i].devices, &devices,
+ if (memcmp(&tz->trips[i].devices, &devices,
sizeof(struct acpi_handle_list))) {
- memcpy(&tz->active[i].devices, &devices,
+ memcpy(&tz->trips[i].devices, &devices,
sizeof(struct acpi_handle_list));
ACPI_THERMAL_TRIPS_EXCEPTION(flag, tz, "device");
}
}
if ((flag & ACPI_TRIPS_ACTIVE) || (flag & ACPI_TRIPS_DEVICES))
- if (valid != tz->active[i].flags.valid)
+ if (valid != tz->trips[i].flags.valid)
ACPI_THERMAL_TRIPS_EXCEPTION(flag, tz, "state");
- if (!tz->active[i].flags.valid)
+ if (!tz->trips[i].flags.valid)
break;
}
@@ -471,8 +470,8 @@ static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)
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;
+ for (i = ACPI_THERMAL_TRIP_ACTIVE; i < ACPI_THERMAL_MAX_ACTIVE; i++)
+ valid |= tz->trips[i].flags.valid;
if (!valid) {
pr_warn(FW_BUG "No valid trip found\n");
@@ -533,7 +532,7 @@ static int thermal_get_trip_type(struct thermal_zone_device *thermal,
trip--;
}
- for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE && tz->active[i].flags.valid; i++) {
+ for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE && tz->trips[i].flags.valid; i++) {
if (!trip) {
*type = THERMAL_TRIP_ACTIVE;
return 0;
@@ -583,11 +582,11 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal,
trip--;
}
- for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE &&
- tz->active[i].flags.valid; i++) {
+ for (i = ACPI_THERMAL_TRIP_ACTIVE; i < ACPI_THERMAL_MAX_ACTIVE &&
+ tz->trips[i].flags.valid; i++) {
if (!trip) {
*temp = deci_kelvin_to_millicelsius_with_offset(
- tz->active[i].temperature,
+ tz->trips[i].temperature,
tz->kelvin_offset);
return 0;
}
@@ -719,13 +718,13 @@ static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal,
}
}
- for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) {
- if (!tz->active[i].flags.valid)
+ for (i = ACPI_THERMAL_TRIP_ACTIVE; i < ACPI_THERMAL_MAX_ACTIVE; i++) {
+ if (!tz->trips[i].flags.valid)
break;
trip++;
- for (j = 0; j < tz->active[i].devices.count; j++) {
- handle = tz->active[i].devices.handles[j];
+ for (j = 0; j < tz->trips[i].devices.count; j++) {
+ handle = tz->trips[i].devices.handles[j];
dev = acpi_fetch_acpi_dev(handle);
if (dev != device)
continue;
@@ -791,7 +790,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
if (tz->trips[ACPI_THERMAL_TRIP_PASSIVE].flags.valid)
trips++;
- for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE && tz->active[i].flags.valid;
+ for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE && tz->trips[i].flags.valid;
i++, trips++);
if (tz->trips[ACPI_THERMAL_TRIP_PASSIVE].flags.valid)
@@ -1082,20 +1081,20 @@ static int acpi_thermal_resume(struct device *dev)
if (!tz)
return -EINVAL;
- for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) {
- if (!tz->active[i].flags.valid)
+ for (i = ACPI_THERMAL_TRIP_ACTIVE; i < ACPI_THERMAL_MAX_ACTIVE; i++) {
+ if (!tz->trips[i].flags.valid)
break;
- tz->active[i].flags.enabled = 1;
- for (j = 0; j < tz->active[i].devices.count; j++) {
+ tz->trips[i].flags.enabled = 1;
+ for (j = 0; j < tz->trips[i].devices.count; j++) {
result = acpi_bus_update_power(
- tz->active[i].devices.handles[j],
+ tz->trips[i].devices.handles[j],
&power_state);
if (result || (power_state != ACPI_STATE_D0)) {
- tz->active[i].flags.enabled = 0;
+ tz->trips[i].flags.enabled = 0;
break;
}
}
- tz->state.active |= tz->active[i].flags.enabled;
+ tz->state.active |= tz->trips[i].flags.enabled;
}
acpi_queue_thermal_check(tz);
--
2.34.1
next prev parent reply other threads:[~2023-02-03 17:44 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20230203174429.3375691-1-daniel.lezcano@linaro.org>
2023-02-03 17:44 ` [PATCH v2 01/11] thermal/acpi: Remove the intermediate acpi_thermal_trip structure Daniel Lezcano
2023-02-03 17:44 ` [PATCH v2 02/11] thermal/acpi: Change to a common " Daniel Lezcano
2023-02-03 17:44 ` [PATCH v2 03/11] thermal/acpi: Convert the acpi thermal trips to an array Daniel Lezcano
2023-02-03 17:44 ` Daniel Lezcano [this message]
2023-02-03 17:44 ` [PATCH v2 05/11] thermal/acpi: Optimize get_trip_points() Daniel Lezcano
2023-02-03 17:44 ` [PATCH v2 06/11] thermal/acpi: Encapsulate in functions the trip initialization Daniel Lezcano
2023-02-03 17:44 ` [PATCH v2 07/11] thermal/acpi: Simplifify the condition check Daniel Lezcano
2023-02-03 17:44 ` [PATCH v2 08/11] thermal/acpi: Remove active and enabled flags Daniel Lezcano
2023-02-03 17:44 ` [PATCH v2 09/11] thermal/acpi: Convert the units to milli Celsuis Daniel Lezcano
2023-02-03 17:44 ` [PATCH v2 10/11] thermal/acpi: Rewrite the trip point intialization to use the generic thermal trip Daniel Lezcano
2023-02-03 17:44 ` [PATCH v2 11/11] thermal/acpi: Use the thermal framework ACPI API Daniel Lezcano
2023-02-04 5:10 ` kernel test robot
2023-02-04 7:54 ` kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230203174429.3375691-5-daniel.lezcano@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=rjw@rjwysocki.net \
--cc=rui.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®