Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2207b60f authored by Yevgeny Petrilin's avatar Yevgeny Petrilin Committed by David S. Miller
Browse files

net/mlx4_core: Remove port type restrictions 



Port1=Eth, Port2=IB restriction is no longer required.
Having RoCE, there will always rdma port initialized over ConnectX
physical port, no matter whether the link layer is IB or Ethernet.
So we always have dual port IB device.

Signed-off-by: default avatarYevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c18520bd

drivers/net/ethernet/mellanox/mlx4/main.c

+0 −3
Original line number Diff line number Diff line
@@ -157,9 +157,6 @@ int mlx4_check_port_params(struct mlx4_dev *dev, 
					 "on this HCA, aborting.\n");

				return -EINVAL;

			}

			if (port_type[i] == MLX4_PORT_TYPE_ETH &&

			    port_type[i + 1] == MLX4_PORT_TYPE_IB)

				return -EINVAL;

		}

	}

drivers/net/ethernet/mellanox/mlx4/sense.c

+0 −14
Original line number Diff line number Diff line
@@ -80,20 +80,6 @@ void mlx4_do_sense_ports(struct mlx4_dev *dev, 
			stype[i - 1] = defaults[i - 1];

	}



	/*

	 * Adjust port configuration:

	 * If port 1 sensed nothing and port 2 is IB, set both as IB

	 * If port 2 sensed nothing and port 1 is Eth, set both as Eth

	 */

	if (stype[0] == MLX4_PORT_TYPE_ETH) {

		for (i = 1; i < dev->caps.num_ports; i++)

			stype[i] = stype[i] ? stype[i] : MLX4_PORT_TYPE_ETH;

	}

	if (stype[dev->caps.num_ports - 1] == MLX4_PORT_TYPE_IB) {

		for (i = 0; i < dev->caps.num_ports - 1; i++)

			stype[i] = stype[i] ? stype[i] : MLX4_PORT_TYPE_IB;

	}



	/*

	 * If sensed nothing, remain in current configuration.

	 */