27 files changed, 1508 insertions, 1132 deletions

diff --git a/Documentation/filesystems/nfs/nfs-rdma.txt b/Documentation/filesystems/nfs/nfs-rdma.txt
index 724043858b08..95c13aa575ff 100644
--- a/Documentation/filesystems/nfs/nfs-rdma.txt
+++ b/Documentation/filesystems/nfs/nfs-rdma.txt
@@ -187,8 +187,10 @@ Check RDMA and NFS Setup
     To further test the InfiniBand software stack, use IPoIB (this
     assumes you have two IB hosts named host1 and host2):
 
-    host1$ ifconfig ib0 a.b.c.x
-    host2$ ifconfig ib0 a.b.c.y
+    host1$ ip link set dev ib0 up
+    host1$ ip address add dev ib0 a.b.c.x
+    host2$ ip link set dev ib0 up
+    host2$ ip address add dev ib0 a.b.c.y
     host1$ ping a.b.c.y
     host2$ ping a.b.c.x
 
@@ -229,7 +231,8 @@ NFS/RDMA Setup
 
     $ modprobe ib_mthca
     $ modprobe ib_ipoib
-    $ ifconfig ib0 a.b.c.d
+    $ ip li set dev ib0 up
+    $ ip addr add dev ib0 a.b.c.d
 
     NOTE: use unique addresses for the client and server
 
diff --git a/MAINTAINERS b/MAINTAINERS
index c72a7baec55c..1b9e38d02318 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8791,6 +8791,15 @@ W:	http://www.emulex.com
 S:      Supported
 F:      drivers/net/ethernet/emulex/benet/
 
+EMULEX ONECONNECT ROCE DRIVER
+M:      Selvin Xavier <selvin.xavier@emulex.com>
+M:      Devesh Sharma <devesh.sharma@emulex.com>
+M:      Mitesh Ahuja <mitesh.ahuja@emulex.com>
+L:      linux-rdma@vger.kernel.org
+W:      http://www.emulex.com
+S:      Supported
+F:      drivers/infiniband/hw/ocrdma/
+
 SFC NETWORK DRIVER
 M:      Solarflare linux maintainers <linux-net-drivers@solarflare.com>
 M:      Shradha Shah <sshah@solarflare.com>
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index 259dcc7779f5..88cce9bb72fe 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -246,6 +246,17 @@ static int ib_uverbs_cleanup_ucontext(struct ib_uverbs_file *file,
                 kfree(uqp);
         }
 
+        list_for_each_entry_safe(uobj, tmp, &context->srq_list, list) {
+                struct ib_srq *srq = uobj->object;
+                struct ib_uevent_object *uevent =
+                        container_of(uobj, struct ib_uevent_object, uobject);
+
+                idr_remove_uobj(&ib_uverbs_srq_idr, uobj);
+                ib_destroy_srq(srq);
+                ib_uverbs_release_uevent(file, uevent);
+                kfree(uevent);
+        }
+
         list_for_each_entry_safe(uobj, tmp, &context->cq_list, list) {
                 struct ib_cq *cq = uobj->object;
                 struct ib_uverbs_event_file *ev_file = cq->cq_context;
@@ -258,17 +269,6 @@ static int ib_uverbs_cleanup_ucontext(struct ib_uverbs_file *file,
                 kfree(ucq);
         }
 
-        list_for_each_entry_safe(uobj, tmp, &context->srq_list, list) {
-                struct ib_srq *srq = uobj->object;
-                struct ib_uevent_object *uevent =
-                        container_of(uobj, struct ib_uevent_object, uobject);
-
-                idr_remove_uobj(&ib_uverbs_srq_idr, uobj);
-                ib_destroy_srq(srq);
-                ib_uverbs_release_uevent(file, uevent);
-                kfree(uevent);
-        }
-
         list_for_each_entry_safe(uobj, tmp, &context->mr_list, list) {
                 struct ib_mr *mr = uobj->object;
 
diff --git a/drivers/infiniband/hw/mlx4/alias_GUID.c b/drivers/infiniband/hw/mlx4/alias_GUID.c
index a31e031afd87..0f00204d2ece 100644
--- a/drivers/infiniband/hw/mlx4/alias_GUID.c
+++ b/drivers/infiniband/hw/mlx4/alias_GUID.c
@@ -58,14 +58,19 @@ struct mlx4_alias_guid_work_context {
         int                     query_id;
         struct list_head        list;
         int                     block_num;
+        ib_sa_comp_mask         guid_indexes;
+        u8                      method;
 };
 
 struct mlx4_next_alias_guid_work {
         u8 port;
         u8 block_num;
+        u8 method;
         struct mlx4_sriov_alias_guid_info_rec_det rec_det;
 };
 
+static int get_low_record_time_index(struct mlx4_ib_dev *dev, u8 port,
+                                     int *resched_delay_sec);
 
 void mlx4_ib_update_cache_on_guid_change(struct mlx4_ib_dev *dev, int block_num,
                                          u8 port_num, u8 *p_data)
@@ -118,6 +123,57 @@ ib_sa_comp_mask mlx4_ib_get_aguid_comp_mask_from_ix(int index)
         return IB_SA_COMP_MASK(4 + index);
 }
 
+void mlx4_ib_slave_alias_guid_event(struct mlx4_ib_dev *dev, int slave,
+                                    int port,  int slave_init)
+{
+        __be64 curr_guid, required_guid;
+        int record_num = slave / 8;
+        int index = slave % 8;
+        int port_index = port - 1;
+        unsigned long flags;
+        int do_work = 0;
+
+        spin_lock_irqsave(&dev->sriov.alias_guid.ag_work_lock, flags);
+        if (dev->sriov.alias_guid.ports_guid[port_index].state_flags &
+            GUID_STATE_NEED_PORT_INIT)
+                goto unlock;
+        if (!slave_init) {
+                curr_guid = *(__be64 *)&dev->sriov.
+                        alias_guid.ports_guid[port_index].
+                        all_rec_per_port[record_num].
+                        all_recs[GUID_REC_SIZE * index];
+                if (curr_guid == cpu_to_be64(MLX4_GUID_FOR_DELETE_VAL) ||
+                    !curr_guid)
+                        goto unlock;