mlx4: Activate SR-IOV mode for IB

Remove the error returns for IB ports from mlx4_ib_add,
mlx4_INIT_PORT_wrapper, and mlx4_CLOSE_PORT_wrapper.

Currently, SRIOV is supported only for devices for which the
link layer is IB on all ports; RoCE support will be added later.

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

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 46303b209ce..e849347ef99 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -1293,11 +1293,15 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
 
         pr_info_once("%s", mlx4_ib_version);
 
-        if (mlx4_is_mfunc(dev)) {
-                pr_warn("IB not yet supported in SRIOV\n");
+        mlx4_foreach_non_ib_transport_port(i, dev)
+                num_ports++;
+
+        if (mlx4_is_mfunc(dev) && num_ports) {
+                dev_err(&dev->pdev->dev, "RoCE is not supported over SRIOV as yet\n");
                 return NULL;
         }
 
+        num_ports = 0;
         mlx4_foreach_ib_transport_port(i, dev)
                 num_ports++;