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

Commit efcd235d authored by Jack Morgenstein's avatar Jack Morgenstein Committed by Roland Dreier
Browse files

net/mlx4_core: Adjustments to SET_PORT for IB SR-IOV 



1. Slaves may not set the IS_SM capability for the port.
2. DEV_MGMT may not be set in multifunction mode.

Signed-off-by: default avatarJack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent c1e7e466

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

+10 −0
Original line number Diff line number Diff line
@@ -732,6 +732,16 @@ static int mlx4_common_set_port(struct mlx4_dev *dev, int slave, u32 in_mod, 
		new_cap_mask = ((__be32 *) inbox->buf)[1];

	}



	/* slave may not set the IS_SM capability for the port */

	if (slave != mlx4_master_func_num(dev) &&

	    (be32_to_cpu(new_cap_mask) & MLX4_PORT_CAP_IS_SM))

		return -EINVAL;



	/* No DEV_MGMT in multifunc mode */

	if (mlx4_is_mfunc(dev) &&

	    (be32_to_cpu(new_cap_mask) & MLX4_PORT_CAP_DEV_MGMT_SUP))

		return -EINVAL;



	agg_cap_mask = 0;

	slave_cap_mask =

		priv->mfunc.master.slave_state[slave].ib_cap_mask[port];

include/linux/mlx4/device.h

+5 −0
Original line number Diff line number Diff line
@@ -53,6 +53,11 @@ enum { 
	MLX4_FLAG_SRIOV		= 1 << 4,

};



enum {

	MLX4_PORT_CAP_IS_SM	= 1 << 1,

	MLX4_PORT_CAP_DEV_MGMT_SUP = 1 << 19,

};



enum {

	MLX4_MAX_PORTS		= 2,

	MLX4_MAX_PORT_PKEYS	= 128