mlxsw: core_thermal: Add line card id prefix to line card thermal zone name

Add prefix "lc#n" to thermal zones associated with the thermal objects
found on line cards.

For example thermal zone for module #9 located at line card #7 will
have type:
mlxsw-lc7-module9.
And thermal zone for gearbox #3 located at line card #5 will have type:
mlxsw-lc5-gearbox3.

Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
index 6d186cc74df303b5b851add06d7fa79882dd2f36..23ff214367d3b23b35b0f5ca826148b0bb9d8e56 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
@@ -685,8 +685,12 @@ mlxsw_thermal_module_tz_init(struct mlxsw_thermal_module *module_tz)
        char tz_name[MLXSW_THERMAL_ZONE_MAX_NAME];
        int err;
 
-       snprintf(tz_name, sizeof(tz_name), "mlxsw-module%d",
-                module_tz->module + 1);
+       if (module_tz->slot_index)
+               snprintf(tz_name, sizeof(tz_name), "mlxsw-lc%d-module%d",
+                        module_tz->slot_index, module_tz->module + 1);
+       else
+               snprintf(tz_name, sizeof(tz_name), "mlxsw-module%d",
+                        module_tz->module + 1);
        module_tz->tzdev = thermal_zone_device_register(tz_name,
                                                        MLXSW_THERMAL_NUM_TRIPS,
                                                        MLXSW_THERMAL_TRIP_MASK,
@@ -820,8 +824,12 @@ mlxsw_thermal_gearbox_tz_init(struct mlxsw_thermal_module *gearbox_tz)
        char tz_name[MLXSW_THERMAL_ZONE_MAX_NAME];
        int ret;
 
-       snprintf(tz_name, sizeof(tz_name), "mlxsw-gearbox%d",
-                gearbox_tz->module + 1);
+       if (gearbox_tz->slot_index)
+               snprintf(tz_name, sizeof(tz_name), "mlxsw-lc%d-gearbox%d",
+                        gearbox_tz->slot_index, gearbox_tz->module + 1);
+       else
+               snprintf(tz_name, sizeof(tz_name), "mlxsw-gearbox%d",
+                        gearbox_tz->module + 1);
        gearbox_tz->tzdev = thermal_zone_device_register(tz_name,
                                                MLXSW_THERMAL_NUM_TRIPS,
                                                MLXSW_THERMAL_TRIP_MASK,