thermal/drivers/iwlwifi: Use generic thermal_zone_get_trip() function
Subsystems (4)
PATCH 1/2 thermal/drivers/iwlwifi: Use generic thermal_zone_get_trip() function
The thermal framework gives the possibility to register the trip points with the thermal zone. When that is done, no get_trip_* ops are needed and they can be removed.
The get_trip_temp, get_trip_hyst and get_trip_type are handled by the get_trip_point().
The set_trip_temp() generic function does some checks which are no longer needed in the set_trip_point() ops.
Convert ops content logic into generic trip points and register them with the thermal zone.
--- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 71 ++++---------------- 2 files changed, 13 insertions(+), 60 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +1 -1
@@ -501,7 +501,7 @@ struct iwl_mvm_tt_mgmt {* @tzone: thermal zone device data */ struct iwl_mvm_thermal_device { -s16 temp_trips[IWL_MAX_DTS_TRIPS ]; +struct thermal_trip trips[IWL_MAX_DTS_TRIPS ];u8 fw_trips_index[IWL_MAX_DTS_TRIPS ];struct thermal_zone_device *tzone; };
drivers/net/wireless/intel/iwlwifi/mvm/tt.c +12 -59
131 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH 2/2 thermal/drivers/mellanox: Use generic thermal_zone_get_trip() function
The thermal framework gives the possibility to register the trip points with the thermal zone. When that is done, no get_trip_* ops are needed and they can be removed.
Convert ops content logic into generic trip points and register them with the thermal zone.
--- .../ethernet/mellanox/mlxsw/core_thermal.c | 209 ++++-------------- 1 file changed, 48 insertions(+), 161 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +48 -161
@@ -36,33 +36,39 @@ enum mlxsw_thermal_trips { MLXSW_THERMAL_TEMP_TRIP_HOT, }; -struct mlxsw_thermal_trip { -int type; -int temp; -int hyst; +struct mlxsw_cooling_states {int min_state;int max_state; }; -static const struct mlxsw_thermal_trip default_thermal_trips[] = { +static const struct thermal_trip default_thermal_trips[] = { {/* In range - 0-40% PWM */ .type =THERMAL_TRIP_ACTIVE , - .temp =MLXSW_THERMAL_ASIC_TEMP_NORM , - .hyst =MLXSW_THERMAL_HYSTERESIS_TEMP , - .min_state =0 , - .max_state = (4 *MLXSW_THERMAL_MAX_STATE ) /10 , + .temperature =MLXSW_THERMAL_ASIC_TEMP_NORM , + .hysteresis =MLXSW_THERMAL_HYSTERESIS_TEMP , }, {/* In range - 40-100% PWM */ .type =THERMAL_TRIP_ACTIVE , - .temp =MLXSW_THERMAL_ASIC_TEMP_HIGH , - .hyst =MLXSW_THERMAL_HYSTERESIS_TEMP , - .min_state = (4 *MLXSW_THERMAL_MAX_STATE ) /10 , - .max_state =MLXSW_THERMAL_MAX_STATE , + .temperature =MLXSW_THERMAL_ASIC_TEMP_HIGH , + .hysteresis =MLXSW_THERMAL_HYSTERESIS_TEMP , }, {/* Warning */ .type =THERMAL_TRIP_HOT , - .temp =MLXSW_THERMAL_ASIC_TEMP_HOT , + .temperature =MLXSW_THERMAL_ASIC_TEMP_HOT , + }, +}; + +static const struct mlxsw_cooling_states default_cooling_states[] = { + { + .min_state =0 , + .max_state = (4 *MLXSW_THERMAL_MAX_STATE ) /10 , + }, + { + .min_state = (4 *MLXSW_THERMAL_MAX_STATE ) /10 , + .max_state =MLXSW_THERMAL_MAX_STATE , + }, + { .min_state =MLXSW_THERMAL_MAX_STATE , .max_state =MLXSW_THERMAL_MAX_STATE , },
@@ -78,7 +84,8 @@ struct mlxsw_thermal;struct mlxsw_thermal_module {struct mlxsw_thermal *parent;struct thermal_zone_device *tzdev; -struct mlxsw_thermal_trip trips[MLXSW_THERMAL_NUM_TRIPS ]; +struct thermal_trip trips[MLXSW_THERMAL_NUM_TRIPS ]; +struct mlxsw_cooling_states cooling_states[MLXSW_THERMAL_NUM_TRIPS ];int module;/* Module or gearbox number */ u8 slot_index; };
@@ -99,7 +106,8 @@ struct mlxsw_thermal {int polling_delay;struct thermal_cooling_device *cdevs[MLXSW_MFCR_PWMS_MAX ];u8 cooling_levels[MLXSW_THERMAL_MAX_STATE +1 ]; -struct mlxsw_thermal_trip trips[MLXSW_THERMAL_NUM_TRIPS ]; +struct thermal_trip trips[MLXSW_THERMAL_NUM_TRIPS ]; +struct mlxsw_cooling_states cooling_states[MLXSW_THERMAL_NUM_TRIPS ];struct mlxsw_thermal_area line_cards[]; };
@@ -136,9 +144,9 @@ static int mlxsw_get_cooling_device_idx(struct mlxsw_thermal *thermal,static void mlxsw_thermal_module_trips_reset (struct mlxsw_thermal_module *tz) { - tz->trips[MLXSW_THERMAL_TEMP_TRIP_NORM ].temp =0 ; - tz->trips[MLXSW_THERMAL_TEMP_TRIP_HIGH ].temp =0 ; - tz->trips[MLXSW_THERMAL_TEMP_TRIP_HOT ].temp =0 ; + tz->trips[MLXSW_THERMAL_TEMP_TRIP_NORM ].temperature =0 ; + tz->trips[MLXSW_THERMAL_TEMP_TRIP_HIGH ].temperature =0 ; + tz->trips[MLXSW_THERMAL_TEMP_TRIP_HOT ].temperature =0 ; } static int
@@ -180,12 +188,12 @@ mlxsw_thermal_module_trips_update(struct device *dev, struct mlxsw_core *core,* by subtracting double hysteresis value. */ if (crit_temp >=MLXSW_THERMAL_MODULE_TEMP_SHIFT ) - tz->trips[MLXSW_THERMAL_TEMP_TRIP_NORM ].temp = crit_temp - + tz->trips[MLXSW_THERMAL_TEMP_TRIP_NORM ].temperature = crit_temp -MLXSW_THERMAL_MODULE_TEMP_SHIFT ;else - tz->trips[MLXSW_THERMAL_TEMP_TRIP_NORM ].temp = crit_temp; - tz->trips[MLXSW_THERMAL_TEMP_TRIP_HIGH ].temp = crit_temp; - tz->trips[MLXSW_THERMAL_TEMP_TRIP_HOT ].temp = emerg_temp; + tz->trips[MLXSW_THERMAL_TEMP_TRIP_NORM ].temperature = crit_temp; + tz->trips[MLXSW_THERMAL_TEMP_TRIP_HIGH ].temperature = crit_temp; + tz->trips[MLXSW_THERMAL_TEMP_TRIP_HOT ].temperature = emerg_temp;return 0 ; }
@@ -202,11 +210,11 @@ static int mlxsw_thermal_bind(struct thermal_zone_device *tzdev,return 0 ;for (i =0 ; i <MLXSW_THERMAL_NUM_TRIPS ; i++) { -const struct mlxsw_thermal_trip *trip = &thermal->trips[i]; +const struct mlxsw_cooling_states *state = &thermal->cooling_states[i]; err =thermal_zone_bind_cooling_device (tzdev, i, cdev, - trip->max_state, - trip->min_state, + state->max_state, + state->min_state,THERMAL_WEIGHT_DEFAULT );if (err <0 ) {dev_err (dev,"Failed to bind cooling device to trip %d\n" , i);
@@ -260,61 +268,6 @@ static int mlxsw_thermal_get_temp(struct thermal_zone_device *tzdev,return 0 ; } -static int mlxsw_thermal_get_trip_type (struct thermal_zone_device *tzdev, -int trip, -enum thermal_trip_type *p_type) -{ -struct mlxsw_thermal *thermal = tzdev->devdata; - -if (trip <0 || trip >=MLXSW_THERMAL_NUM_TRIPS ) -return -EINVAL ; - - *p_type = thermal->trips[trip].type; -return 0 ; -} - -static int mlxsw_thermal_get_trip_temp (struct thermal_zone_device *tzdev, -int trip,int *p_temp) -{ -struct mlxsw_thermal *thermal = tzdev->devdata; - -if (trip <0 || trip >=MLXSW_THERMAL_NUM_TRIPS ) -return -EINVAL ; - - *p_temp = thermal->trips[trip].temp; -return 0 ; -} - -static int mlxsw_thermal_set_trip_temp (struct thermal_zone_device *tzdev, -int trip,int temp) -{ -struct mlxsw_thermal *thermal = tzdev->devdata; - -if (trip <0 || trip >=MLXSW_THERMAL_NUM_TRIPS ) -return -EINVAL ; - - thermal->trips[trip].temp = temp; -return 0 ; -} - -static int mlxsw_thermal_get_trip_hyst (struct thermal_zone_device *tzdev, -int trip,int *p_hyst) -{ -struct mlxsw_thermal *thermal = tzdev->devdata; - - *p_hyst = thermal->trips[trip].hyst; -return 0 ; -} - -static int mlxsw_thermal_set_trip_hyst (struct thermal_zone_device *tzdev, -int trip,int hyst) -{ -struct mlxsw_thermal *thermal = tzdev->devdata; - - thermal->trips[trip].hyst = hyst; -return 0 ; -} -static struct thermal_zone_params mlxsw_thermal_params = { .no_hwmon = true, };
@@ -323,11 +276,6 @@ static struct thermal_zone_device_ops mlxsw_thermal_ops = { .bind = mlxsw_thermal_bind, .unbind = mlxsw_thermal_unbind, .get_temp = mlxsw_thermal_get_temp, - .get_trip_type = mlxsw_thermal_get_trip_type, - .get_trip_temp = mlxsw_thermal_get_trip_temp, - .set_trip_temp = mlxsw_thermal_set_trip_temp, - .get_trip_hyst = mlxsw_thermal_get_trip_hyst, - .set_trip_hyst = mlxsw_thermal_set_trip_hyst, }; static int mlxsw_thermal_module_bind(struct thermal_zone_device *tzdev,
@@ -342,11 +290,11 @@ static int mlxsw_thermal_module_bind(struct thermal_zone_device *tzdev,return 0 ;for (i =0 ; i <MLXSW_THERMAL_NUM_TRIPS ; i++) { -const struct mlxsw_thermal_trip *trip = &tz->trips[i]; +const struct mlxsw_cooling_states *state = &tz->cooling_states[i]; err =thermal_zone_bind_cooling_device (tzdev, i, cdev, - trip->max_state, - trip->min_state, + state->max_state, + state->min_state,THERMAL_WEIGHT_DEFAULT );if (err <0 ) goto err_thermal_zone_bind_cooling_device;
@@ -434,74 +382,10 @@ static int mlxsw_thermal_module_temp_get(struct thermal_zone_device *tzdev,return 0 ; } -static int -mlxsw_thermal_module_trip_type_get (struct thermal_zone_device *tzdev,int trip, -enum thermal_trip_type *p_type) -{ -struct mlxsw_thermal_module *tz = tzdev->devdata; - -if (trip <0 || trip >=MLXSW_THERMAL_NUM_TRIPS ) -return -EINVAL ; - - *p_type = tz->trips[trip].type; -return 0 ; -} - -static int -mlxsw_thermal_module_trip_temp_get (struct thermal_zone_device *tzdev, -int trip,int *p_temp) -{ -struct mlxsw_thermal_module *tz = tzdev->devdata; - -if (trip <0 || trip >=MLXSW_THERMAL_NUM_TRIPS ) -return -EINVAL ; - - *p_temp = tz->trips[trip].temp; -return 0 ; -} - -static int -mlxsw_thermal_module_trip_temp_set (struct thermal_zone_device *tzdev, -int trip,int temp) -{ -struct mlxsw_thermal_module *tz = tzdev->devdata; - -if (trip <0 || trip >=MLXSW_THERMAL_NUM_TRIPS ) -return -EINVAL ; - - tz->trips[trip].temp = temp; -return 0 ; -} - -static int -mlxsw_thermal_module_trip_hyst_get (struct thermal_zone_device *tzdev,int trip, -int *p_hyst) -{ -struct mlxsw_thermal_module *tz = tzdev->devdata; - - *p_hyst = tz->trips[trip].hyst; -return 0 ; -} - -static int -mlxsw_thermal_module_trip_hyst_set (struct thermal_zone_device *tzdev,int trip, -int hyst) -{ -struct mlxsw_thermal_module *tz = tzdev->devdata; - - tz->trips[trip].hyst = hyst; -return 0 ; -} -static struct thermal_zone_device_ops mlxsw_thermal_module_ops = { .bind = mlxsw_thermal_module_bind, .unbind = mlxsw_thermal_module_unbind, .get_temp = mlxsw_thermal_module_temp_get, - .get_trip_type = mlxsw_thermal_module_trip_type_get, - .get_trip_temp = mlxsw_thermal_module_trip_temp_get, - .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, }; static int mlxsw_thermal_gearbox_temp_get(struct thermal_zone_device *tzdev,
@@ -531,11 +415,6 @@ static struct thermal_zone_device_ops mlxsw_thermal_gearbox_ops = { .bind = mlxsw_thermal_module_bind, .unbind = mlxsw_thermal_module_unbind, .get_temp = mlxsw_thermal_gearbox_temp_get, - .get_trip_type = mlxsw_thermal_module_trip_type_get, - .get_trip_temp = mlxsw_thermal_module_trip_temp_get, - .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, }; static int mlxsw_thermal_get_max_state(struct thermal_cooling_device *cdev,
@@ -617,7 +496,8 @@ mlxsw_thermal_module_tz_init(struct mlxsw_thermal_module *module_tz)else snprintf (tz_name,sizeof (tz_name),"mlxsw-module%d" , module_tz->module +1 ); - module_tz->tzdev = thermal_zone_device_register(tz_name, + module_tz->tzdev = thermal_zone_device_register_with_trips(tz_name, + module_tz->trips, MLXSW_THERMAL_NUM_TRIPS, MLXSW_THERMAL_TRIP_MASK, module_tz,
@@ -661,6 +541,8 @@ mlxsw_thermal_module_init(struct device *dev, struct mlxsw_core *core, module_tz->parent = thermal;memcpy (module_tz->trips, default_thermal_trips,sizeof (thermal->trips)); +memcpy (module_tz->cooling_states, default_cooling_states, +sizeof (thermal->cooling_states));/* Initialize all trip point. */ mlxsw_thermal_module_trips_reset (module_tz);/* Read module temperature and thresholds. */
@@ -756,7 +638,8 @@ mlxsw_thermal_gearbox_tz_init(struct mlxsw_thermal_module *gearbox_tz)else snprintf (tz_name,sizeof (tz_name),"mlxsw-gearbox%d" , gearbox_tz->module +1 ); - gearbox_tz->tzdev = thermal_zone_device_register(tz_name, + gearbox_tz->tzdev = thermal_zone_device_register_with_trips(tz_name, + gearbox_tz->trips, MLXSW_THERMAL_NUM_TRIPS, MLXSW_THERMAL_TRIP_MASK, gearbox_tz,
@@ -813,6 +696,8 @@ mlxsw_thermal_gearboxes_init(struct device *dev, struct mlxsw_core *core, gearbox_tz = &area->tz_gearbox_arr[i];memcpy (gearbox_tz->trips, default_thermal_trips,sizeof (thermal->trips)); +memcpy (gearbox_tz->cooling_states, default_cooling_states, +sizeof (thermal->cooling_states)); gearbox_tz->module = i; gearbox_tz->parent = thermal; gearbox_tz->slot_index = area->slot_index;
@@ -928,6 +813,7 @@ int mlxsw_thermal_init(struct mlxsw_core *core, thermal->core = core; thermal->bus_info = bus_info;memcpy (thermal->trips, default_thermal_trips,sizeof (thermal->trips)); +memcpy (thermal->cooling_states, default_cooling_states,sizeof (thermal->cooling_states)); thermal->line_cards[0 ].slot_index =0 ; err =mlxsw_reg_query (thermal->core,MLXSW_REG (mfcr), mfcr_pl);
@@ -981,7 +867,8 @@ int mlxsw_thermal_init(struct mlxsw_core *core, MLXSW_THERMAL_SLOW_POLL_INT :MLXSW_THERMAL_POLL_INT ; - thermal->tzdev = thermal_zone_device_register("mlxsw", + thermal->tzdev = thermal_zone_device_register_with_trips("mlxsw", + thermal->trips, MLXSW_THERMAL_NUM_TRIPS, MLXSW_THERMAL_TRIP_MASK, thermal,
Signature · 1 line
2.34.1
Ido Schimmel
maintainerRe: [PATCH 2/2] thermal/drivers/mellanox: Use generic thermal_zone_get_trip() function
+ Vadim
Quoted 8 lines · Daniel Lezcano
The thermal framework gives the possibility to register the trip points with the thermal zone. When that is done, no get_trip_* ops are needed and they can be removed.
Convert ops content logic into generic trip points and register them with the thermal zone.
Signed-off-by Daniel Lezcano <[email protected]>
Vadim, can you please review and test?
Daniel, I saw that you wrote to Kalle that you want to take it via the thermal tree. Any reason not to take it via net-next? I'm asking because it will be the second release in a row where we need to try to avoid conflicts in this file.
Thanks
Re: [PATCH 2/2] thermal/drivers/mellanox: Use generic thermal_zone_get_trip() function
Hi Ido,
Quoted 10 lines · Ido Schimmel
+ Vadim
Quoted 7 lines · Daniel Lezcano
The thermal framework gives the possibility to register the trip points with the thermal zone. When that is done, no get_trip_* ops are needed and they can be removed.
Convert ops content logic into generic trip points and register them with the thermal zone.
Quoted 8 lines
Quoted 1 line
Signed-off-by Daniel Lezcano <[email protected]>Vadim, can you please review and test?
Daniel, I saw that you wrote to Kalle that you want to take it via the thermal tree. Any reason not to take it via net-next? I'm asking because it will be the second release in a row where we need to try to avoid conflicts in this file.
Because I hope I can remove the ops->get_trip_ ops from thermal_ops structure before the end of this cycle.
May be you can consider moving the thermal driver into drivers/thermal?
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
Ido Schimmel
maintainerRe: [PATCH 2/2] thermal/drivers/mellanox: Use generic thermal_zone_get_trip() function
Quoted 2 lines · Daniel Lezcano
Because I hope I can remove the
ops->get_trip_ops fromthermal_opsstructure before the end of this cycle.
OK. Vadim, any chance you can review the patch?
Quoted 1 line
May be you can consider moving the thermal driver into
drivers/thermal?
I don't think it's worth the hassle (if possible at all). In practice, this code is upstream for almost six years and IIRC we didn't have any conflicts with the thermal tree. I don't expect conflicts this cycle either.
RE: [PATCH 2/2] thermal/drivers/mellanox: Use generic thermal_zone_get_trip() function
Quoted 16 lines
-----Original Message-----
From: Ido Schimmel <[email protected]>
Sent: Tuesday, 25 October 2022 13:32
To: Daniel Lezcano <[email protected]>; Vadim Pasternak <[email protected]>
Cc: Vadim Pasternak <[email protected]>; [email protected]; linux- [email protected]; [email protected]; Petr Machata <[email protected]>; David S. Miller <[email protected]>; Eric Dumazet <[email protected]>; Jakub Kicinski <[email protected]>; Paolo Abeni <[email protected]>; open list:MELLANOX ETHERNET SWITCH DRIVERS <[email protected]>
Subject: Re: [PATCH 2/2] thermal/drivers/mellanox: Use genericthermal_zone_get_trip()function
Quoted 5 lines
Quoted 2 lines · Daniel Lezcano
Because I hope I can remove the
ops->get_trip_ops fromthermal_opsstructure before the end of this cycle.OK. Vadim, any chance you can review the patch?
It seems to be OK.
Anyway, I'll take this patch for testing by the end of this week and update.
Quoted 6 lines
Quoted 2 lines
May be you can consider moving the thermal driver into
drivers/thermal?I don't think it's worth the hassle (if possible at all). In practice, this code is upstream for almost six years and IIRC we didn't have any conflicts with the thermal tree. I don't expect conflicts this cycle either.
RE: [PATCH 2/2] thermal/drivers/mellanox: Use generic thermal_zone_get_trip() function
Quoted 33 lines
-----Original Message-----
From: Vadim Pasternak
Sent: Sunday, 30 October 2022 19:24
To: Ido Schimmel <[email protected]>; Daniel Lezcano <[email protected]>
Cc: [email protected]; [email protected]; linux- [email protected]; Petr Machata <[email protected]>; David S. Miller <[email protected]>; Eric Dumazet <[email protected]>; Jakub Kicinski <[email protected]>; Paolo Abeni <[email protected]>; open list:MELLANOX ETHERNET SWITCH DRIVERS <[email protected]>
Subject: RE: [PATCH 2/2] thermal/drivers/mellanox: Use genericthermal_zone_get_trip()functionQuoted 9 lines
-----Original Message-----
From: Ido Schimmel <[email protected]>
Sent: Tuesday, 25 October 2022 13:32
To: Daniel Lezcano <[email protected]>; Vadim Pasternak <[email protected]>
Cc: Vadim Pasternak <[email protected]>; [email protected]; linux- [email protected]; [email protected]; Petr Machata <[email protected]>; David S. Miller <[email protected]>; Eric Dumazet <[email protected]>; Jakub Kicinski <[email protected]>;Paolo
Quoted 1 line
Abeni <[email protected]>; open list:MELLANOX ETHERNET SWITCH
DRIVERS
Quoted 4 lines
<[email protected]>
Subject: Re: [PATCH 2/2] thermal/drivers/mellanox: Use genericthermal_zone_get_trip()function
Quoted 9 lines
Quoted 5 lines · Daniel Lezcano
Quoted 2 lines
Because I hope I can remove the
ops->get_trip_ops fromthermal_opsstructure before the end of this cycle.OK. Vadim, any chance you can review the patch?
It seems to be OK.
Anyway, I'll take this patch for testing by the end of this week and update.
Hi guys,
I see this patch is already applied to Linux-next.
I tested it along with relevant patches from drivers/thermal and it looks OK.
Thanks,
Vadim.
Quoted 6 lines
Quoted 6 lines
Quoted 2 lines
May be you can consider moving the thermal driver into
drivers/thermal?I don't think it's worth the hassle (if possible at all). In practice, this code is upstream for almost six years and IIRC we didn't have any conflicts with the thermal tree. I don't expect conflicts this cycle either.
[thermal: thermal/next] thermal/drivers/mellanox: Use generic thermal_zone_get_trip() function
In reply to Daniel LezcanoThe following commit has been merged into the thermal/next branch of thermal:
The following commit has been merged into the thermal/next branch of thermal:
Commit-ID: c147694778b1aa7e3faed10b61256fe03e605f3b Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//c147694778b1aa7e3faed10b61256fe03e605f3b Author: Daniel Lezcano <[email protected]> AuthorDate: Fri, 14 Oct 2022 09:32:51 +02:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Thu, 08 Dec 2022 14:30:43 +01:00
thermal/drivers/mellanox: Use generic thermal_zone_get_trip() function
The thermal framework gives the possibility to register the trip points with the thermal zone. When that is done, no get_trip_* ops are needed and they can be removed.
Convert ops content logic into generic trip points and register them with the thermal zone.
--- drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 209 ++---------- 1 file changed, 48 insertions(+), 161 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +48 -161
@@ -36,33 +36,39 @@ enum mlxsw_thermal_trips { MLXSW_THERMAL_TEMP_TRIP_HOT, }; -struct mlxsw_thermal_trip { -int type; -int temp; -int hyst; +struct mlxsw_cooling_states {int min_state;int max_state; }; -static const struct mlxsw_thermal_trip default_thermal_trips[] = { +static const struct thermal_trip default_thermal_trips[] = { {/* In range - 0-40% PWM */ .type =THERMAL_TRIP_ACTIVE , - .temp =MLXSW_THERMAL_ASIC_TEMP_NORM , - .hyst =MLXSW_THERMAL_HYSTERESIS_TEMP , - .min_state =0 , - .max_state = (4 *MLXSW_THERMAL_MAX_STATE ) /10 , + .temperature =MLXSW_THERMAL_ASIC_TEMP_NORM , + .hysteresis =MLXSW_THERMAL_HYSTERESIS_TEMP , }, {/* In range - 40-100% PWM */ .type =THERMAL_TRIP_ACTIVE , - .temp =MLXSW_THERMAL_ASIC_TEMP_HIGH , - .hyst =MLXSW_THERMAL_HYSTERESIS_TEMP , - .min_state = (4 *MLXSW_THERMAL_MAX_STATE ) /10 , - .max_state =MLXSW_THERMAL_MAX_STATE , + .temperature =MLXSW_THERMAL_ASIC_TEMP_HIGH , + .hysteresis =MLXSW_THERMAL_HYSTERESIS_TEMP , }, {/* Warning */ .type =THERMAL_TRIP_HOT , - .temp =MLXSW_THERMAL_ASIC_TEMP_HOT , + .temperature =MLXSW_THERMAL_ASIC_TEMP_HOT , + }, +}; + +static const struct mlxsw_cooling_states default_cooling_states[] = { + { + .min_state =0 , + .max_state = (4 *MLXSW_THERMAL_MAX_STATE ) /10 , + }, + { + .min_state = (4 *MLXSW_THERMAL_MAX_STATE ) /10 , + .max_state =MLXSW_THERMAL_MAX_STATE , + }, + { .min_state =MLXSW_THERMAL_MAX_STATE , .max_state =MLXSW_THERMAL_MAX_STATE , },
@@ -78,7 +84,8 @@ struct mlxsw_thermal;struct mlxsw_thermal_module {struct mlxsw_thermal *parent;struct thermal_zone_device *tzdev; -struct mlxsw_thermal_trip trips[MLXSW_THERMAL_NUM_TRIPS ]; +struct thermal_trip trips[MLXSW_THERMAL_NUM_TRIPS ]; +struct mlxsw_cooling_states cooling_states[MLXSW_THERMAL_NUM_TRIPS ];int module;/* Module or gearbox number */ u8 slot_index; };
@@ -99,7 +106,8 @@ struct mlxsw_thermal {int polling_delay;struct thermal_cooling_device *cdevs[MLXSW_MFCR_PWMS_MAX ];u8 cooling_levels[MLXSW_THERMAL_MAX_STATE +1 ]; -struct mlxsw_thermal_trip trips[MLXSW_THERMAL_NUM_TRIPS ]; +struct thermal_trip trips[MLXSW_THERMAL_NUM_TRIPS ]; +struct mlxsw_cooling_states cooling_states[MLXSW_THERMAL_NUM_TRIPS ];struct mlxsw_thermal_area line_cards[]; };
@@ -136,9 +144,9 @@ static int mlxsw_get_cooling_device_idx(struct mlxsw_thermal *thermal,static void mlxsw_thermal_module_trips_reset (struct mlxsw_thermal_module *tz) { - tz->trips[MLXSW_THERMAL_TEMP_TRIP_NORM ].temp =0 ; - tz->trips[MLXSW_THERMAL_TEMP_TRIP_HIGH ].temp =0 ; - tz->trips[MLXSW_THERMAL_TEMP_TRIP_HOT ].temp =0 ; + tz->trips[MLXSW_THERMAL_TEMP_TRIP_NORM ].temperature =0 ; + tz->trips[MLXSW_THERMAL_TEMP_TRIP_HIGH ].temperature =0 ; + tz->trips[MLXSW_THERMAL_TEMP_TRIP_HOT ].temperature =0 ; } static int
@@ -180,12 +188,12 @@ mlxsw_thermal_module_trips_update(struct device *dev, struct mlxsw_core *core,* by subtracting double hysteresis value. */ if (crit_temp >=MLXSW_THERMAL_MODULE_TEMP_SHIFT ) - tz->trips[MLXSW_THERMAL_TEMP_TRIP_NORM ].temp = crit_temp - + tz->trips[MLXSW_THERMAL_TEMP_TRIP_NORM ].temperature = crit_temp -MLXSW_THERMAL_MODULE_TEMP_SHIFT ;else - tz->trips[MLXSW_THERMAL_TEMP_TRIP_NORM ].temp = crit_temp; - tz->trips[MLXSW_THERMAL_TEMP_TRIP_HIGH ].temp = crit_temp; - tz->trips[MLXSW_THERMAL_TEMP_TRIP_HOT ].temp = emerg_temp; + tz->trips[MLXSW_THERMAL_TEMP_TRIP_NORM ].temperature = crit_temp; + tz->trips[MLXSW_THERMAL_TEMP_TRIP_HIGH ].temperature = crit_temp; + tz->trips[MLXSW_THERMAL_TEMP_TRIP_HOT ].temperature = emerg_temp;return 0 ; }
@@ -202,11 +210,11 @@ static int mlxsw_thermal_bind(struct thermal_zone_device *tzdev,return 0 ;for (i =0 ; i <MLXSW_THERMAL_NUM_TRIPS ; i++) { -const struct mlxsw_thermal_trip *trip = &thermal->trips[i]; +const struct mlxsw_cooling_states *state = &thermal->cooling_states[i]; err =thermal_zone_bind_cooling_device (tzdev, i, cdev, - trip->max_state, - trip->min_state, + state->max_state, + state->min_state,THERMAL_WEIGHT_DEFAULT );if (err <0 ) {dev_err (dev,"Failed to bind cooling device to trip %d\n" , i);
@@ -260,61 +268,6 @@ static int mlxsw_thermal_get_temp(struct thermal_zone_device *tzdev,return 0 ; } -static int mlxsw_thermal_get_trip_type (struct thermal_zone_device *tzdev, -int trip, -enum thermal_trip_type *p_type) -{ -struct mlxsw_thermal *thermal = tzdev->devdata; - -if (trip <0 || trip >=MLXSW_THERMAL_NUM_TRIPS ) -return -EINVAL ; - - *p_type = thermal->trips[trip].type; -return 0 ; -} - -static int mlxsw_thermal_get_trip_temp (struct thermal_zone_device *tzdev, -int trip,int *p_temp) -{ -struct mlxsw_thermal *thermal = tzdev->devdata; - -if (trip <0 || trip >=MLXSW_THERMAL_NUM_TRIPS ) -return -EINVAL ; - - *p_temp = thermal->trips[trip].temp; -return 0 ; -} - -static int mlxsw_thermal_set_trip_temp (struct thermal_zone_device *tzdev, -int trip,int temp) -{ -struct mlxsw_thermal *thermal = tzdev->devdata; - -if (trip <0 || trip >=MLXSW_THERMAL_NUM_TRIPS ) -return -EINVAL ; - - thermal->trips[trip].temp = temp; -return 0 ; -} - -static int mlxsw_thermal_get_trip_hyst (struct thermal_zone_device *tzdev, -int trip,int *p_hyst) -{ -struct mlxsw_thermal *thermal = tzdev->devdata; - - *p_hyst = thermal->trips[trip].hyst; -return 0 ; -} - -static int mlxsw_thermal_set_trip_hyst (struct thermal_zone_device *tzdev, -int trip,int hyst) -{ -struct mlxsw_thermal *thermal = tzdev->devdata; - - thermal->trips[trip].hyst = hyst; -return 0 ; -} -static struct thermal_zone_params mlxsw_thermal_params = { .no_hwmon = true, };
@@ -323,11 +276,6 @@ static struct thermal_zone_device_ops mlxsw_thermal_ops = { .bind = mlxsw_thermal_bind, .unbind = mlxsw_thermal_unbind, .get_temp = mlxsw_thermal_get_temp, - .get_trip_type = mlxsw_thermal_get_trip_type, - .get_trip_temp = mlxsw_thermal_get_trip_temp, - .set_trip_temp = mlxsw_thermal_set_trip_temp, - .get_trip_hyst = mlxsw_thermal_get_trip_hyst, - .set_trip_hyst = mlxsw_thermal_set_trip_hyst, }; static int mlxsw_thermal_module_bind(struct thermal_zone_device *tzdev,
@@ -342,11 +290,11 @@ static int mlxsw_thermal_module_bind(struct thermal_zone_device *tzdev,return 0 ;for (i =0 ; i <MLXSW_THERMAL_NUM_TRIPS ; i++) { -const struct mlxsw_thermal_trip *trip = &tz->trips[i]; +const struct mlxsw_cooling_states *state = &tz->cooling_states[i]; err =thermal_zone_bind_cooling_device (tzdev, i, cdev, - trip->max_state, - trip->min_state, + state->max_state, + state->min_state,THERMAL_WEIGHT_DEFAULT );if (err <0 ) goto err_thermal_zone_bind_cooling_device;
@@ -434,74 +382,10 @@ static int mlxsw_thermal_module_temp_get(struct thermal_zone_device *tzdev,return 0 ; } -static int -mlxsw_thermal_module_trip_type_get (struct thermal_zone_device *tzdev,int trip, -enum thermal_trip_type *p_type) -{ -struct mlxsw_thermal_module *tz = tzdev->devdata; - -if (trip <0 || trip >=MLXSW_THERMAL_NUM_TRIPS ) -return -EINVAL ; - - *p_type = tz->trips[trip].type; -return 0 ; -} - -static int -mlxsw_thermal_module_trip_temp_get (struct thermal_zone_device *tzdev, -int trip,int *p_temp) -{ -struct mlxsw_thermal_module *tz = tzdev->devdata; - -if (trip <0 || trip >=MLXSW_THERMAL_NUM_TRIPS ) -return -EINVAL ; - - *p_temp = tz->trips[trip].temp; -return 0 ; -} - -static int -mlxsw_thermal_module_trip_temp_set (struct thermal_zone_device *tzdev, -int trip,int temp) -{ -struct mlxsw_thermal_module *tz = tzdev->devdata; - -if (trip <0 || trip >=MLXSW_THERMAL_NUM_TRIPS ) -return -EINVAL ; - - tz->trips[trip].temp = temp; -return 0 ; -} - -static int -mlxsw_thermal_module_trip_hyst_get (struct thermal_zone_device *tzdev,int trip, -int *p_hyst) -{ -struct mlxsw_thermal_module *tz = tzdev->devdata; - - *p_hyst = tz->trips[trip].hyst; -return 0 ; -} - -static int -mlxsw_thermal_module_trip_hyst_set (struct thermal_zone_device *tzdev,int trip, -int hyst) -{ -struct mlxsw_thermal_module *tz = tzdev->devdata; - - tz->trips[trip].hyst = hyst; -return 0 ; -} -static struct thermal_zone_device_ops mlxsw_thermal_module_ops = { .bind = mlxsw_thermal_module_bind, .unbind = mlxsw_thermal_module_unbind, .get_temp = mlxsw_thermal_module_temp_get, - .get_trip_type = mlxsw_thermal_module_trip_type_get, - .get_trip_temp = mlxsw_thermal_module_trip_temp_get, - .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, }; static int mlxsw_thermal_gearbox_temp_get(struct thermal_zone_device *tzdev,
@@ -531,11 +415,6 @@ static struct thermal_zone_device_ops mlxsw_thermal_gearbox_ops = { .bind = mlxsw_thermal_module_bind, .unbind = mlxsw_thermal_module_unbind, .get_temp = mlxsw_thermal_gearbox_temp_get, - .get_trip_type = mlxsw_thermal_module_trip_type_get, - .get_trip_temp = mlxsw_thermal_module_trip_temp_get, - .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, }; static int mlxsw_thermal_get_max_state(struct thermal_cooling_device *cdev,
@@ -617,7 +496,8 @@ mlxsw_thermal_module_tz_init(struct mlxsw_thermal_module *module_tz)else snprintf (tz_name,sizeof (tz_name),"mlxsw-module%d" , module_tz->module +1 ); - module_tz->tzdev = thermal_zone_device_register(tz_name, + module_tz->tzdev = thermal_zone_device_register_with_trips(tz_name, + module_tz->trips, MLXSW_THERMAL_NUM_TRIPS, MLXSW_THERMAL_TRIP_MASK, module_tz,
@@ -661,6 +541,8 @@ mlxsw_thermal_module_init(struct device *dev, struct mlxsw_core *core, module_tz->parent = thermal;memcpy (module_tz->trips, default_thermal_trips,sizeof (thermal->trips)); +memcpy (module_tz->cooling_states, default_cooling_states, +sizeof (thermal->cooling_states));/* Initialize all trip point. */ mlxsw_thermal_module_trips_reset (module_tz);/* Read module temperature and thresholds. */
@@ -756,7 +638,8 @@ mlxsw_thermal_gearbox_tz_init(struct mlxsw_thermal_module *gearbox_tz)else snprintf (tz_name,sizeof (tz_name),"mlxsw-gearbox%d" , gearbox_tz->module +1 ); - gearbox_tz->tzdev = thermal_zone_device_register(tz_name, + gearbox_tz->tzdev = thermal_zone_device_register_with_trips(tz_name, + gearbox_tz->trips, MLXSW_THERMAL_NUM_TRIPS, MLXSW_THERMAL_TRIP_MASK, gearbox_tz,
@@ -813,6 +696,8 @@ mlxsw_thermal_gearboxes_init(struct device *dev, struct mlxsw_core *core, gearbox_tz = &area->tz_gearbox_arr[i];memcpy (gearbox_tz->trips, default_thermal_trips,sizeof (thermal->trips)); +memcpy (gearbox_tz->cooling_states, default_cooling_states, +sizeof (thermal->cooling_states)); gearbox_tz->module = i; gearbox_tz->parent = thermal; gearbox_tz->slot_index = area->slot_index;
@@ -928,6 +813,7 @@ int mlxsw_thermal_init(struct mlxsw_core *core, thermal->core = core; thermal->bus_info = bus_info;memcpy (thermal->trips, default_thermal_trips,sizeof (thermal->trips)); +memcpy (thermal->cooling_states, default_cooling_states,sizeof (thermal->cooling_states)); thermal->line_cards[0 ].slot_index =0 ; err =mlxsw_reg_query (thermal->core,MLXSW_REG (mfcr), mfcr_pl);
@@ -981,7 +867,8 @@ int mlxsw_thermal_init(struct mlxsw_core *core, MLXSW_THERMAL_SLOW_POLL_INT :MLXSW_THERMAL_POLL_INT ; - thermal->tzdev = thermal_zone_device_register("mlxsw", + thermal->tzdev = thermal_zone_device_register_with_trips("mlxsw", + thermal->trips, MLXSW_THERMAL_NUM_TRIPS, MLXSW_THERMAL_TRIP_MASK, thermal,
Quoted 10 lines · Daniel Lezcano
The thermal framework gives the possibility to register the trip points with the thermal zone. When that is done, no get_trip_* ops are needed and they can be removed.
The
get_trip_temp,get_trip_hystandget_trip_typeare handled by theget_trip_point().The
set_trip_temp()generic function does some checks which are no longer needed in theset_trip_point()ops.
Quoted 8 lines
Convert ops content logic into generic trip points and register them with the thermal zone.
Signed-off-by Daniel Lezcano <[email protected]>--- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 71 ++++---------------- 2 files changed, 13 insertions(+), 60 deletions(-)
The subject should begin with "wifi: iwlwifi: ".
I don't see patch 2. Via which tree is the plan for this patch?
Gregory, please review this.
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Quoted 21 lines · Kalle Valo
Quoted 10 lines · Daniel Lezcano
The thermal framework gives the possibility to register the trip points with the thermal zone. When that is done, no get_trip_* ops are needed and they can be removed.
The
get_trip_temp,get_trip_hystandget_trip_typeare handled by theget_trip_point().The
set_trip_temp()generic function does some checks which are no longer needed in theset_trip_point()ops.Quoted 8 lines
Convert ops content logic into generic trip points and register them with the thermal zone.
Signed-off-by Daniel Lezcano <[email protected]>--- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 71 ++++---------------- 2 files changed, 13 insertions(+), 60 deletions(-)
Quoted 3 lines
The subject should begin with "wifi: iwlwifi: ".
I don't see patch 2. Via which tree is the plan for this patch?
patch 2 are similar changes but related to the mellanox driver.
This is the continuation of the trip point rework:
https://lore.kernel.org/netdev/[email protected]/t/
This patch is planned to go through the thermal tree
Sorry I should have mentioned that.
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
Greenman, Gregory
Acked-byQuoted 28 lines · Daniel Lezcano
Quoted 21 lines · Kalle Valo
Quoted 10 lines · Daniel Lezcano
The thermal framework gives the possibility to register the trip points with the thermal zone. When that is done, no get_trip_* ops are needed and they can be removed.
The
get_trip_temp,get_trip_hystandget_trip_typeare handled by theget_trip_point().The
set_trip_temp()generic function does some checks which are no longer needed in theset_trip_point()ops.Quoted 8 lines
Convert ops content logic into generic trip points and register them with the thermal zone.
Signed-off-by Daniel Lezcano <[email protected]>---
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h| 2 +- drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 71 ++++----------------2 files changed, 13 insertions(+), 60 deletions(-)Quoted 3 lines
The subject should begin with "wifi: iwlwifi: ".
I don't see patch 2. Via which tree is the plan for this patch?
patch 2 are similar changes but related to the mellanox driver.
Quoted 8 lines
This is the continuation of the trip point rework:
https://lore.kernel.org/netdev/[email protected]/t/
This patch is planned to go through the thermal tree
Sorry I should have mentioned that.
As Kalle commented above, the subject should start with wifi: iwlwifi:
The commit itself seems fine to me.
Kalle Valo
Acked-byQuoted 27 lines · Daniel Lezcano
Quoted 21 lines · Kalle Valo
Quoted 10 lines · Daniel Lezcano
The thermal framework gives the possibility to register the trip points with the thermal zone. When that is done, no get_trip_* ops are needed and they can be removed.
The
get_trip_temp,get_trip_hystandget_trip_typeare handled by theget_trip_point().The
set_trip_temp()generic function does some checks which are no longer needed in theset_trip_point()ops.Quoted 8 lines
Convert ops content logic into generic trip points and register them with the thermal zone.
Signed-off-by Daniel Lezcano <[email protected]>--- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 71 ++++---------------- 2 files changed, 13 insertions(+), 60 deletions(-)Quoted 3 lines
The subject should begin with "wifi: iwlwifi: ".
I don't see patch 2. Via which tree is the plan for this patch?
Quoted 7 lines
patch 2 are similar changes but related to the mellanox driver.
This is the continuation of the trip point rework:
https://lore.kernel.org/netdev/[email protected]/t/
This patch is planned to go through the thermal tree
Ok, feel free to take this via the thermal tree:
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
[thermal: thermal/next] wifi: iwlwifi: Use generic thermal_zone_get_trip() function
In reply to Daniel LezcanoThe following commit has been merged into the thermal/next branch of thermal:
The following commit has been merged into the thermal/next branch of thermal:
Commit-ID: ac8c83919cdd8cba05c2697fbd944ec3f6697d7b Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//ac8c83919cdd8cba05c2697fbd944ec3f6697d7b Author: Daniel Lezcano <[email protected]> AuthorDate: Fri, 14 Oct 2022 09:32:50 +02:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Thu, 08 Dec 2022 14:30:43 +01:00
wifi: iwlwifi: Use generic thermal_zone_get_trip() function
The thermal framework gives the possibility to register the trip points with the thermal zone. When that is done, no get_trip_* ops are needed and they can be removed.
The get_trip_temp, get_trip_hyst and get_trip_type are handled by the get_trip_point().
The set_trip_temp() generic function does some checks which are no longer needed in the set_trip_point() ops.
Convert ops content logic into generic trip points and register them with the thermal zone.
--- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 71 +++---------------- 2 files changed, 13 insertions(+), 60 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +1 -1
@@ -501,7 +501,7 @@ struct iwl_mvm_tt_mgmt {* @tzone: thermal zone device data */ struct iwl_mvm_thermal_device { -s16 temp_trips[IWL_MAX_DTS_TRIPS ]; +struct thermal_trip trips[IWL_MAX_DTS_TRIPS ];u8 fw_trips_index[IWL_MAX_DTS_TRIPS ];struct thermal_zone_device *tzone; };
drivers/net/wireless/intel/iwlwifi/mvm/tt.c +12 -59
131 lines not on this page · raw message