Commit 7b39fa5b authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

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: default avatarJiri Pirko <jiri@mellanox.com>
Reviewed-by: default avatarShalom Toledo <shalomt@mellanox.com>
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4a7f970f

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

+13 −10
Original line number Original line Diff line number Diff line
@@ -4074,16 +4074,18 @@ static u8 mlxsw_sp_cluster_base_port_get(u8 local_port, unsigned int max_width) 
	return local_port - offset;

	return local_port - offset;

}

}





static int mlxsw_sp_port_split_create(struct mlxsw_sp *mlxsw_sp, u8 base_port,

static int

				      u8 module, unsigned int count, u8 offset,

mlxsw_sp_port_split_create(struct mlxsw_sp *mlxsw_sp, u8 base_port,

				      unsigned int max_width)

			   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;

	int err, i;





	for (i = 0; i < count; i++) {

	for (i = 0; i < count; i++) {

		err = mlxsw_sp_port_create(mlxsw_sp, base_port + i * offset,

		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)

		if (err)

			goto err_port_create;

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

	struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);

	u8 local_ports_in_1x, local_ports_in_2x, offset;

	u8 local_ports_in_1x, local_ports_in_2x, offset;

	struct mlxsw_sp_port_mapping port_mapping;

	struct mlxsw_sp_port *mlxsw_sp_port;

	struct mlxsw_sp_port *mlxsw_sp_port;

	u8 module, base_port;

	int max_width;

	int max_width;

	u8 base_port;

	int i;

	int i;

	int err;

	int err;
@@ -4155,8 +4158,6 @@ static int mlxsw_sp_port_split(struct mlxsw_core *mlxsw_core, u8 local_port, 
		return -EINVAL;

		return -EINVAL;

	}

	}





	module = mlxsw_sp_port->mapping.module;



	max_width = mlxsw_core_module_max_width(mlxsw_core,

	max_width = mlxsw_core_module_max_width(mlxsw_core,

						mlxsw_sp_port->mapping.module);

						mlxsw_sp_port->mapping.module);

	if (max_width < 0) {

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

	for (i = 0; i < count; i++)

		if (mlxsw_sp_port_created(mlxsw_sp, base_port + i * offset))

		if (mlxsw_sp_port_created(mlxsw_sp, base_port + i * offset))

			mlxsw_sp_port_remove(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,

	err = mlxsw_sp_port_split_create(mlxsw_sp, base_port, &port_mapping,

					 offset, max_width);

					 count, offset);

	if (err) {

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Failed to create split ports\n");

		dev_err(mlxsw_sp->bus_info->dev, "Failed to create split ports\n");

		goto err_port_split_create;

		goto err_port_split_create;

CRA Git | Maintained and supported by SUSTech CRA and CCSE