net/mlx5: Support devices with more than 2 ports

Increase the define MLX5_MAX_PORTS to 4 as the driver is ready
to support NICs with 4 ports.

Signed-off-by: Mark Bloch <mbloch@nvidia.com>
Reviewed-by: Maor Gottlieb <maorg@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/dev.c b/drivers/net/ethernet/mellanox/mlx5/core/dev.c
index 3e750b827a19e461619b71f649cd801ff692fc75..11f7c03ae81b86fe783ed6f7fd25a4a201d522cd 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/dev.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/dev.c
@@ -586,7 +586,8 @@ static int next_phys_dev_lag(struct device *dev, const void *data)
 
        if (!MLX5_CAP_GEN(mdev, vport_group_manager) ||
            !MLX5_CAP_GEN(mdev, lag_master) ||
-           MLX5_CAP_GEN(mdev, num_lag_ports) != MLX5_MAX_PORTS)
+           (MLX5_CAP_GEN(mdev, num_lag_ports) > MLX5_MAX_PORTS ||
+            MLX5_CAP_GEN(mdev, num_lag_ports) <= 1))
                return 0;
 
        return _next_phys_dev(mdev, data);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c b/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c
index f2659b0f8cc514561625825d29c64da04b23a9c4..716e073c80d4ca4722d00257b574f2f4caacd420 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c
@@ -1050,7 +1050,8 @@ void mlx5_lag_add_mdev(struct mlx5_core_dev *dev)
 
        if (!MLX5_CAP_GEN(dev, vport_group_manager) ||
            !MLX5_CAP_GEN(dev, lag_master) ||
-           MLX5_CAP_GEN(dev, num_lag_ports) != MLX5_MAX_PORTS)
+           (MLX5_CAP_GEN(dev, num_lag_ports) > MLX5_MAX_PORTS ||
+            MLX5_CAP_GEN(dev, num_lag_ports) <= 1))
                return;
 
 recheck:

diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index 62ea1120de9c2806c0efa22021455ef0b56c7592..fdb9d07a05a40001199520a0045c1400a20fb757 100644 (file)
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -84,7 +84,7 @@ enum mlx5_sqp_t {
 };
 
 enum {
-       MLX5_MAX_PORTS  = 2,
+       MLX5_MAX_PORTS  = 4,
 };
 
 enum {