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
  ...

1 files changed, 18 insertions, 3 deletions

diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index fbe1973f77b0..fa643f4f4e28 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -816,7 +816,7 @@ static void update_gids_task(struct work_struct *work)
                 memcpy(gw->dev->iboe.gid_table[gw->port - 1], gw->gids, sizeof gw->gids);
                 event.device = &gw->dev->ib_dev;
                 event.element.port_num = gw->port;
-                event.event    = IB_EVENT_LID_CHANGE;
+                event.event    = IB_EVENT_GID_CHANGE;
                 ib_dispatch_event(&event);
         }
 
@@ -1098,11 +1098,21 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
         if (init_node_data(ibdev))
                 goto err_map;
 
+        for (i = 0; i < ibdev->num_ports; ++i) {
+                if (mlx4_ib_port_link_layer(&ibdev->ib_dev, i + 1) ==
+                                                IB_LINK_LAYER_ETHERNET) {
+                        err = mlx4_counter_alloc(ibdev->dev, &ibdev->counters[i]);
+                        if (err)
+                                ibdev->counters[i] = -1;
+                } else
+                                ibdev->counters[i] = -1;
+        }
+
         spin_lock_init(&ibdev->sm_lock);
         mutex_init(&ibdev->cap_mask_mutex);
 
         if (ib_register_device(&ibdev->ib_dev, NULL))
-                goto err_map;
+                goto err_counter;
 
         if (mlx4_ib_mad_init(ibdev))
                 goto err_reg;
@@ -1132,6 +1142,10 @@ err_notif:
 err_reg:
         ib_unregister_device(&ibdev->ib_dev);
 
+err_counter:
+        for (; i; --i)
+                mlx4_counter_free(ibdev->dev, ibdev->counters[i - 1]);
+
 err_map:
         iounmap(ibdev->uar_map);
 
@@ -1160,7 +1174,8 @@ static void mlx4_ib_remove(struct mlx4_dev *dev, void *ibdev_ptr)
                 ibdev->iboe.nb.notifier_call = NULL;
         }
         iounmap(ibdev->uar_map);
-
+        for (p = 0; p < ibdev->num_ports; ++p)
+                mlx4_counter_free(ibdev->dev, ibdev->counters[p]);
         mlx4_foreach_port(p, dev, MLX4_PORT_TYPE_IB)
                 mlx4_CLOSE_PORT(dev, p);