| Message ID | 20220801095622.949079-1-daniel.lezcano@linaro.org (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [1/2] Revert "mlxsw: core: Use different get_trend() callbacks for different thermal zones" | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Guessing tree name failed - patch did not apply |
> -----Original Message----- > From: Daniel Lezcano <daniel.lezcano@linaro.org> > Sent: Monday, August 1, 2022 12:56 PM > To: daniel.lezcano@linaro.org; rafael@kernel.org > Cc: Vadim Pasternak <vadimp@nvidia.com>; davem@davemloft.net; > netdev@vger.kernel.org; linux-kernel@vger.kernel.org; Ido Schimmel > <idosch@nvidia.com>; Petr Machata <petrm@nvidia.com>; Eric Dumazet > <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni > <pabeni@redhat.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@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. Hi Daniel, I am sorry, I didn't run emulation yet to validate this change. Will do it in tomorrow and will send ACK if it is OK. Thanks, Vadim. > > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> > --- > .../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
On Mon, 1 Aug 2022 11:13:36 +0000 Vadim Pasternak 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. > > I am sorry, I didn't run emulation yet to validate this change. > Will do it in tomorrow and will send ACK if it is OK. We'll also need a rebase on top of net-next, the patch as is does not apply to either of the networking trees.
> -----Original Message----- > From: Daniel Lezcano <daniel.lezcano@linaro.org> > Sent: Monday, August 1, 2022 12:56 PM > To: daniel.lezcano@linaro.org; rafael@kernel.org > Cc: Vadim Pasternak <vadimp@nvidia.com>; davem@davemloft.net; > netdev@vger.kernel.org; linux-kernel@vger.kernel.org; Ido Schimmel > <idosch@nvidia.com>; Petr Machata <petrm@nvidia.com>; Eric Dumazet > <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni > <pabeni@redhat.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@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.25.1
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,
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> --- .../ethernet/mellanox/mlxsw/core_thermal.c | 23 ++++--------------- 1 file changed, 4 insertions(+), 19 deletions(-)