Merge branch 'mlxsw-Various-fixes'

Ido Schimmel says:

====================
mlxsw: Various fixes

Patch #1 fixes the recently introduced QSFP thermal zones to correctly
work with split ports, where several ports are mapped to the same
module.

Patch #2 initializes the base MAC in the minimal driver. The driver is
using the base MAC as its parent ID and without initializing it, it is
reported as all zeroes to user space.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 29 insertions, 10 deletions

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
index 0b85c7252f9e..472f63f9fac5 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
@@ -111,7 +111,6 @@ struct mlxsw_thermal {
         struct mlxsw_thermal_trip trips[MLXSW_THERMAL_NUM_TRIPS];
         enum thermal_device_mode mode;
         struct mlxsw_thermal_module *tz_module_arr;
-        unsigned int tz_module_num;
 };
 
 static inline u8 mlxsw_state_to_duty(int state)
@@ -711,6 +710,9 @@ mlxsw_thermal_module_init(struct device *dev, struct mlxsw_core *core,
 
         module = mlxsw_reg_pmlp_module_get(pmlp_pl, 0);
         module_tz = &thermal->tz_module_arr[module];
+        /* Skip if parent is already set (case of port split). */
+        if (module_tz->parent)
+                return 0;
         module_tz->module = module;
         module_tz->parent = thermal;
         memcpy(module_tz->trips, default_thermal_trips,
@@ -718,13 +720,7 @@ mlxsw_thermal_module_init(struct device *dev, struct mlxsw_core *core,
         /* Initialize all trip point. */
         mlxsw_thermal_module_trips_reset(module_tz);
         /* Update trip point according to the module data. */
-        err = mlxsw_thermal_module_trips_update(dev, core, module_tz);
-        if (err)
-                return err;
-
-        thermal->tz_module_num++;
-
-        return 0;
+        return mlxsw_thermal_module_trips_update(dev, core, module_tz);
 }
 
 static void mlxsw_thermal_module_fini(struct mlxsw_thermal_module *module_tz)
@@ -732,6 +728,7 @@ static void mlxsw_thermal_module_fini(struct mlxsw_thermal_module *module_tz)
         if (module_tz && module_tz->tzdev) {
                 mlxsw_thermal_module_tz_fini(module_tz->tzdev);
                 module_tz->tzdev = NULL;
+                module_tz->parent = NULL;
         }
 }
 
@@ -740,6 +737,7 @@ mlxsw_thermal_modules_init(struct device *dev, struct mlxsw_core *core,
                            struct mlxsw_thermal *thermal)
 {
         unsigned int module_count = mlxsw_core_max_ports(core);
+        struct mlxsw_thermal_module *module_tz;
         int i, err;
 
         thermal->tz_module_arr = kcalloc(module_count,
@@ -754,8 +752,11 @@ mlxsw_thermal_modules_init(struct device *dev, struct mlxsw_core *core,
                         goto err_unreg_tz_module_arr;
         }
 
-        for (i = 0; i < thermal->tz_module_num; i++) {
-                err = mlxsw_thermal_module_tz_init(&thermal->tz_module_arr[i]);
+        for (i = 0; i < module_count - 1; i++) {
+                module_tz = &thermal->tz_module_arr[i];
+                if (!module_tz->parent)
+                        continue;
+                err = mlxsw_thermal_module_tz_init(module_tz);
                 if (err)
                         goto err_unreg_tz_module_arr;
         }
diff --git a/drivers/net/ethernet/mellanox/mlxsw/minimal.c b/drivers/net/ethernet/mellanox/mlxsw/minimal.c
index 68bee9572a1b..00c390024350 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/minimal.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/minimal.c
@@ -34,6 +34,18 @@ struct mlxsw_m_port {
         u8 module;
 };
 
+static int mlxsw_m_base_mac_get(struct mlxsw_m *mlxsw_m)
+{
+        char spad_pl[MLXSW_REG_SPAD_LEN] = {0};
+        int err;
+
+        err = mlxsw_reg_query(mlxsw_m->core, MLXSW_REG(spad), spad_pl);
+        if (err)
+                return err;
+        mlxsw_reg_spad_base_mac_memcpy_from(spad_pl, mlxsw_m->base_mac);
+        return 0;
+}
+
 static int mlxsw_m_port_dummy_open_stop(struct net_device *dev)
 {
         return 0;
@@ -314,6 +326,12 @@ static int mlxsw_m_init(struct mlxsw_core *mlxsw_core,
         mlxsw_m->core = mlxsw_core;
         mlxsw_m->bus_info = mlxsw_bus_info;
 
+        err = mlxsw_m_base_mac_get(mlxsw_m);
+        if (err) {
+                dev_err(mlxsw_m->bus_info->dev, "Failed to get base mac\n");
+                return err;
+        }
+
         err = mlxsw_m_ports_create(mlxsw_m);
         if (err) {
                 dev_err(mlxsw_m->bus_info->dev, "Failed to create ports\n");