thermal: power_allocator: Respect upper and lower bounds for cooling device

The thermal cooling device specified in DT might be instantiated for
a thermal zone trip point with a limited set of OPPs to operate on. This
configuration should be supported by Intelligent Power Allocation (IPA),
since it is a standard for other governors. Change the code and allow IPA
to get power value of lower and upper bound set for a given cooling
device.

Signed-off-by: Lukasz Luba <lukasz.luba@arm.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20201015112441.4056-3-lukasz.luba@arm.com

diff --git a/drivers/thermal/gov_power_allocator.c b/drivers/thermal/gov_power_allocator.c
index ab0be26..eb8c9af 100644 (file)
--- a/drivers/thermal/gov_power_allocator.c
+++ b/drivers/thermal/gov_power_allocator.c
@@ -96,7 +96,10 @@ static u32 estimate_sustainable_power(struct thermal_zone_device *tz)
                if (instance->trip != params->trip_max_desired_temperature)
                        continue;
 
-               if (power_actor_get_min_power(cdev, &min_power))
+               if (!cdev_is_power_actor(cdev))
+                       continue;
+
+               if (cdev->ops->state2power(cdev, instance->upper, &min_power))
                        continue;
 
                sustainable_power += min_power;
@@ -398,7 +401,8 @@ static int allocate_power(struct thermal_zone_device *tz,
 
                weighted_req_power[i] = frac_to_int(weight * req_power[i]);
 
-               if (power_actor_get_max_power(cdev, &max_power[i]))
+               if (cdev->ops->state2power(cdev, instance->lower,
+                                          &max_power[i]))
                        continue;
 
                total_req_power += req_power[i];