* [PATCH v2 1/2] Revert "mlxsw: core: Use different get_trend() callbacks for different thermal zones" @ 2022-08-15 9:10 Daniel Lezcano 2022-08-15 9:10 ` [PATCH v2 2/2] Revert "mlxsw: core: Add the hottest thermal zone detection" Daniel Lezcano 2022-08-15 11:47 ` [PATCH v2 1/2] Revert "mlxsw: core: Use different get_trend() callbacks for different thermal zones" Ido Schimmel 0 siblings, 2 replies; 6+ messages in thread From: Daniel Lezcano @ 2022-08-15 9:10 UTC (permalink / raw) To: daniel.lezcano, rafael Cc: vadimp, davem, netdev, linux-kernel, Vadim Pasternak, Ido Schimmel, Petr Machata, Eric Dumazet, Jakub Kicinski, Paolo Abeni This reverts commit 2dc2f760052da4925482ecdcdc5c94d4a599153c. As discussed in the thread: https://lore.kernel.org/all/f3c62ebe-7d59-c537-a010-bff366c8aeba@linaro.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@linaro.org> Tested-by: Vadim Pasternak <vadimp@nvidia.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.34.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] Revert "mlxsw: core: Add the hottest thermal zone detection" 2022-08-15 9:10 [PATCH v2 1/2] Revert "mlxsw: core: Use different get_trend() callbacks for different thermal zones" Daniel Lezcano @ 2022-08-15 9:10 ` Daniel Lezcano 2022-08-15 11:55 ` Ido Schimmel 2022-08-15 11:47 ` [PATCH v2 1/2] Revert "mlxsw: core: Use different get_trend() callbacks for different thermal zones" Ido Schimmel 1 sibling, 1 reply; 6+ messages in thread From: Daniel Lezcano @ 2022-08-15 9:10 UTC (permalink / raw) To: daniel.lezcano, rafael Cc: vadimp, davem, netdev, linux-kernel, Vadim Pasternak, Ido Schimmel, Petr Machata, Eric Dumazet, Jakub Kicinski, Paolo Abeni This reverts commit 6f73862fabd93213de157d9cc6ef76084311c628. As discussed in the thread: https://lore.kernel.org/all/f3c62ebe-7d59-c537-a010-bff366c8aeba@linaro.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. The revert conflicts with the following changes: - 7f4957be0d5b8: thermal: Use mode helpers in drivers - 6a79507cfe94c: mlxsw: core: Extend thermal module with per QSFP module thermal zones These conflicts were fixed and the resulting changes are in this patch. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Tested-by: Vadim Pasternak <vadimp@nvidia.com> --- v2: - Fix 'err' not used as reported by kbuild test: https://lore.kernel.org/all/202208150708.fk6sfd8u-lkp@intel.com/ --- .../ethernet/mellanox/mlxsw/core_thermal.c | 64 ++----------------- 1 file changed, 4 insertions(+), 60 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c index f5751242653b..237a813fbb52 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c @@ -22,7 +22,6 @@ #define MLXSW_THERMAL_HYSTERESIS_TEMP 5000 /* 5C */ #define MLXSW_THERMAL_MODULE_TEMP_SHIFT (MLXSW_THERMAL_HYSTERESIS_TEMP * 2) #define MLXSW_THERMAL_ZONE_MAX_NAME 16 -#define MLXSW_THERMAL_TEMP_SCORE_MAX GENMASK(31, 0) #define MLXSW_THERMAL_MAX_STATE 10 #define MLXSW_THERMAL_MIN_STATE 2 #define MLXSW_THERMAL_MAX_DUTY 255 @@ -96,8 +95,6 @@ struct mlxsw_thermal { u8 tz_module_num; struct mlxsw_thermal_module *tz_gearbox_arr; u8 tz_gearbox_num; - unsigned int tz_highest_score; - struct thermal_zone_device *tz_highest_dev; }; static inline u8 mlxsw_state_to_duty(int state) @@ -186,34 +183,6 @@ mlxsw_thermal_module_trips_update(struct device *dev, struct mlxsw_core *core, return 0; } -static void mlxsw_thermal_tz_score_update(struct mlxsw_thermal *thermal, - struct thermal_zone_device *tzdev, - struct mlxsw_thermal_trip *trips, - int temp) -{ - struct mlxsw_thermal_trip *trip = trips; - unsigned int score, delta, i, shift = 1; - - /* Calculate thermal zone score, if temperature is above the hot - * threshold score is set to MLXSW_THERMAL_TEMP_SCORE_MAX. - */ - score = MLXSW_THERMAL_TEMP_SCORE_MAX; - for (i = MLXSW_THERMAL_TEMP_TRIP_NORM; i < MLXSW_THERMAL_NUM_TRIPS; - i++, trip++) { - if (temp < trip->temp) { - delta = DIV_ROUND_CLOSEST(temp, trip->temp - temp); - score = delta * shift; - break; - } - shift *= 256; - } - - if (score > thermal->tz_highest_score) { - thermal->tz_highest_score = score; - thermal->tz_highest_dev = tzdev; - } -} - static int mlxsw_thermal_bind(struct thermal_zone_device *tzdev, struct thermal_cooling_device *cdev) { @@ -278,10 +247,8 @@ static int mlxsw_thermal_get_temp(struct thermal_zone_device *tzdev, dev_err(dev, "Failed to query temp sensor\n"); return err; } + mlxsw_reg_mtmp_unpack(mtmp_pl, &temp, NULL, NULL, NULL, NULL); - if (temp > 0) - mlxsw_thermal_tz_score_update(thermal, tzdev, thermal->trips, - temp); *p_temp = temp; return 0; @@ -342,22 +309,6 @@ static int mlxsw_thermal_set_trip_hyst(struct thermal_zone_device *tzdev, return 0; } -static int mlxsw_thermal_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_params mlxsw_thermal_params = { .no_hwmon = true, }; @@ -371,7 +322,6 @@ static struct thermal_zone_device_ops mlxsw_thermal_ops = { .set_trip_temp = mlxsw_thermal_set_trip_temp, .get_trip_hyst = mlxsw_thermal_get_trip_hyst, .set_trip_hyst = mlxsw_thermal_set_trip_hyst, - .get_trend = mlxsw_thermal_trend_get, }; static int mlxsw_thermal_module_bind(struct thermal_zone_device *tzdev, @@ -456,7 +406,6 @@ static int mlxsw_thermal_module_temp_get(struct thermal_zone_device *tzdev, int temp, crit_temp, emerg_temp; struct device *dev; u16 sensor_index; - int err; dev = thermal->bus_info->dev; sensor_index = MLXSW_REG_MTMP_MODULE_INDEX_MIN + tz->module; @@ -471,10 +420,8 @@ static int mlxsw_thermal_module_temp_get(struct thermal_zone_device *tzdev, return 0; /* Update trip points. */ - err = mlxsw_thermal_module_trips_update(dev, thermal->core, tz, - crit_temp, emerg_temp); - if (!err && temp > 0) - mlxsw_thermal_tz_score_update(thermal, tzdev, tz->trips, temp); + mlxsw_thermal_module_trips_update(dev, thermal->core, tz, + crit_temp, emerg_temp); return 0; } @@ -547,7 +494,6 @@ 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_trend_get, }; static int mlxsw_thermal_gearbox_temp_get(struct thermal_zone_device *tzdev, @@ -568,8 +514,6 @@ static int mlxsw_thermal_gearbox_temp_get(struct thermal_zone_device *tzdev, return err; mlxsw_reg_mtmp_unpack(mtmp_pl, &temp, NULL, NULL, NULL, NULL); - if (temp > 0) - mlxsw_thermal_tz_score_update(thermal, tzdev, tz->trips, temp); *p_temp = temp; return 0; @@ -584,7 +528,6 @@ 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_trend_get, }; static int mlxsw_thermal_get_max_state(struct thermal_cooling_device *cdev, @@ -667,6 +610,7 @@ mlxsw_thermal_module_tz_init(struct mlxsw_thermal_module *module_tz) MLXSW_THERMAL_TRIP_MASK, module_tz, &mlxsw_thermal_module_ops, + &mlxsw_thermal_params, 0, module_tz->parent->polling_delay); -- 2.34.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/2] Revert "mlxsw: core: Add the hottest thermal zone detection" 2022-08-15 9:10 ` [PATCH v2 2/2] Revert "mlxsw: core: Add the hottest thermal zone detection" Daniel Lezcano @ 2022-08-15 11:55 ` Ido Schimmel 2022-08-15 12:15 ` Daniel Lezcano 0 siblings, 1 reply; 6+ messages in thread From: Ido Schimmel @ 2022-08-15 11:55 UTC (permalink / raw) To: Daniel Lezcano Cc: rafael, vadimp, davem, netdev, linux-kernel, Vadim Pasternak, Petr Machata, Eric Dumazet, Jakub Kicinski, Paolo Abeni On Mon, Aug 15, 2022 at 11:10:32AM +0200, Daniel Lezcano wrote: > diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c > index f5751242653b..237a813fbb52 100644 > --- a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c > +++ b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c > @@ -22,7 +22,6 @@ > #define MLXSW_THERMAL_HYSTERESIS_TEMP 5000 /* 5C */ > #define MLXSW_THERMAL_MODULE_TEMP_SHIFT (MLXSW_THERMAL_HYSTERESIS_TEMP * 2) > #define MLXSW_THERMAL_ZONE_MAX_NAME 16 Which tree is this patch from? The define is no longer in mainline: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c Getting a conflict when trying to apply this patch > -#define MLXSW_THERMAL_TEMP_SCORE_MAX GENMASK(31, 0) > #define MLXSW_THERMAL_MAX_STATE 10 > #define MLXSW_THERMAL_MIN_STATE 2 > #define MLXSW_THERMAL_MAX_DUTY 255 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/2] Revert "mlxsw: core: Add the hottest thermal zone detection" 2022-08-15 11:55 ` Ido Schimmel @ 2022-08-15 12:15 ` Daniel Lezcano 0 siblings, 0 replies; 6+ messages in thread From: Daniel Lezcano @ 2022-08-15 12:15 UTC (permalink / raw) To: Ido Schimmel Cc: rafael, vadimp, davem, netdev, linux-kernel, Vadim Pasternak, Petr Machata, Eric Dumazet, Jakub Kicinski, Paolo Abeni On 15/08/2022 13:55, Ido Schimmel wrote: > On Mon, Aug 15, 2022 at 11:10:32AM +0200, Daniel Lezcano wrote: >> diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c >> index f5751242653b..237a813fbb52 100644 >> --- a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c >> +++ b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c >> @@ -22,7 +22,6 @@ >> #define MLXSW_THERMAL_HYSTERESIS_TEMP 5000 /* 5C */ >> #define MLXSW_THERMAL_MODULE_TEMP_SHIFT (MLXSW_THERMAL_HYSTERESIS_TEMP * 2) >> #define MLXSW_THERMAL_ZONE_MAX_NAME 16 > > Which tree is this patch from? The define is no longer in mainline: > > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c It applies against: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git/log/?h=thermal/linux-next But it is not refreshed against v6.0-rc1 I'll take care of giving a respin of the patch before resending. > Getting a conflict when trying to apply this patch > >> -#define MLXSW_THERMAL_TEMP_SCORE_MAX GENMASK(31, 0) >> #define MLXSW_THERMAL_MAX_STATE 10 >> #define MLXSW_THERMAL_MIN_STATE 2 >> #define MLXSW_THERMAL_MAX_DUTY 255 -- <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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] Revert "mlxsw: core: Use different get_trend() callbacks for different thermal zones" 2022-08-15 9:10 [PATCH v2 1/2] Revert "mlxsw: core: Use different get_trend() callbacks for different thermal zones" Daniel Lezcano 2022-08-15 9:10 ` [PATCH v2 2/2] Revert "mlxsw: core: Add the hottest thermal zone detection" Daniel Lezcano @ 2022-08-15 11:47 ` Ido Schimmel 2022-08-15 11:56 ` Daniel Lezcano 1 sibling, 1 reply; 6+ messages in thread From: Ido Schimmel @ 2022-08-15 11:47 UTC (permalink / raw) To: Daniel Lezcano Cc: rafael, vadimp, davem, netdev, linux-kernel, Vadim Pasternak, Petr Machata, Eric Dumazet, Jakub Kicinski, Paolo Abeni On Mon, Aug 15, 2022 at 11:10:31AM +0200, Daniel Lezcano wrote: > This reverts commit 2dc2f760052da4925482ecdcdc5c94d4a599153c. > > As discussed in the thread: > > https://lore.kernel.org/all/f3c62ebe-7d59-c537-a010-bff366c8aeba@linaro.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@linaro.org> > Tested-by: Vadim Pasternak <vadimp@nvidia.com> Daniel, the intention is to send these patches to mainline as part of your 6.1 pull request? I discussed it with Vadim yesterday and we do not expect changes in the file during the current cycle so this is OK as far as we are concerned, but I believe this will also need an ack from one of the netdev maintainers. Thanks ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] Revert "mlxsw: core: Use different get_trend() callbacks for different thermal zones" 2022-08-15 11:47 ` [PATCH v2 1/2] Revert "mlxsw: core: Use different get_trend() callbacks for different thermal zones" Ido Schimmel @ 2022-08-15 11:56 ` Daniel Lezcano 0 siblings, 0 replies; 6+ messages in thread From: Daniel Lezcano @ 2022-08-15 11:56 UTC (permalink / raw) To: Ido Schimmel Cc: rafael, vadimp, davem, netdev, linux-kernel, Vadim Pasternak, Petr Machata, Eric Dumazet, Jakub Kicinski, Paolo Abeni Hi Ido, On 15/08/2022 13:47, Ido Schimmel wrote: > On Mon, Aug 15, 2022 at 11:10:31AM +0200, Daniel Lezcano wrote: >> This reverts commit 2dc2f760052da4925482ecdcdc5c94d4a599153c. >> >> As discussed in the thread: >> >> https://lore.kernel.org/all/f3c62ebe-7d59-c537-a010-bff366c8aeba@linaro.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@linaro.org> >> Tested-by: Vadim Pasternak <vadimp@nvidia.com> > > Daniel, the intention is to send these patches to mainline as part of > your 6.1 pull request? Yes, I told Vadim I prefer the change to go through my tree because it is part of a rework of the thermal core internals which impact more drivers. > I discussed it with Vadim yesterday and we do not expect changes in the > file during the current cycle so this is OK as far as we are concerned, > but I believe this will also need an ack from one of the netdev > maintainers. Sure. Dave, Eric, Is that fine if the changes go through my tree ? -- <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 ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-08-15 12:15 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-08-15 9:10 [PATCH v2 1/2] Revert "mlxsw: core: Use different get_trend() callbacks for different thermal zones" Daniel Lezcano 2022-08-15 9:10 ` [PATCH v2 2/2] Revert "mlxsw: core: Add the hottest thermal zone detection" Daniel Lezcano 2022-08-15 11:55 ` Ido Schimmel 2022-08-15 12:15 ` Daniel Lezcano 2022-08-15 11:47 ` [PATCH v2 1/2] Revert "mlxsw: core: Use different get_trend() callbacks for different thermal zones" Ido Schimmel 2022-08-15 11:56 ` Daniel Lezcano
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).