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

Commit be9b9eca authored by Or Gerlitz's avatar Or Gerlitz Committed by David S. Miller
Browse files

net/mlx4_core: Enable single ported IB VFs 



Remove the limitation that disallows configuring single ported VFs
in the presence of IB ports, after addressing the issues that
prevented that to work.

SMI (QP0) requests/responses are still not supported for single
ported IB VFs.

Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarJack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e5dfbf9a

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

+11 −0
Original line number Diff line number Diff line
@@ -3194,6 +3194,12 @@ int mlx4_vf_set_enable_smi_admin(struct mlx4_dev *dev, int slave, int port, 
				 int enabled)

{

	struct mlx4_priv *priv = mlx4_priv(dev);

	struct mlx4_active_ports actv_ports = mlx4_get_active_ports(

			&priv->dev, slave);

	int min_port = find_first_bit(actv_ports.ports,

				      priv->dev.caps.num_ports) + 1;

	int max_port = min_port - 1 +

		bitmap_weight(actv_ports.ports, priv->dev.caps.num_ports);



	if (slave == mlx4_master_func_num(dev))

		return 0;
@@ -3203,6 +3209,11 @@ int mlx4_vf_set_enable_smi_admin(struct mlx4_dev *dev, int slave, int port, 
	    enabled < 0 || enabled > 1)

		return -EINVAL;



	if (min_port == max_port && dev->caps.num_ports > 1) {

		mlx4_info(dev, "SMI access disallowed for single ported VFs\n");

		return -EPROTONOSUPPORT;

	}



	priv->mfunc.master.vf_admin[slave].enable_smi[port] = enabled;

	return 0;

}

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

+0 −12
Original line number Diff line number Diff line
@@ -2988,18 +2988,6 @@ static int mlx4_load_one(struct pci_dev *pdev, int pci_dev_data, 
	/* In master functions, the communication channel must be initialized

	 * after obtaining its address from fw */

	if (mlx4_is_master(dev)) {

		int ib_ports = 0;



		mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_IB)

			ib_ports++;



		if (ib_ports &&

		    (num_vfs_argc > 1 || probe_vfs_argc > 1)) {

			mlx4_err(dev,

				 "Invalid syntax of num_vfs/probe_vfs with IB port - single port VFs syntax is only supported when all ports are configured as ethernet\n");

			err = -EINVAL;

			goto err_close;

		}

		if (dev->caps.num_ports < 2 &&

		    num_vfs_argc > 1) {

			err = -EINVAL;