4 files changed, 54 insertions, 4 deletions

diff --git a/drivers/net/mlx4/fw.c b/drivers/net/mlx4/fw.c
index d82f2751d2c7..2b5006b9be67 100644
--- a/drivers/net/mlx4/fw.c
+++ b/drivers/net/mlx4/fw.c
@@ -101,6 +101,34 @@ static void dump_dev_cap_flags(struct mlx4_dev *dev, u32 flags)
                         mlx4_dbg(dev, "    %s\n", fname[i]);
 }
 
+int mlx4_MOD_STAT_CFG(struct mlx4_dev *dev, struct mlx4_mod_stat_cfg *cfg)
+{
+        struct mlx4_cmd_mailbox *mailbox;
+        u32 *inbox;
+        int err = 0;
+
+#define MOD_STAT_CFG_IN_SIZE            0x100
+
+#define MOD_STAT_CFG_PG_SZ_M_OFFSET     0x002
+#define MOD_STAT_CFG_PG_SZ_OFFSET       0x003
+
+        mailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(mailbox))
+                return PTR_ERR(mailbox);
+        inbox = mailbox->buf;
+
+        memset(inbox, 0, MOD_STAT_CFG_IN_SIZE);
+
+        MLX4_PUT(inbox, cfg->log_pg_sz, MOD_STAT_CFG_PG_SZ_OFFSET);
+        MLX4_PUT(inbox, cfg->log_pg_sz_m, MOD_STAT_CFG_PG_SZ_M_OFFSET);
+
+        err = mlx4_cmd(dev, mailbox->dma, 0, 0, MLX4_CMD_MOD_STAT_CFG,
+                        MLX4_CMD_TIME_CLASS_A);
+
+        mlx4_free_cmd_mailbox(dev, mailbox);
+        return err;
+}
+
 int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
 {
         struct mlx4_cmd_mailbox *mailbox;
diff --git a/drivers/net/mlx4/fw.h b/drivers/net/mlx4/fw.h
index 306cb9b0242d..a0e046c149b7 100644
--- a/drivers/net/mlx4/fw.h
+++ b/drivers/net/mlx4/fw.h
@@ -38,6 +38,11 @@
 #include "mlx4.h"
 #include "icm.h"
 
+struct mlx4_mod_stat_cfg {
+        u8 log_pg_sz;
+        u8 log_pg_sz_m;
+};
+
 struct mlx4_dev_cap {
         int max_srq_sz;
         int max_qp_sz;
@@ -162,5 +167,6 @@ int mlx4_SET_ICM_SIZE(struct mlx4_dev *dev, u64 icm_size, u64 *aux_pages);
 int mlx4_MAP_ICM_AUX(struct mlx4_dev *dev, struct mlx4_icm *icm);
 int mlx4_UNMAP_ICM_AUX(struct mlx4_dev *dev);
 int mlx4_NOP(struct mlx4_dev *dev);
+int mlx4_MOD_STAT_CFG(struct mlx4_dev *dev, struct mlx4_mod_stat_cfg *cfg);
 
 #endif /* MLX4_FW_H */
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
index a6aa49fc1d68..d3736013fe9b 100644
--- a/drivers/net/mlx4/main.c
+++ b/drivers/net/mlx4/main.c
@@ -485,6 +485,7 @@ static int mlx4_init_hca(struct mlx4_dev *dev)
         struct mlx4_priv          *priv = mlx4_priv(dev);
         struct mlx4_adapter        adapter;
         struct mlx4_dev_cap        dev_cap;
+        struct mlx4_mod_stat_cfg   mlx4_cfg;
         struct mlx4_profile        profile;
         struct mlx4_init_hca_param init_hca;
         u64 icm_size;
@@ -502,6 +503,12 @@ static int mlx4_init_hca(struct mlx4_dev *dev)
                 return err;
         }
 
+        mlx4_cfg.log_pg_sz_m = 1;
+        mlx4_cfg.log_pg_sz = 0;
+        err = mlx4_MOD_STAT_CFG(dev, &mlx4_cfg);
+        if (err)
+                mlx4_warn(dev, "Failed to override log_pg_sz parameter\n");
+
         err = mlx4_dev_cap(dev, &dev_cap);
         if (err) {
                 mlx4_err(dev, "QUERY_DEV_CAP command failed, aborting.\n");
diff --git a/drivers/net/mlx4/mcg.c b/drivers/net/mlx4/mcg.c
index 57f7f1f0d4ec..b4b57870ddfd 100644
--- a/drivers/net/mlx4/mcg.c
+++ b/drivers/net/mlx4/mcg.c
@@ -38,6 +38,9 @@
 
 #include "mlx4.h"
 
+#define MGM_QPN_MASK       0x00FFFFFF
+#define MGM_BLCK_LB_BIT    30
+
 struct mlx4_mgm {
         __be32                  next_gid_index;
         __be32                  members_count;
@@ -153,7 +156,8 @@ static int find_mgm(struct mlx4_dev *dev,
         return err;
 }
 
-int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16])
+int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
+                          int block_mcast_loopback)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
         struct mlx4_cmd_mailbox *mailbox;
@@ -202,13 +206,18 @@ int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16])
         }
 
         for (i = 0; i < members_count; ++i)
-                if (mgm->qp[i] == cpu_to_be32(qp->qpn)) {
+                if ((be32_to_cpu(mgm->qp[i]) & MGM_QPN_MASK) == qp->qpn) {
                         mlx4_dbg(dev, "QP %06x already a member of MGM\n", qp->qpn);
                         err = 0;
                         goto out;
                 }
 
-        mgm->qp[members_count++] = cpu_to_be32(qp->qpn);
+        if (block_mcast_loopback)
+                mgm->qp[members_count++] = cpu_to_be32((qp->qpn & MGM_QPN_MASK) |
+                                                       (1 << MGM_BLCK_LB_BIT));
+        else
+                mgm->qp[members_count++] = cpu_to_be32(qp->qpn & MGM_QPN_MASK);
+
         mgm->members_count       = cpu_to_be32(members_count);
 
         err = mlx4_WRITE_MCG(dev, index, mailbox);
@@ -283,7 +292,7 @@ int mlx4_multicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16])
 
         members_count = be32_to_cpu(mgm->members_count);
         for (loc = -1, i = 0; i < members_count; ++i)
-                if (mgm->qp[i] == cpu_to_be32(qp->qpn))
+                if ((be32_to_cpu(mgm->qp[i]) & MGM_QPN_MASK) == qp->qpn)
                         loc = i;
 
         if (loc == -1) {