Commit 06f36055 authored by Daniel Lezcano's avatar Daniel Lezcano
Browse files

Revert "mlxsw: core: Add the hottest thermal zone detection" 

This reverts commit 2dc2f760 and
commit 6f73862f.

As discussed in the thread:

https://lore.kernel.org/all/f3c62ebe-7d59-c537-a010-bff366c8aeba@linaro.org/

the feature provided by commits 2dc2f760 and 6f73862f 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:
 - 7f4957be: thermal: Use mode helpers in drivers
 - 6a79507c: mlxsw: core: Extend thermal module with per QSFP module thermal zones

These conflicts were fixed and the resulting changes are in this patch.

Both reverts are in the same change as requested by Ido Schimmel:

https://lore.kernel.org/all/Yvz7+RUsmVco3Xpj@shredder/



Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Tested-by: default avatarVadim Pasternak <vadimp@nvidia.com>
Acked-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarIdo Schimmel <idosch@nvidia.com>
Link: https://lore.kernel.org/r/20220817153040.2464245-1-daniel.lezcano@linaro.org
parent 2f9d142c

drivers/net/ethernet/mellanox/mlxsw/core_thermal.c

+2 −75
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#define MLXSW_THERMAL_ASIC_TEMP_HOT	105000	/* 105C */

#define MLXSW_THERMAL_HYSTERESIS_TEMP	5000	/* 5C */

#define MLXSW_THERMAL_MODULE_TEMP_SHIFT	(MLXSW_THERMAL_HYSTERESIS_TEMP * 2)

#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
@@ -101,8 +100,6 @@ struct mlxsw_thermal { 
	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];

	unsigned int tz_highest_score;

	struct thermal_zone_device *tz_highest_dev;

	struct mlxsw_thermal_area line_cards[];

};
@@ -193,34 +190,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)

{
@@ -286,9 +255,6 @@ static int mlxsw_thermal_get_temp(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, thermal->trips,

					      temp);



	*p_temp = temp;

	return 0;
@@ -349,21 +315,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 *thermal = tzdev->devdata;



	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,

};
@@ -377,7 +328,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,
@@ -463,7 +413,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;
@@ -479,10 +428,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,

	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);



	return 0;

}
@@ -546,22 +493,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,
@@ -571,7 +502,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_module_trend_get,

};



static int mlxsw_thermal_gearbox_temp_get(struct thermal_zone_device *tzdev,
@@ -592,8 +522,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;
@@ -608,7 +536,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_module_trend_get,

};



static int mlxsw_thermal_get_max_state(struct thermal_cooling_device *cdev,