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

Pull infiniband/RDMA updates from Roland Dreier:
 - large set of iSER initiator improvements
 - hardware driver fixes for cxgb4, mlx5 and ocrdma
 - small fixes to core midlayer

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (47 commits)
  RDMA/cxgb4: Fix ntuple calculation for ipv6 and remove duplicate line
  RDMA/cxgb4: Add missing neigh_release in find_route
  RDMA/cxgb4: Take IPv6 into account for best_mtu and set_emss
  RDMA/cxgb4: Make c4iw_wr_log_size_order static
  IB/core: Fix XRC race condition in ib_uverbs_open_qp
  IB/core: Clear AH attr variable to prevent garbage data
  RDMA/ocrdma: Save the bit environment, spare unncessary parenthesis
  RDMA/ocrdma: The kernel has a perfectly good BIT() macro - use it
  RDMA/ocrdma: Don't memset() buffers we just allocated with kzalloc()
  RDMA/ocrdma: Remove a unused-label warning
  RDMA/ocrdma: Convert kernel VA to PA for mmap in user
  RDMA/ocrdma: Get vlan tag from ib_qp_attrs
  RDMA/ocrdma: Add default GID at index 0
  IB/mlx5, iser, isert: Add Signature API additions
  Target/iser: Centralize ib_sig_domain setting
  IB/iser: Centralize ib_sig_domain settings
  IB/mlx5: Use extended internal signature layout
  IB/iser: Set IP_CSUM as default guard type
  IB/iser: Remove redundant assignment
  IB/mlx5: Use enumerations for PI copy mask
  ...

1 files changed, 27 insertions, 8 deletions

diff --git a/include/linux/mlx5/qp.h b/include/linux/mlx5/qp.h
index 7c4c0f1f5805..3fa075daeb1d 100644
--- a/include/linux/mlx5/qp.h
+++ b/include/linux/mlx5/qp.h
@@ -40,6 +40,15 @@
 #define MLX5_SIG_WQE_SIZE       (MLX5_SEND_WQE_BB * 5)
 #define MLX5_DIF_SIZE           8
 #define MLX5_STRIDE_BLOCK_OP    0x400
+#define MLX5_CPY_GRD_MASK       0xc0
+#define MLX5_CPY_APP_MASK       0x30
+#define MLX5_CPY_REF_MASK       0x0f
+#define MLX5_BSF_INC_REFTAG     (1 << 6)
+#define MLX5_BSF_INL_VALID      (1 << 15)
+#define MLX5_BSF_REFRESH_DIF    (1 << 14)
+#define MLX5_BSF_REPEAT_BLOCK   (1 << 7)
+#define MLX5_BSF_APPTAG_ESCAPE  0x1
+#define MLX5_BSF_APPREF_ESCAPE  0x2
 
 enum mlx5_qp_optpar {
         MLX5_QP_OPTPAR_ALT_ADDR_PATH            = 1 << 0,
@@ -287,6 +296,22 @@ struct mlx5_wqe_inline_seg {
         __be32  byte_count;
 };
 
+enum mlx5_sig_type {
+        MLX5_DIF_CRC = 0x1,
+        MLX5_DIF_IPCS = 0x2,
+};
+
+struct mlx5_bsf_inl {
+        __be16          vld_refresh;
+        __be16          dif_apptag;
+        __be32          dif_reftag;
+        u8              sig_type;
+        u8              rp_inv_seed;
+        u8              rsvd[3];
+        u8              dif_inc_ref_guard_check;
+        __be16          dif_app_bitmask_check;
+};
+
 struct mlx5_bsf {
         struct mlx5_bsf_basic {
                 u8              bsf_size_sbs;
@@ -310,14 +335,8 @@ struct mlx5_bsf {
                 __be32          w_tfs_psv;
                 __be32          m_tfs_psv;
         } ext;
-        struct mlx5_bsf_inl {
-                __be32          w_inl_vld;
-                __be32          w_rsvd;
-                __be64          w_block_format;
-                __be32          m_inl_vld;
-                __be32          m_rsvd;
-                __be64          m_block_format;
-        } inl;
+        struct mlx5_bsf_inl     w_inl;
+        struct mlx5_bsf_inl     m_inl;
 };
 
 struct mlx5_klm {