linux-kernel - RE: [PATCH 1/2] Revert "mlxsw: core: Use different get_trend() callbacks for different thermal zones"

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <BN9PR12MB5381BAE6F85C68E1C9168A50AF9F9@BN9PR12MB5381.namprd12.prod.outlook.com>
Date:   Thu, 4 Aug 2022 12:20:54 +0000
From:   Vadim Pasternak <vadimp@...dia.com>
To:     Daniel Lezcano <daniel.lezcano@...aro.org>,
        "rafael@...nel.org" <rafael@...nel.org>
CC:     "davem@...emloft.net" <davem@...emloft.net>,
        "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        Ido Schimmel <idosch@...dia.com>,
        Petr Machata <petrm@...dia.com>,
        Eric Dumazet <edumazet@...gle.com>,
        Jakub Kicinski <kuba@...nel.org>,
        Paolo Abeni <pabeni@...hat.com>
Subject: RE: [PATCH 1/2] Revert "mlxsw: core: Use different get_trend()
 callbacks for different thermal zones"



> -----Original Message-----
> From: Daniel Lezcano <daniel.lezcano@...aro.org>
> Sent: Monday, August 1, 2022 12:56 PM
> To: daniel.lezcano@...aro.org; rafael@...nel.org
> Cc: Vadim Pasternak <vadimp@...dia.com>; davem@...emloft.net;
> netdev@...r.kernel.org; linux-kernel@...r.kernel.org; Ido Schimmel
> <idosch@...dia.com>; Petr Machata <petrm@...dia.com>; Eric Dumazet
> <edumazet@...gle.com>; Jakub Kicinski <kuba@...nel.org>; Paolo Abeni
> <pabeni@...hat.com>
> Subject: [PATCH 1/2] Revert "mlxsw: core: Use different get_trend()
> callbacks for different thermal zones"
> 
> This reverts commit 2dc2f760052da4925482ecdcdc5c94d4a599153c.
> 
> As discussed in the thread:
> 
> https://lore.kernel.org/all/f3c62ebe-7d59-c537-a010-
> bff366c8aeba@...aro.org/
> 
> the feature provided by commits 2dc2f760052da and 6f73862fabd93 is
> actually already handled by the thermal framework via the cooling device
> state aggregation, thus all this code is pointless.
> 
> No conflict happened when reverting the patch.
> 
> Signed-off-by: Daniel Lezcano <daniel.lezcano@...aro.org>
Tested-by: Vadim Pasternak <vadimp@...dia.com>

> ---
>  .../ethernet/mellanox/mlxsw/core_thermal.c    | 23 ++++---------------
>  1 file changed, 4 insertions(+), 19 deletions(-)
> 
> diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
> b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
> index 05f54bd982c0..f5751242653b 100644
> --- a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
> +++ b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
> @@ -345,7 +345,8 @@ static int mlxsw_thermal_set_trip_hyst(struct
> thermal_zone_device *tzdev,  static int mlxsw_thermal_trend_get(struct
> thermal_zone_device *tzdev,
>  				   int trip, enum thermal_trend *trend)  {
> -	struct mlxsw_thermal *thermal = tzdev->devdata;
> +	struct mlxsw_thermal_module *tz = tzdev->devdata;
> +	struct mlxsw_thermal *thermal = tz->parent;
> 
>  	if (trip < 0 || trip >= MLXSW_THERMAL_NUM_TRIPS)
>  		return -EINVAL;
> @@ -537,22 +538,6 @@ mlxsw_thermal_module_trip_hyst_set(struct
> thermal_zone_device *tzdev, int trip,
>  	return 0;
>  }
> 
> -static int mlxsw_thermal_module_trend_get(struct thermal_zone_device
> *tzdev,
> -					  int trip, enum thermal_trend
> *trend)
> -{
> -	struct mlxsw_thermal_module *tz = tzdev->devdata;
> -	struct mlxsw_thermal *thermal = tz->parent;
> -
> -	if (trip < 0 || trip >= MLXSW_THERMAL_NUM_TRIPS)
> -		return -EINVAL;
> -
> -	if (tzdev == thermal->tz_highest_dev)
> -		return 1;
> -
> -	*trend = THERMAL_TREND_STABLE;
> -	return 0;
> -}
> -
>  static struct thermal_zone_device_ops mlxsw_thermal_module_ops = {
>  	.bind		= mlxsw_thermal_module_bind,
>  	.unbind		= mlxsw_thermal_module_unbind,
> @@ -562,7 +547,7 @@ static struct thermal_zone_device_ops
> mlxsw_thermal_module_ops = {
>  	.set_trip_temp	= mlxsw_thermal_module_trip_temp_set,
>  	.get_trip_hyst	= mlxsw_thermal_module_trip_hyst_get,
>  	.set_trip_hyst	= mlxsw_thermal_module_trip_hyst_set,
> -	.get_trend	= mlxsw_thermal_module_trend_get,
> +	.get_trend	= mlxsw_thermal_trend_get,
>  };
> 
>  static int mlxsw_thermal_gearbox_temp_get(struct thermal_zone_device
> *tzdev, @@ -599,7 +584,7 @@ static struct thermal_zone_device_ops
> mlxsw_thermal_gearbox_ops = {
>  	.set_trip_temp	= mlxsw_thermal_module_trip_temp_set,
>  	.get_trip_hyst	= mlxsw_thermal_module_trip_hyst_get,
>  	.set_trip_hyst	= mlxsw_thermal_module_trip_hyst_set,
> -	.get_trend	= mlxsw_thermal_module_trend_get,
> +	.get_trend	= mlxsw_thermal_trend_get,
>  };
> 
>  static int mlxsw_thermal_get_max_state(struct thermal_cooling_device
> *cdev,
> --
> 2.25.1