mlxsw: core_thermal: Set THERMAL_TRIP_FLAG_RW_TEMP directly

It is now possible to flag trip points with THERMAL_TRIP_FLAG_RW_TEMP
to allow their temperature to be set from user space via sysfs instead
of using a nonzero writable trips mask during thermal zone registration,
so make the mlxsw code do that.

No intentional functional impact.

Note that this change is requisite for dropping the mask argument from
thermal_zone_device_register_with_trips() going forward.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
index f1b48d6615f6a8b0b04089cbe3a7c3f168385939..29ec0c1221394281805e33d53100be240bdb974d 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
@@ -44,16 +44,19 @@ static const struct thermal_trip default_thermal_trips[] = {
                .type           = THERMAL_TRIP_ACTIVE,
                .temperature    = MLXSW_THERMAL_ASIC_TEMP_NORM,
                .hysteresis     = MLXSW_THERMAL_HYSTERESIS_TEMP,
+               .flags          = THERMAL_TRIP_FLAG_RW_TEMP,
        },
        {
                /* In range - 40-100% PWM */
                .type           = THERMAL_TRIP_ACTIVE,
                .temperature    = MLXSW_THERMAL_ASIC_TEMP_HIGH,
                .hysteresis     = MLXSW_THERMAL_HYSTERESIS_TEMP,
+               .flags          = THERMAL_TRIP_FLAG_RW_TEMP,
        },
        {       /* Warning */
                .type           = THERMAL_TRIP_HOT,
                .temperature    = MLXSW_THERMAL_ASIC_TEMP_HOT,
+               .flags          = THERMAL_TRIP_FLAG_RW_TEMP,
        },
 };
 
@@ -62,16 +65,19 @@ static const struct thermal_trip default_thermal_module_trips[] = {
                .type           = THERMAL_TRIP_ACTIVE,
                .temperature    = MLXSW_THERMAL_MODULE_TEMP_NORM,
                .hysteresis     = MLXSW_THERMAL_HYSTERESIS_TEMP,
+               .flags          = THERMAL_TRIP_FLAG_RW_TEMP,
        },
        {
                /* In range - 40-100% PWM */
                .type           = THERMAL_TRIP_ACTIVE,
                .temperature    = MLXSW_THERMAL_MODULE_TEMP_HIGH,
                .hysteresis     = MLXSW_THERMAL_HYSTERESIS_TEMP,
+               .flags          = THERMAL_TRIP_FLAG_RW_TEMP,
        },
        {       /* Warning */
                .type           = THERMAL_TRIP_HOT,
                .temperature    = MLXSW_THERMAL_MODULE_TEMP_HOT,
+               .flags          = THERMAL_TRIP_FLAG_RW_TEMP,
        },
 };
 
@@ -92,9 +98,6 @@ static const struct mlxsw_cooling_states default_cooling_states[] = {
 
 #define MLXSW_THERMAL_NUM_TRIPS        ARRAY_SIZE(default_thermal_trips)
 
-/* Make sure all trips are writable */
-#define MLXSW_THERMAL_TRIP_MASK        (BIT(MLXSW_THERMAL_NUM_TRIPS) - 1)
-
 struct mlxsw_thermal;
 
 struct mlxsw_thermal_module {
@@ -420,7 +423,7 @@ mlxsw_thermal_module_tz_init(struct mlxsw_thermal_module *module_tz)
        module_tz->tzdev = thermal_zone_device_register_with_trips(tz_name,
                                                        module_tz->trips,
                                                        MLXSW_THERMAL_NUM_TRIPS,
-                                                       MLXSW_THERMAL_TRIP_MASK,
+                                                       0,
                                                        module_tz,
                                                        &mlxsw_thermal_module_ops,
                                                        &mlxsw_thermal_params,
@@ -548,7 +551,7 @@ mlxsw_thermal_gearbox_tz_init(struct mlxsw_thermal_module *gearbox_tz)
        gearbox_tz->tzdev = thermal_zone_device_register_with_trips(tz_name,
                                                gearbox_tz->trips,
                                                MLXSW_THERMAL_NUM_TRIPS,
-                                               MLXSW_THERMAL_TRIP_MASK,
+                                               0,
                                                gearbox_tz,
                                                &mlxsw_thermal_gearbox_ops,
                                                &mlxsw_thermal_params, 0,
@@ -773,7 +776,7 @@ int mlxsw_thermal_init(struct mlxsw_core *core,
        thermal->tzdev = thermal_zone_device_register_with_trips("mlxsw",
                                                      thermal->trips,
                                                      MLXSW_THERMAL_NUM_TRIPS,
-                                                     MLXSW_THERMAL_TRIP_MASK,
+                                                     0,
                                                      thermal,
                                                      &mlxsw_thermal_ops,
                                                      &mlxsw_thermal_params, 0,