mlx4_core, mlx4_ib: Have enough room in steering range for pkey interfaces

Needed to enlarge default qp bitmap size to have room for such
a big QP numbers block.

Signed-off-by: Amir Vadai <amirv@mellanox.com>
(Ported from Mellanox OFED 2.4)

Signed-off-by: Mukesh Kacker <mukesh.kacker@oracle.com>

diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
index d46cf720592ea5baabf75eae1d8463406fcfc40e..86046705d2c5caa8f00a80a564e27499db0bf6b3 100644 (file)
--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
@@ -72,7 +72,7 @@ enum {
 extern int mlx4_ib_sm_guid_assign;
 
 #define MLX4_IB_UC_STEER_QPN_ALIGN 1
-#define MLX4_IB_UC_MAX_NUM_QPS     256
+#define MLX4_IB_UC_MAX_NUM_QPS     (256 * 1024)
 struct mlx4_ib_ucontext {
        struct ib_ucontext      ibucontext;
        struct mlx4_uar         uar;

diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 5861bfb396a695b60cebac3ef28a53893ee79c8c..d09a77170e994ccd5592efb80fbd23523908c7ab 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -165,7 +165,7 @@ static atomic_t pf_loading = ATOMIC_INIT(0);
 */
 #define MLX4_MAX_LOG_NUM_MTT 30
 static struct mlx4_profile mod_param_profile = {
-       .num_qp         = 18,
+       .num_qp         = 19,
        .num_srq        = 16,
        .rdmarc_per_qp  = 4,
        .num_cq         = 16,
@@ -175,7 +175,7 @@ static struct mlx4_profile mod_param_profile = {
 };
 
 module_param_named(log_num_qp, mod_param_profile.num_qp, int, 0444);
-MODULE_PARM_DESC(log_num_qp, "log maximum number of QPs per HCA (default: 18)");
+MODULE_PARM_DESC(log_num_qp, "log maximum number of QPs per HCA (default: 19)");
 
 module_param_named(log_num_srq, mod_param_profile.num_srq, int, 0444);
 MODULE_PARM_DESC(log_num_srq, "log maximum number of SRQs per HCA "