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: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: Roland Dreier <roland@purestorage.com>

diff --git a/drivers/net/ethernet/mellanox/mlx4/port.c b/drivers/net/ethernet/mellanox/mlx4/port.c
index e36dd0f2fa733fdadc1573fa991395cac25057fe..4c51b05efa284d7d921650481678c5e4a1f1a324 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/port.c
+++ b/drivers/net/ethernet/mellanox/mlx4/port.c
@@ -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];

diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index 380e01671d1e13ee8cc92bcc963991a84c57437b..b3f9b4500b9b35926880c86615f77011608b4841 100644 (file)
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -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