mlxsw: spectrum: Fix base port get for split count 4 and 8 (c3a64b51) · Commits · 戴 / test

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

+15 −13

Original line number	Original line	Diff line number	Diff line
	@@ -4233,19 +4233,21 @@ static int mlxsw_sp_port_split(struct mlxsw_core *mlxsw_core, u8 local_port,
	return -EINVAL;		return -EINVAL;
	}		}

	/* Make sure we have enough slave (even) ports for the split. */		/* Only in case max split is being done, the local port and
	if (count == 2) {		* base port may differ.
	base_port = local_port;		*/
	if (mlxsw_sp->ports[base_port + offset]) {		base_port = count == max_width ?
	netdev_err(mlxsw_sp_port->dev, "Invalid split configuration\n");		mlxsw_sp_cluster_base_port_get(local_port, max_width) :
	NL_SET_ERR_MSG_MOD(extack, "Invalid split configuration");		local_port;
	return -EINVAL;
	}		for (i = 0; i < count * offset; i++) {
	} else {		/* Expect base port to exist and also the one in the middle in
	base_port = mlxsw_sp_cluster_base_port_get(local_port,		* case of maximal split count.
	max_width);		*/
	if (mlxsw_sp->ports[base_port + 1] \|\|		if (i == 0 \|\| (count == max_width && i == count / 2))
	mlxsw_sp->ports[base_port + 3]) {		continue;

			if (mlxsw_sp_port_created(mlxsw_sp, base_port + i)) {
	netdev_err(mlxsw_sp_port->dev, "Invalid split configuration\n");		netdev_err(mlxsw_sp_port->dev, "Invalid split configuration\n");
	NL_SET_ERR_MSG_MOD(extack, "Invalid split configuration");		NL_SET_ERR_MSG_MOD(extack, "Invalid split configuration");
	return -EINVAL;		return -EINVAL;