Merge tag 'v4.18' into rdma.git for-next

Resolve merge conflicts from the -rc cycle against the rdma.git tree:

Conflicts:
 drivers/infiniband/core/uverbs_cmd.c
  - New ifs added to ib_uverbs_ex_create_flow in -rc and for-next
  - Merge removal of file->ucontext in for-next with new code in -rc
 drivers/infiniband/core/uverbs_main.c
  - for-next removed code from ib_uverbs_write() that was modified
    in for-rc

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

3 files changed, 18 insertions, 4 deletions

diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index 96498ff6beb6..3723f6d4e2b7 100644
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -363,6 +363,7 @@ struct mlx5_frag_buf_ctrl {
         struct mlx5_frag_buf    frag_buf;
         u32                     sz_m1;
         u32                     frag_sz_m1;
+        u32                     strides_offset;
         u8                      log_sz;
         u8                      log_stride;
         u8                      log_frag_strides;
@@ -988,14 +989,22 @@ static inline u32 mlx5_base_mkey(const u32 key)
         return key & 0xffffff00u;
 }
 
-static inline void mlx5_fill_fbc(u8 log_stride, u8 log_sz,
-                                 struct mlx5_frag_buf_ctrl *fbc)
+static inline void mlx5_fill_fbc_offset(u8 log_stride, u8 log_sz,
+                                        u32 strides_offset,
+                                        struct mlx5_frag_buf_ctrl *fbc)
 {
         fbc->log_stride = log_stride;
         fbc->log_sz     = log_sz;
         fbc->sz_m1      = (1 << fbc->log_sz) - 1;
         fbc->log_frag_strides = PAGE_SHIFT - fbc->log_stride;
         fbc->frag_sz_m1 = (1 << fbc->log_frag_strides) - 1;
+        fbc->strides_offset = strides_offset;
+}
+
+static inline void mlx5_fill_fbc(u8 log_stride, u8 log_sz,
+                                 struct mlx5_frag_buf_ctrl *fbc)
+{
+        mlx5_fill_fbc_offset(log_stride, log_sz, 0, fbc);
 }
 
 static inline void mlx5_core_init_cq_frag_buf(struct mlx5_frag_buf_ctrl *fbc,
@@ -1009,7 +1018,10 @@ static inline void mlx5_core_init_cq_frag_buf(struct mlx5_frag_buf_ctrl *fbc,
 static inline void *mlx5_frag_buf_get_wqe(struct mlx5_frag_buf_ctrl *fbc,
                                           u32 ix)
 {
-        unsigned int frag = (ix >> fbc->log_frag_strides);
+        unsigned int frag;
+
+        ix  += fbc->strides_offset;
+        frag = ix >> fbc->log_frag_strides;
 
         return fbc->frag_buf.frags[frag].buf +
                 ((fbc->frag_sz_m1 & ix) << fbc->log_stride);
diff --git a/include/linux/mlx5/eswitch.h b/include/linux/mlx5/eswitch.h
index d3c9db492b30..fab5121ffb8f 100644
--- a/include/linux/mlx5/eswitch.h
+++ b/include/linux/mlx5/eswitch.h
@@ -8,6 +8,8 @@
 
 #include <linux/mlx5/driver.h>
 
+#define MLX5_ESWITCH_MANAGER(mdev) MLX5_CAP_GEN(mdev, eswitch_manager)
+
 enum {
         SRIOV_NONE,
         SRIOV_LEGACY,
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index 5e04e2053fd7..c2a5b480b156 100644
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -942,7 +942,7 @@ struct mlx5_ifc_cmd_hca_cap_bits {
         u8         vnic_env_queue_counters[0x1];
         u8         ets[0x1];
         u8         nic_flow_table[0x1];
-        u8         eswitch_flow_table[0x1];
+        u8         eswitch_manager[0x1];
         u8         device_memory[0x1];
         u8         mcam_reg[0x1];
         u8         pcam_reg[0x1];