mlxsw: spectrum: Use mapping of port being split for creating split ports

Don't use constant max width value and instead of that, use the actual
width of the port. Also don't pass module value and use the value
stored in the same structure.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Reviewed-by: Shalom Toledo <shalomt@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index ee15428ca7404a82595153c89323437f27738b33..2145975af10307da387c66a5e7976aca6669622d 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -4074,16 +4074,18 @@ static u8 mlxsw_sp_cluster_base_port_get(u8 local_port, unsigned int max_width)
        return local_port - offset;
 }
 
-static int mlxsw_sp_port_split_create(struct mlxsw_sp *mlxsw_sp, u8 base_port,
-                                     u8 module, unsigned int count, u8 offset,
-                                     unsigned int max_width)
+static int
+mlxsw_sp_port_split_create(struct mlxsw_sp *mlxsw_sp, u8 base_port,
+                          struct mlxsw_sp_port_mapping *port_mapping,
+                          unsigned int count, u8 offset)
 {
-       u8 width = max_width / count;
+       u8 width = port_mapping->width / count;
        int err, i;
 
        for (i = 0; i < count; i++) {
                err = mlxsw_sp_port_create(mlxsw_sp, base_port + i * offset,
-                                          true, module, width, i * width);
+                                          true, port_mapping->module,
+                                          width, i * width);
                if (err)
                        goto err_port_create;
        }
@@ -4127,9 +4129,10 @@ static int mlxsw_sp_port_split(struct mlxsw_core *mlxsw_core, u8 local_port,
 {
        struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);
        u8 local_ports_in_1x, local_ports_in_2x, offset;
+       struct mlxsw_sp_port_mapping port_mapping;
        struct mlxsw_sp_port *mlxsw_sp_port;
-       u8 module, base_port;
        int max_width;
+       u8 base_port;
        int i;
        int err;
 
@@ -4155,8 +4158,6 @@ static int mlxsw_sp_port_split(struct mlxsw_core *mlxsw_core, u8 local_port,
                return -EINVAL;
        }
 
-       module = mlxsw_sp_port->mapping.module;
-
        max_width = mlxsw_core_module_max_width(mlxsw_core,
                                                mlxsw_sp_port->mapping.module);
        if (max_width < 0) {
@@ -4199,12 +4200,14 @@ static int mlxsw_sp_port_split(struct mlxsw_core *mlxsw_core, u8 local_port,
                }
        }
 
+       port_mapping = mlxsw_sp_port->mapping;
+
        for (i = 0; i < count; i++)
                if (mlxsw_sp_port_created(mlxsw_sp, base_port + i * offset))
                        mlxsw_sp_port_remove(mlxsw_sp, base_port + i * offset);
 
-       err = mlxsw_sp_port_split_create(mlxsw_sp, base_port, module, count,
-                                        offset, max_width);
+       err = mlxsw_sp_port_split_create(mlxsw_sp, base_port, &port_mapping,
+                                        count, offset);
        if (err) {
                dev_err(mlxsw_sp->bus_info->dev, "Failed to create split ports\n");
                goto err_port_split_create;