From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
commit ac1f43c03fc91eee53cc95683245350d4d87781e upstream.
Commit 0dc23567c206 ("thermal: core: Move lists of thermal instances
to trip descriptors") overlooked the case in which the Power Allocator
governor attempts to bind to a tripless thermal zone and params->trip_max
is NULL in check_power_actors().
No power actors can be found in that case, so check_power_actors() needs
to be made return 0 then to restore its previous behavior.
Fixes: 0dc23567c206 ("thermal: core: Move lists of thermal instances to trip descriptors")
Closes: https://lore.kernel.org/linux-pm/Z0NeGF4ryCe_b5rr@sashalap/
Reported-by: Sasha Levin <sashal@xxxxxxxxxx>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
Reviewed-by: Lukasz Luba <lukasz.luba@xxxxxxx>
Link: https://patch.msgid.link/2761105.mvXUDI8C0e@xxxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/thermal/gov_power_allocator.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
--- a/drivers/thermal/gov_power_allocator.c
+++ b/drivers/thermal/gov_power_allocator.c
@@ -582,10 +582,15 @@ static void allow_maximum_power(struct t
static int check_power_actors(struct thermal_zone_device *tz,
struct power_allocator_params *params)
{
- const struct thermal_trip_desc *td = trip_to_trip_desc(params->trip_max);
+ const struct thermal_trip_desc *td;
struct thermal_instance *instance;
int ret = 0;
+ if (!params->trip_max)
+ return 0;
+
+ td = trip_to_trip_desc(params->trip_max);
+
list_for_each_entry(instance, &td->thermal_instances, trip_node) {
if (!cdev_is_power_actor(instance->cdev)) {
dev_warn(&tz->device, "power_allocator: %s is not a power actor\n",
Patches currently in stable-queue which might be from rafael.j.wysocki@xxxxxxxxx are
queue-6.12/thermal-gov_power_allocator-add-missing-null-pointer-check.patch
queue-6.12/thermal-core-move-lists-of-thermal-instances-to-trip.patch
queue-6.12/thermal-of-fix-cdev-lookup-in-thermal_of_should_bind.patch
queue-6.12/thermal-gov_power_allocator-fix-incorrect-calculatio.patch
queue-6.12/thermal-of-simplify-thermal_of_should_bind-with-scop.patch
queue-6.12/intel_idle-handle-older-cpus-which-stop-the-tsc-in-deeper-c-states-correctly.patch
queue-6.12/thermal-gov_power_allocator-update-total_weight-on-b.patch
