Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (26 commits)
  IB/qib: Defer HCA error events to tasklet
  mlx4_core: Bump the driver version to 1.0
  RDMA/cxgb4: Use printk_ratelimited() instead of printk_ratelimit()
  IB/mlx4: Support PMA counters for IBoE
  IB/mlx4: Use flow counters on IBoE ports
  IB/pma: Add include file for IBA performance counters definitions
  mlx4_core: Add network flow counters
  mlx4_core: Fix location of counter index in QP context struct
  mlx4_core: Read extended capabilities into the flags field
  mlx4_core: Extend capability flags to 64 bits
  IB/mlx4: Generate GID change events in IBoE code
  IB/core: Add GID change event
  RDMA/cma: Don't allow IPoIB port space for IBoE
  RDMA: Allow for NULL .modify_device() and .modify_port() methods
  IB/qib: Update active link width
  IB/qib: Fix potential deadlock with link down interrupt
  IB/qib: Add sysfs interface to read free contexts
  IB/mthca: Remove unnecessary read of PCI_CAP_ID_EXP
  IB/qib: Remove double define
  IB/qib: Remove unnecessary read of PCI_CAP_ID_EXP
  ...

11 files changed, 112 insertions, 49 deletions

diff --git a/drivers/net/mlx4/en_ethtool.c b/drivers/net/mlx4/en_ethtool.c
index 2e858e4dcf4..eb096253d78 100644
--- a/drivers/net/mlx4/en_ethtool.c
+++ b/drivers/net/mlx4/en_ethtool.c
@@ -104,7 +104,7 @@ static void mlx4_en_get_wol(struct net_device *netdev,
         int err = 0;
         u64 config = 0;
 
-        if (!priv->mdev->dev->caps.wol) {
+        if (!(priv->mdev->dev->caps.flags & MLX4_DEV_CAP_FLAG_WOL)) {
                 wol->supported = 0;
                 wol->wolopts = 0;
                 return;
@@ -134,7 +134,7 @@ static int mlx4_en_set_wol(struct net_device *netdev,
         u64 config = 0;
         int err = 0;
 
-        if (!priv->mdev->dev->caps.wol)
+        if (!(priv->mdev->dev->caps.flags & MLX4_DEV_CAP_FLAG_WOL))
                 return -EOPNOTSUPP;
 
         if (wol->supported & ~WAKE_MAGIC)
@@ -170,7 +170,8 @@ static int mlx4_en_get_sset_count(struct net_device *dev, int sset)
                 return NUM_ALL_STATS +
                         (priv->tx_ring_num + priv->rx_ring_num) * 2;
         case ETH_SS_TEST:
-                return MLX4_EN_NUM_SELF_TEST - !(priv->mdev->dev->caps.loopback_support) * 2;
+                return MLX4_EN_NUM_SELF_TEST - !(priv->mdev->dev->caps.flags
+                                        & MLX4_DEV_CAP_FLAG_UC_LOOPBACK) * 2;
         default:
                 return -EOPNOTSUPP;
         }
@@ -220,7 +221,7 @@ static void mlx4_en_get_strings(struct net_device *dev,
         case ETH_SS_TEST:
                 for (i = 0; i < MLX4_EN_NUM_SELF_TEST - 2; i++)
                         strcpy(data + i * ETH_GSTRING_LEN, mlx4_en_test_names[i]);
-                if (priv->mdev->dev->caps.loopback_support)
+                if (priv->mdev->dev->caps.flags & MLX4_DEV_CAP_FLAG_UC_LOOPBACK)
                         for (; i < MLX4_EN_NUM_SELF_TEST; i++)
                                 strcpy(data + i * ETH_GSTRING_LEN, mlx4_en_test_names[i]);
                 break;
diff --git a/drivers/net/mlx4/en_main.c b/drivers/net/mlx4/en_main.c
index 9276b1b2558..6bfea233a9f 100644
--- a/drivers/net/mlx4/en_main.c
+++ b/drivers/net/mlx4/en_main.c
@@ -106,7 +106,8 @@ static int mlx4_en_get_profile(struct mlx4_en_dev *mdev)
 
         params->tcp_rss = tcp_rss;
         params->udp_rss = udp_rss;
-        if (params->udp_rss && !mdev->dev->caps.udp_rss) {
+        if (params->udp_rss && !(mdev->dev->caps.flags
+                                        & MLX4_DEV_CAP_FLAG_UDP_RSS)) {
                 mlx4_warn(mdev, "UDP RSS is not supported on this device.\n");
                 params->udp_rss = 0;
         }
diff --git a/drivers/net/mlx4/en_netdev.c b/drivers/net/mlx4/en_netdev.c
index 9d3f57e76f2..4b0f32e568f 100644
--- a/drivers/net/mlx4/en_netdev.c
+++ b/drivers/net/mlx4/en_netdev.c
@@ -215,7 +215,8 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
                         priv->flags |= MLX4_EN_FLAG_PROMISC;
 
                         /* Enable promiscouos mode */
-                        if (!mdev->dev->caps.vep_uc_steering)
+                        if (!(mdev->dev->caps.flags &
+                                                MLX4_DEV_CAP_FLAG_VEP_UC_STEER))
                                 err = mlx4_SET_PORT_qpn_calc(mdev->dev, priv->port,
                                                              priv->base_qpn, 1);
                         else
@@ -259,7 +260,7 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
                 priv->flags &= ~MLX4_EN_FLAG_PROMISC;
 
                 /* Disable promiscouos mode */
-                if (!mdev->dev->caps.vep_uc_steering)
+                if (!(mdev->dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_UC_STEER))
                         err = mlx4_SET_PORT_qpn_calc(mdev->dev, priv->port,
                                                      priv->base_qpn, 0);
                 else
diff --git a/drivers/net/mlx4/en_port.c b/drivers/net/mlx4/en_port.c
index 2a74bc81b9f..5e710917806 100644
--- a/drivers/net/mlx4/en_port.c
+++ b/drivers/net/mlx4/en_port.c
@@ -114,9 +114,11 @@ int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn,
         struct mlx4_set_port_rqp_calc_context *context;
         int err;
         u32 in_mod;
-        u32 m_promisc = (dev->caps.vep_mc_steering) ? MCAST_DIRECT : MCAST_DEFAULT;
+        u32 m_promisc = (dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_MC_STEER) ?
+                                                MCAST_DIRECT : MCAST_DEFAULT;
 
-        if (dev->caps.vep_mc_steering && dev->caps.vep_uc_steering)
+        if (dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_MC_STEER  &&
+                        dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_UC_STEER)
                 return 0;
 
         mailbox = mlx4_alloc_cmd_mailbox(dev);
diff --git a/drivers/net/mlx4/en_selftest.c b/drivers/net/mlx4/en_selftest.c
index 191a8dcd8a9..9fdbcecd499 100644
--- a/drivers/net/mlx4/en_selftest.c
+++ b/drivers/net/mlx4/en_selftest.c
@@ -159,7 +159,8 @@ retry_tx:
                                 goto retry_tx;
                 }
 
-                if (priv->mdev->dev->caps.loopback_support){
+                if (priv->mdev->dev->caps.flags &
+                                        MLX4_DEV_CAP_FLAG_UC_LOOPBACK) {
                         buf[3] = mlx4_en_test_registers(priv);
                         buf[4] = mlx4_en_test_loopback(priv);
                 }
diff --git a/drivers/net/mlx4/fw.c b/drivers/net/mlx4/fw.c
index 67a209ba939..7eb8ba822e9 100644
--- a/drivers/net/mlx4/fw.c
+++ b/drivers/net/mlx4/fw.c
@@ -75,7 +75,7 @@ MODULE_PARM_DESC(enable_qos, "Enable Quality of Service support in the HCA (defa
                 }                                                     \
         } while (0)
 
-static void dump_dev_cap_flags(struct mlx4_dev *dev, u32 flags)
+static void dump_dev_cap_flags(struct mlx4_dev *dev, u64 flags)
 {
         static const char *fname[] = {
                 [ 0] = "RC transport",
@@ -99,13 +99,19 @@ static void dump_dev_cap_flags(struct mlx4_dev *dev, u32 flags)
                 [21] = "UD multicast support",
                 [24] = "Demand paging support",
                 [25] = "Router support",
-                [30] = "IBoE support"
+                [30] = "IBoE support",
+                [32] = "Unicast loopback support",
+                [38] = "Wake On LAN support",
+                [40] = "UDP RSS support",
+                [41] = "Unicast VEP steering support",
+                [42] = "Multicast VEP steering support",
+                [48] = "Counters support",
         };
         int i;
 
         mlx4_dbg(dev, "DEV_CAP flags:\n");
         for (i = 0; i < ARRAY_SIZE(fname); ++i)
-                if (fname[i] && (flags & (1 << i)))
+                if (fname[i] && (flags & (1LL << i)))
                         mlx4_dbg(dev, "    %s\n", fname[i]);
 }
 
@@ -142,7 +148,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
         struct mlx4_cmd_mailbox *mailbox;
         u32 *outbox;
         u8 field;
-        u32 field32;
+        u32 field32, flags, ext_flags;
         u16 size;
         u16 stat_rate;
         int err;
@@ -180,8 +186,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
 #define QUERY_DEV_CAP_MAX_GID_OFFSET            0x3b
 #define QUERY_DEV_CAP_RATE_SUPPORT_OFFSET       0x3c
 #define QUERY_DEV_CAP_MAX_PKEY_OFFSET           0x3f
-#define QUERY_DEV_CAP_UDP_RSS_OFFSET            0x42
-#define QUERY_DEV_CAP_ETH_UC_LOOPBACK_OFFSET    0x43
+#define QUERY_DEV_CAP_EXT_FLAGS_OFFSET          0x40
 #define QUERY_DEV_CAP_FLAGS_OFFSET              0x44
 #define QUERY_DEV_CAP_RSVD_UAR_OFFSET           0x48
 #define QUERY_DEV_CAP_UAR_SZ_OFFSET             0x49
@@ -199,6 +204,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
 #define QUERY_DEV_CAP_MAX_MCG_OFFSET            0x63
 #define QUERY_DEV_CAP_RSVD_PD_OFFSET            0x64
 #define QUERY_DEV_CAP_MAX_PD_OFFSET             0x65
+#define QUERY_DEV_CAP_MAX_COUNTERS_OFFSET       0x68
 #define QUERY_DEV_CAP_RDMARC_ENTRY_SZ_OFFSET    0x80
 #define QUERY_DEV_CAP_QPC_ENTRY_SZ_OFFSET       0x82
 #define QUERY_DEV_CAP_AUX_ENTRY_SZ_OFFSET       0x84
@@ -272,14 +278,9 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
         dev_cap->max_msg_sz = 1 << (field & 0x1f);
         MLX4_GET(stat_rate, outbox, QUERY_DEV_CAP_RATE_SUPPORT_OFFSET);
         dev_cap->stat_rate_support = stat_rate;
-        MLX4_GET(field, outbox, QUERY_DEV_CAP_UDP_RSS_OFFSET);
-        dev_cap->udp_rss = field & 0x1;
-        dev_cap->vep_uc_steering = field & 0x2;
-        dev_cap->vep_mc_steering = field & 0x4;
-        MLX4_GET(field, outbox, QUERY_DEV_CAP_ETH_UC_LOOPBACK_OFFSET);
-        dev_cap->loopback_support = field & 0x1;
-        dev_cap->wol = field & 0x40;
-        MLX4_GET(dev_cap->flags, outbox, QUERY_DEV_CAP_FLAGS_OFFSET);
+        MLX4_GET(ext_flags, outbox, QUERY_DEV_CAP_EXT_FLAGS_OFFSET);
+        MLX4_GET(flags, outbox, QUERY_DEV_CAP_FLAGS_OFFSET);
+        dev_cap->flags = flags | (u64)ext_flags << 32;
         MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_UAR_OFFSET);
         dev_cap->reserved_uars = field >> 4;
         MLX4_GET(field, outbox, QUERY_DEV_CAP_UAR_SZ_OFFSET);
@@ -356,6 +357,9 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
                  QUERY_DEV_CAP_RSVD_LKEY_OFFSET);
         MLX4_GET(dev_cap->max_icm_sz, outbox,
                  QUERY_DEV_CAP_MAX_ICM_SZ_OFFSET);
+        if (dev_cap->flags & MLX4_DEV_CAP_FLAG_COUNTERS)
+                MLX4_GET(dev_cap->max_counters, outbox,
+                         QUERY_DEV_CAP_MAX_COUNTERS_OFFSET);
 
         if (dev->flags & MLX4_FLAG_OLD_PORT_CMDS) {
                 for (i = 1; i <= dev_cap->num_ports; ++i) {
@@ -449,6 +453,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
         mlx4_dbg(dev, "Max RQ desc size: %d, max RQ S/G: %d\n",
                  dev_cap->max_rq_desc_sz, dev_cap->max_rq_sg);
         mlx4_dbg(dev, "Max GSO size: %d\n", dev_cap->max_gso_sz);
+        mlx4_dbg(dev, "Max counters: %d\n", dev_cap->max_counters);
 
         dump_dev_cap_flags(dev, dev_cap->flags);
 
@@ -781,6 +786,10 @@ int mlx4_INIT_HCA(struct mlx4_dev *dev, struct mlx4_init_hca_param *param)
         if (enable_qos)
                 *(inbox + INIT_HCA_FLAGS_OFFSET / 4) |= cpu_to_be32(1 << 2);
 
+        /* enable counters */
+        if (dev->caps.flags & MLX4_DEV_CAP_FLAG_COUNTERS)
+                *(inbox + INIT_HCA_FLAGS_OFFSET / 4) |= cpu_to_be32(1 << 4);
+
         /* QPC/EEC/CQC/EQC/RDMARC attributes */
 
         MLX4_PUT(inbox, param->qpc_base,      INIT_HCA_QPC_BASE_OFFSET);
@@ -801,7 +810,7 @@ int mlx4_INIT_HCA(struct mlx4_dev *dev, struct mlx4_init_hca_param *param)
         MLX4_PUT(inbox, param->mc_base,         INIT_HCA_MC_BASE_OFFSET);
         MLX4_PUT(inbox, param->log_mc_entry_sz, INIT_HCA_LOG_MC_ENTRY_SZ_OFFSET);
         MLX4_PUT(inbox, param->log_mc_hash_sz,  INIT_HCA_LOG_MC_HASH_SZ_OFFSET);
-        if (dev->caps.vep_mc_steering)
+        if (dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_MC_STEER)
                 MLX4_PUT(inbox, (u8) (1 << 3),  INIT_HCA_UC_STEERING_OFFSET);
         MLX4_PUT(inbox, param->log_mc_table_sz, INIT_HCA_LOG_MC_TABLE_SZ_OFFSET);
 
diff --git a/drivers/net/mlx4/fw.h b/drivers/net/mlx4/fw.h
index 88003ebc618..1e8ecc3708e 100644
--- a/drivers/net/mlx4/fw.h
+++ b/drivers/net/mlx4/fw.h
@@ -78,12 +78,7 @@ struct mlx4_dev_cap {
         u16 wavelength[MLX4_MAX_PORTS + 1];
         u64 trans_code[MLX4_MAX_PORTS + 1];
         u16 stat_rate_support;
-        int udp_rss;
-        int loopback_support;
-        int vep_uc_steering;
-        int vep_mc_steering;
-        int wol;
-        u32 flags;
+        u64 flags;
         int reserved_uars;
         int uar_size;
         int min_page_sz;
@@ -116,6 +111,7 @@ struct mlx4_dev_cap {
         u8  supported_port_types[MLX4_MAX_PORTS + 1];
         u8  log_max_macs[MLX4_MAX_PORTS + 1];
         u8  log_max_vlans[MLX4_MAX_PORTS + 1];
+        u32 max_counters;
 };
 
 struct mlx4_adapter {
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
index 0cb0431ee19..c94b3426d35 100644
--- a/drivers/net/mlx4/main.c
+++ b/drivers/net/mlx4/main.c
@@ -143,6 +143,7 @@ static void mlx4_set_port_mask(struct mlx4_dev *dev)
                 if (dev->caps.port_type[i] == MLX4_PORT_TYPE_IB)
                         dev->caps.port_mask |= 1 << (i - 1);
 }
+
 static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
 {
         int err;
@@ -226,11 +227,6 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
         dev->caps.bmme_flags         = dev_cap->bmme_flags;
         dev->caps.reserved_lkey      = dev_cap->reserved_lkey;
         dev->caps.stat_rate_support  = dev_cap->stat_rate_support;
-        dev->caps.udp_rss            = dev_cap->udp_rss;
-        dev->caps.loopback_support   = dev_cap->loopback_support;
-        dev->caps.vep_uc_steering    = dev_cap->vep_uc_steering;
-        dev->caps.vep_mc_steering    = dev_cap->vep_mc_steering;
-        dev->caps.wol                = dev_cap->wol;
         dev->caps.max_gso_sz         = dev_cap->max_gso_sz;
 
         dev->caps.log_num_macs  = log_num_mac;
@@ -262,6 +258,8 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
 
         mlx4_set_port_mask(dev);
 
+        dev->caps.max_counters = 1 << ilog2(dev_cap->max_counters);
+
         dev->caps.reserved_qps_cnt[MLX4_QP_REGION_FW] = dev_cap->reserved_qps;
         dev->caps.reserved_qps_cnt[MLX4_QP_REGION_ETH_ADDR] =
                 dev->caps.reserved_qps_cnt[MLX4_QP_REGION_FC_ADDR] =
@@ -839,6 +837,45 @@ err_stop_fw:
         return err;
 }
 
+static int mlx4_init_counters_table(struct mlx4_dev *dev)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        int nent;
+
+        if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_COUNTERS))
+                return -ENOENT;
+
+        nent = dev->caps.max_counters;
+        return mlx4_bitmap_init(&priv->counters_bitmap, nent, nent - 1, 0, 0);
+}
+
+static void mlx4_cleanup_counters_table(struct mlx4_dev *dev)
+{
+        mlx4_bitmap_cleanup(&mlx4_priv(dev)->counters_bitmap);
+}
+
+int mlx4_counter_alloc(struct mlx4_dev *dev, u32 *idx)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+
+        if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_COUNTERS))
+                return -ENOENT;
+
+        *idx = mlx4_bitmap_alloc(&priv->counters_bitmap);
+        if (*idx == -1)
+                return -ENOMEM;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(mlx4_counter_alloc);
+
+void mlx4_counter_free(struct mlx4_dev *dev, u32 idx)
+{
+        mlx4_bitmap_free(&mlx4_priv(dev)->counters_bitmap, idx);
+        return;
+}
+EXPORT_SYMBOL_GPL(mlx4_counter_free);
+
 static int mlx4_setup_hca(struct mlx4_dev *dev)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
@@ -943,6 +980,12 @@ static int mlx4_setup_hca(struct mlx4_dev *dev)
                 goto err_qp_table_free;
         }
 
+        err = mlx4_init_counters_table(dev);
+        if (err && err != -ENOENT) {
+                mlx4_err(dev, "Failed to initialize counters table, aborting.\n");
+                goto err_counters_table_free;
+        }
+
         for (port = 1; port <= dev->caps.num_ports; port++) {
                 enum mlx4_port_type port_type = 0;
                 mlx4_SENSE_PORT(dev, port, &port_type);
@@ -969,6 +1012,9 @@ static int mlx4_setup_hca(struct mlx4_dev *dev)
 err_mcg_table_free:
         mlx4_cleanup_mcg_table(dev);
 
+err_counters_table_free:
+        mlx4_cleanup_counters_table(dev);
+
 err_qp_table_free:
         mlx4_cleanup_qp_table(dev);
 
@@ -1299,6 +1345,7 @@ err_port:
         for (--port; port >= 1; --port)
                 mlx4_cleanup_port_info(&priv->port[port]);
 
+        mlx4_cleanup_counters_table(dev);
         mlx4_cleanup_mcg_table(dev);
         mlx4_cleanup_qp_table(dev);
         mlx4_cleanup_srq_table(dev);
@@ -1359,6 +1406,7 @@ static void mlx4_remove_one(struct pci_dev *pdev)
                         mlx4_CLOSE_PORT(dev, p);
                 }
 
+                mlx4_cleanup_counters_table(dev);
                 mlx4_cleanup_mcg_table(dev);
                 mlx4_cleanup_qp_table(dev);
                 mlx4_cleanup_srq_table(dev);
diff --git a/drivers/net/mlx4/mcg.c b/drivers/net/mlx4/mcg.c
index e63c37d6a11..cd1784593a3 100644
--- a/drivers/net/mlx4/mcg.c
+++ b/drivers/net/mlx4/mcg.c
@@ -559,7 +559,8 @@ static int find_entry(struct mlx4_dev *dev, u8 port,
         struct mlx4_mgm *mgm = mgm_mailbox->buf;
         u8 *mgid;
         int err;
-        u8 op_mod = (prot == MLX4_PROT_ETH) ? !!(dev->caps.vep_mc_steering) : 0;
+        u8 op_mod = (prot == MLX4_PROT_ETH) ?
+                !!(dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_MC_STEER) : 0;
 
         mailbox = mlx4_alloc_cmd_mailbox(dev);
         if (IS_ERR(mailbox))
@@ -834,7 +835,8 @@ int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
 
         steer = (is_valid_ether_addr(&gid[10])) ? MLX4_UC_STEER : MLX4_MC_STEER;
 
-        if (prot == MLX4_PROT_ETH && !dev->caps.vep_mc_steering)
+        if (prot == MLX4_PROT_ETH &&
+                        !(dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_MC_STEER))
                 return 0;
 
         if (prot == MLX4_PROT_ETH)
@@ -853,7 +855,8 @@ int mlx4_multicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
 
         steer = (is_valid_ether_addr(&gid[10])) ? MLX4_UC_STEER : MLX4_MC_STEER;
 
-        if (prot == MLX4_PROT_ETH && !dev->caps.vep_mc_steering)
+        if (prot == MLX4_PROT_ETH &&
+                        !(dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_MC_STEER))
                 return 0;
 
         if (prot == MLX4_PROT_ETH) {
@@ -867,7 +870,7 @@ EXPORT_SYMBOL_GPL(mlx4_multicast_detach);
 
 int mlx4_multicast_promisc_add(struct mlx4_dev *dev, u32 qpn, u8 port)
 {
-        if (!dev->caps.vep_mc_steering)
+        if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_MC_STEER))
                 return 0;
 
 
@@ -877,7 +880,7 @@ EXPORT_SYMBOL_GPL(mlx4_multicast_promisc_add);
 
 int mlx4_multicast_promisc_remove(struct mlx4_dev *dev, u32 qpn, u8 port)
 {
-        if (!dev->caps.vep_mc_steering)
+        if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_MC_STEER))
                 return 0;
 
 
@@ -887,7 +890,7 @@ EXPORT_SYMBOL_GPL(mlx4_multicast_promisc_remove);
 
 int mlx4_unicast_promisc_add(struct mlx4_dev *dev, u32 qpn, u8 port)
 {
-        if (!dev->caps.vep_mc_steering)
+        if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_MC_STEER))
                 return 0;
 
 
@@ -897,7 +900,7 @@ EXPORT_SYMBOL_GPL(mlx4_unicast_promisc_add);
 
 int mlx4_unicast_promisc_remove(struct mlx4_dev *dev, u32 qpn, u8 port)
 {
-        if (!dev->caps.vep_mc_steering)
+        if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_MC_STEER))
                 return 0;
 
         return remove_promisc_qp(dev, 0, port, MLX4_UC_STEER, qpn);
diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h
index dd7d745fbab..a2fcd8402d3 100644
--- a/drivers/net/mlx4/mlx4.h
+++ b/drivers/net/mlx4/mlx4.h
@@ -48,8 +48,8 @@
 #include <linux/mlx4/doorbell.h>
 
 #define DRV_NAME        "mlx4_core"
-#define DRV_VERSION     "0.01"
-#define DRV_RELDATE     "May 1, 2007"
+#define DRV_VERSION     "1.0"
+#define DRV_RELDATE     "July 14, 2011"
 
 enum {
         MLX4_HCR_BASE           = 0x80680,
@@ -342,6 +342,7 @@ struct mlx4_priv {
         struct mlx4_srq_table   srq_table;
         struct mlx4_qp_table    qp_table;
         struct mlx4_mcg_table   mcg_table;
+        struct mlx4_bitmap      counters_bitmap;
 
         struct mlx4_catas_err   catas_err;
 
diff --git a/drivers/net/mlx4/port.c b/drivers/net/mlx4/port.c
index 8856659fb43..1f95afda684 100644
--- a/drivers/net/mlx4/port.c
+++ b/drivers/net/mlx4/port.c
@@ -146,7 +146,7 @@ int mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *qpn, u8 wrap)
         int i, err = 0;
         int free = -1;
 
-        if (dev->caps.vep_uc_steering) {
+        if (dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_UC_STEER) {
                 err = mlx4_uc_steer_add(dev, port, mac, qpn, 1);
                 if (!err) {
                         entry = kmalloc(sizeof *entry, GFP_KERNEL);
@@ -203,7 +203,7 @@ int mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *qpn, u8 wrap)
                 goto out;
         }
 
-        if (!dev->caps.vep_uc_steering)
+        if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_UC_STEER))
                 *qpn = info->base_qpn + free;
         ++table->total;
 out:
@@ -243,7 +243,7 @@ void mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, int qpn)
         int index = qpn - info->base_qpn;
         struct mlx4_mac_entry *entry;
 
-        if (dev->caps.vep_uc_steering) {
+        if (dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_UC_STEER) {
                 entry = radix_tree_lookup(&info->mac_tree, qpn);
                 if (entry) {
                         mlx4_uc_steer_release(dev, port, entry->mac, qpn, 1);
@@ -274,7 +274,7 @@ int mlx4_replace_mac(struct mlx4_dev *dev, u8 port, int qpn, u64 new_mac, u8 wra
         struct mlx4_mac_entry *entry;
         int err;
 
-        if (dev->caps.vep_uc_steering) {
+        if (dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_UC_STEER) {
                 entry = radix_tree_lookup(&info->mac_tree, qpn);
                 if (!entry)
                         return -EINVAL;