Re: [RESEND][PATCH v1 5/8] thermal: tegra: Use thermal_zone_for_each_trip() for walking trip points

[Lukasz Luba <lukasz.luba@arm.com>]

On 7/29/24 17:05, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> 
> It is generally inefficient to iterate over trip indices and call
> thermal_zone_get_trip() every time to get the struct thermal_trip
> corresponding to the given trip index, so modify the Tegra thermal
> drivers to use thermal_zone_for_each_trip() for walking trips.
> 
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---
> 
> This patch does not depend on patches [1-3/8].
> 
> ---
>   drivers/thermal/tegra/soctherm.c        |   38 ++++++++++++++++----------------
>   drivers/thermal/tegra/tegra30-tsensor.c |   25 ++++++++++-----------
>   2 files changed, 33 insertions(+), 30 deletions(-)
> 
> Index: linux-pm/drivers/thermal/tegra/soctherm.c
> ===================================================================
> --- linux-pm.orig/drivers/thermal/tegra/soctherm.c
> +++ linux-pm/drivers/thermal/tegra/soctherm.c
> @@ -682,24 +682,25 @@ static const struct thermal_zone_device_
>   	.set_trips = tegra_thermctl_set_trips,
>   };
>   
> -static int get_hot_temp(struct thermal_zone_device *tz, int *trip_id, int *temp)
> +static int get_hot_trip_cb(struct thermal_trip *trip, void *arg)
>   {
> -	int i, ret;
> -	struct thermal_trip trip;
> +	const struct thermal_trip **trip_ret = arg;
>   
> -	for (i = 0; i < thermal_zone_get_num_trips(tz); i++) {
> +	if (trip->type != THERMAL_TRIP_HOT)
> +		return 0;
>   
> -		ret = thermal_zone_get_trip(tz, i, &trip);
> -		if (ret)
> -			return -EINVAL;
> -
> -		if (trip.type == THERMAL_TRIP_HOT) {
> -			*trip_id = i;
> -			return 0;
> -		}
> -	}
> +	*trip_ret = trip;
> +	/* Return nonzero to terminate the search. */
> +	return 1;
> +}
>   
> -	return -EINVAL;
> +static const struct thermal_trip *get_hot_trip(struct thermal_zone_device *tz)
> +{
> +	const struct thermal_trip *trip = NULL;
> +
> +	thermal_zone_for_each_trip(tz, get_hot_trip_cb, &trip);
> +
> +	return trip;
>   }
>   
>   /**
> @@ -731,8 +732,9 @@ static int tegra_soctherm_set_hwtrips(st
>   				      struct thermal_zone_device *tz)
>   {
>   	struct tegra_soctherm *ts = dev_get_drvdata(dev);
> +	const struct thermal_trip *hot_trip;
>   	struct soctherm_throt_cfg *stc;
> -	int i, trip, temperature, ret;
> +	int i, temperature, ret;
>   
>   	/* Get thermtrips. If missing, try to get critical trips. */
>   	temperature = tsensor_group_thermtrip_get(ts, sg->id);
> @@ -749,8 +751,8 @@ static int tegra_soctherm_set_hwtrips(st
>   	dev_info(dev, "thermtrip: will shut down when %s reaches %d mC\n",
>   		 sg->name, temperature);
>   
> -	ret = get_hot_temp(tz, &trip, &temperature);
> -	if (ret) {
> +	hot_trip = get_hot_trip(tz);
> +	if (!hot_trip) {
>   		dev_info(dev, "throttrip: %s: missing hot temperature\n",
>   			 sg->name);
>   		return 0;
> @@ -763,7 +765,7 @@ static int tegra_soctherm_set_hwtrips(st
>   			continue;
>   
>   		cdev = ts->throt_cfgs[i].cdev;
> -		if (get_thermal_instance(tz, cdev, trip))
> +		if (thermal_trip_is_bound_to_cdev(tz, hot_trip, cdev))
>   			stc = find_throttle_cfg_by_name(ts, cdev->type);
>   		else
>   			continue;
> Index: linux-pm/drivers/thermal/tegra/tegra30-tsensor.c
> ===================================================================
> --- linux-pm.orig/drivers/thermal/tegra/tegra30-tsensor.c
> +++ linux-pm/drivers/thermal/tegra/tegra30-tsensor.c
> @@ -308,6 +308,18 @@ struct trip_temps {
>   	int crit_trip;
>   };
>   
> +static int tegra_tsensor_get_trips_cb(struct thermal_trip *trip, void *arg)
> +{
> +	struct trip_temps *temps = arg;
> +
> +	if (trip->type == THERMAL_TRIP_HOT)
> +		temps->hot_trip = trip->temperature;
> +	else if (trip->type == THERMAL_TRIP_CRITICAL)
> +		temps->crit_trip = trip->temperature;
> +
> +	return 0;
> +}
> +
>   static void tegra_tsensor_get_hw_channel_trips(struct thermal_zone_device *tzd,
>   					       struct trip_temps *temps)
>   {
> @@ -320,18 +332,7 @@ static void tegra_tsensor_get_hw_channel
>   	temps->hot_trip  = 85000;
>   	temps->crit_trip = 90000;
>   
> -	for (i = 0; i < thermal_zone_get_num_trips(tzd); i++) {
> -
> -		struct thermal_trip trip;
> -
> -		thermal_zone_get_trip(tzd, i, &trip);
> -
> -		if (trip.type == THERMAL_TRIP_HOT)
> -			temps->hot_trip = trip.temperature;
> -
> -		if (trip.type == THERMAL_TRIP_CRITICAL)
> -			temps->crit_trip = trip.temperature;
> -	}
> +	thermal_zone_for_each_trip(tzd, tegra_tsensor_get_trips_cb, temps);
>   
>   	/* clamp hardware trips to the calibration limits */
>   	temps->hot_trip = clamp(temps->hot_trip, 25000, 90000);
> 
> 
> 

Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>