mlx4_core: Allow guests to have IB ports

Modify mlx4_dev_cap to allow IB support when SR-IOV is active.  Modify
mlx4_slave_cap to set the "rdma-supported" bit in its flags area, and
pass that to the guests (this is done in QUERY_FUNC_CAP and its
wrapper).

However, we don't activate IB support quite yet -- we leave the error
return at the start of mlx4_ib_add in the mlx4_ib driver.

In addition, set "protected fmr supported" bit to zero in the
QUERY_FUNC_CAP wrapper.

Finally, in the QUERY_FUNC_CAP wrapper, we needed to add code which
checks for the port type (IB or Ethernet).  Previously, this was not
an issue, since only Ethernet ports were supported.

Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>

1 files changed, 8 insertions, 18 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 81154a16d6b8..58544b72bacb 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -288,29 +288,19 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
                         /* if only ETH is supported - assign ETH */
                         if (dev->caps.supported_type[i] == MLX4_PORT_TYPE_ETH)
                                 dev->caps.port_type[i] = MLX4_PORT_TYPE_ETH;
-                        /* if only IB is supported,
-                         * assign IB only if SRIOV is off*/
+                        /* if only IB is supported, assign IB */
                         else if (dev->caps.supported_type[i] ==
-                                 MLX4_PORT_TYPE_IB) {
-                                if (dev->flags & MLX4_FLAG_SRIOV)
-                                        dev->caps.port_type[i] =
-                                                MLX4_PORT_TYPE_NONE;
-                                else
-                                        dev->caps.port_type[i] =
-                                                MLX4_PORT_TYPE_IB;
-                        /* if IB and ETH are supported,
-                         * first of all check if SRIOV is on */
-                        } else if (dev->flags & MLX4_FLAG_SRIOV)
-                                dev->caps.port_type[i] = MLX4_PORT_TYPE_ETH;
+                                 MLX4_PORT_TYPE_IB)
+                                dev->caps.port_type[i] = MLX4_PORT_TYPE_IB;
                         else {
-                                /* In non-SRIOV mode, we set the port type
-                                 * according to user selection of port type,
-                                 * if usere selected none, take the FW hint */
-                                if (port_type_array[i-1] == MLX4_PORT_TYPE_NONE)
+                                /* if IB and ETH are supported, we set the port
+                                 * type according to user selection of port type;
+                                 * if user selected none, take the FW hint */
+                                if (port_type_array[i - 1] == MLX4_PORT_TYPE_NONE)
                                         dev->caps.port_type[i] = dev->caps.suggested_type[i] ?
                                                 MLX4_PORT_TYPE_ETH : MLX4_PORT_TYPE_IB;
                                 else
-                                        dev->caps.port_type[i] = port_type_array[i-1];
+                                        dev->caps.port_type[i] = port_type_array[i - 1];
                         }
                 }
                 /*