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

Pull infiniband updates from Roland Dreier:
 "Main batch of InfiniBand/RDMA changes for 3.14:
   - Flow steering for InfiniBand UD traffic
   - IP-based addressing for IBoE aka RoCE
   - Pass SRP submaintainership from Dave to Bart
   - SRP transport fixes from Bart
   - Add the new Cisco usNIC low-level device driver
   - Various other fixes"

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (75 commits)
  IB/mlx5: Verify reserved fields are cleared
  IB/mlx5: Remove old field for create mkey mailbox
  IB/mlx5: Abort driver cleanup if teardown hca fails
  IB/mlx5: Allow creation of QPs with zero-length work queues
  mlx5_core: Fix PowerPC support
  mlx5_core: Improve debugfs readability
  IB/mlx5: Add support for resize CQ
  IB/mlx5: Implement modify CQ
  IB/mlx5: Make sure doorbell record is visible before doorbell
  mlx5_core: Use mlx5 core style warning
  IB/mlx5: Clear out struct before create QP command
  mlx5_core: Fix out arg size in access_register command
  RDMA/nes: Slight optimization of Ethernet address compare
  IB/qib: Fix QP check when looping back to/from QP1
  RDMA/cxgb4: Fix gcc warning on 32-bit arch
  IB/usnic: Remove unused includes of <linux/version.h>
  RDMA/amso1100: Add check if cache memory was allocated before freeing it
  IPoIB: Report operstate consistently when brought up without a link
  IB/core: Fix unused variable warning
  RDMA/cma: Handle global/non-linklocal IPv6 addresses in cma_check_linklocal()
  ...

6 files changed, 101 insertions, 16 deletions

diff --git a/include/linux/mlx4/cmd.h b/include/linux/mlx4/cmd.h
index 8df61bc5da00..ff36620f88a7 100644
--- a/include/linux/mlx4/cmd.h
+++ b/include/linux/mlx4/cmd.h
@@ -157,6 +157,7 @@ enum {
         /* register/delete flow steering network rules */
         MLX4_QP_FLOW_STEERING_ATTACH = 0x65,
         MLX4_QP_FLOW_STEERING_DETACH = 0x66,
+        MLX4_FLOW_STEERING_IB_UC_QP_RANGE = 0x64,
 };
 
 enum {
diff --git a/include/linux/mlx4/cq.h b/include/linux/mlx4/cq.h
index 98fa492cf406..e1862997f933 100644
--- a/include/linux/mlx4/cq.h
+++ b/include/linux/mlx4/cq.h
@@ -34,6 +34,7 @@
 #define MLX4_CQ_H
 
 #include <linux/types.h>
+#include <uapi/linux/if_ether.h>
 
 #include <linux/mlx4/device.h>
 #include <linux/mlx4/doorbell.h>
@@ -43,10 +44,15 @@ struct mlx4_cqe {
         __be32                  immed_rss_invalid;
         __be32                  g_mlpath_rqpn;
         __be16                  sl_vid;
-        __be16                  rlid;
-        __be16                  status;
-        u8                      ipv6_ext_mask;
-        u8                      badfcs_enc;
+        union {
+                struct {
+                        __be16  rlid;
+                        __be16  status;
+                        u8      ipv6_ext_mask;
+                        u8      badfcs_enc;
+                };
+                u8  smac[ETH_ALEN];
+        };
         __be32                  byte_cnt;
         __be16                  wqe_index;
         __be16                  checksum;
@@ -83,6 +89,7 @@ struct mlx4_ts_cqe {
 enum {
         MLX4_CQE_VLAN_PRESENT_MASK      = 1 << 29,
         MLX4_CQE_QPN_MASK               = 0xffffff,
+        MLX4_CQE_VID_MASK               = 0xfff,
 };
 
 enum {
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index 7d3a523160ba..ac5cb1d92487 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -160,7 +160,8 @@ enum {
         MLX4_DEV_CAP_FLAG2_TS                   = 1LL <<  5,
         MLX4_DEV_CAP_FLAG2_VLAN_CONTROL         = 1LL <<  6,
         MLX4_DEV_CAP_FLAG2_FSM                  = 1LL <<  7,
-        MLX4_DEV_CAP_FLAG2_UPDATE_QP            = 1LL <<  8
+        MLX4_DEV_CAP_FLAG2_UPDATE_QP            = 1LL <<  8,
+        MLX4_DEV_CAP_FLAG2_DMFS_IPOIB           = 1LL <<  9
 };
 
 enum {
@@ -1095,6 +1096,7 @@ int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn,
 int mlx4_SET_PORT_PRIO2TC(struct mlx4_dev *dev, u8 port, u8 *prio2tc);
 int mlx4_SET_PORT_SCHEDULER(struct mlx4_dev *dev, u8 port, u8 *tc_tx_bw,
                 u8 *pg, u16 *ratelimit);
+int mlx4_find_cached_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *idx);
 int mlx4_find_cached_vlan(struct mlx4_dev *dev, u8 port, u16 vid, int *idx);
 int mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index);
 void mlx4_unregister_vlan(struct mlx4_dev *dev, u8 port, u16 vlan);
@@ -1144,6 +1146,9 @@ int set_and_calc_slave_port_state(struct mlx4_dev *dev, int slave, u8 port, int
 void mlx4_put_slave_node_guid(struct mlx4_dev *dev, int slave, __be64 guid);
 __be64 mlx4_get_slave_node_guid(struct mlx4_dev *dev, int slave);
 
+int mlx4_FLOW_STEERING_IB_UC_QP_RANGE(struct mlx4_dev *dev, u32 min_range_qpn,
+                                      u32 max_range_qpn);
+
 cycle_t mlx4_read_clock(struct mlx4_dev *dev);
 
 #endif /* MLX4_DEVICE_H */
diff --git a/include/linux/mlx5/cq.h b/include/linux/mlx5/cq.h
index 3db67f73d96d..2202c7f72b75 100644
--- a/include/linux/mlx5/cq.h
+++ b/include/linux/mlx5/cq.h
@@ -79,15 +79,23 @@ enum {
         MLX5_CQE_RESP_SEND      = 2,
         MLX5_CQE_RESP_SEND_IMM  = 3,
         MLX5_CQE_RESP_SEND_INV  = 4,
-        MLX5_CQE_RESIZE_CQ      = 0xff, /* TBD */
+        MLX5_CQE_RESIZE_CQ      = 5,
         MLX5_CQE_REQ_ERR        = 13,
         MLX5_CQE_RESP_ERR       = 14,
+        MLX5_CQE_INVALID        = 15,
 };
 
 enum {
-        MLX5_CQ_MODIFY_RESEIZE = 0,
-        MLX5_CQ_MODIFY_MODER = 1,
-        MLX5_CQ_MODIFY_MAPPING = 2,
+        MLX5_CQ_MODIFY_PERIOD   = 1 << 0,
+        MLX5_CQ_MODIFY_COUNT    = 1 << 1,
+        MLX5_CQ_MODIFY_OVERRUN  = 1 << 2,
+};
+
+enum {
+        MLX5_CQ_OPMOD_RESIZE            = 1,
+        MLX5_MODIFY_CQ_MASK_LOG_SIZE    = 1 << 0,
+        MLX5_MODIFY_CQ_MASK_PG_OFFSET   = 1 << 1,
+        MLX5_MODIFY_CQ_MASK_PG_SIZE     = 1 << 2,
 };
 
 struct mlx5_cq_modify_params {
@@ -158,7 +166,7 @@ int mlx5_core_destroy_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq);
 int mlx5_core_query_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq,
                        struct mlx5_query_cq_mbox_out *out);
 int mlx5_core_modify_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq,
-                        int type, struct mlx5_cq_modify_params *params);
+                        struct mlx5_modify_cq_mbox_in *in, int in_sz);
 int mlx5_debug_cq_add(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq);
 void mlx5_debug_cq_remove(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq);
 
diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h
index da78875807fc..817a6fae6d2c 100644
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
@@ -104,9 +104,10 @@ enum {
 };
 
 enum {
-        MLX5_BF_REGS_PER_PAGE   = 4,
-        MLX5_MAX_UAR_PAGES      = 1 << 8,
-        MLX5_MAX_UUARS          = MLX5_MAX_UAR_PAGES * MLX5_BF_REGS_PER_PAGE,
+        MLX5_BF_REGS_PER_PAGE           = 4,
+        MLX5_MAX_UAR_PAGES              = 1 << 8,
+        MLX5_NON_FP_BF_REGS_PER_PAGE    = 2,
+        MLX5_MAX_UUARS  = MLX5_MAX_UAR_PAGES * MLX5_NON_FP_BF_REGS_PER_PAGE,
 };
 
 enum {
@@ -176,6 +177,8 @@ enum {
         MLX5_DEV_CAP_FLAG_APM           = 1LL << 17,
         MLX5_DEV_CAP_FLAG_ATOMIC        = 1LL << 18,
         MLX5_DEV_CAP_FLAG_ON_DMND_PG    = 1LL << 24,
+        MLX5_DEV_CAP_FLAG_CQ_MODER      = 1LL << 29,
+        MLX5_DEV_CAP_FLAG_RESIZE_CQ     = 1LL << 30,
         MLX5_DEV_CAP_FLAG_RESIZE_SRQ    = 1LL << 32,
         MLX5_DEV_CAP_FLAG_REMOTE_FENCE  = 1LL << 38,
         MLX5_DEV_CAP_FLAG_TLP_HINTS     = 1LL << 39,
@@ -231,7 +234,8 @@ enum {
 };
 
 enum {
-        MLX5_ADAPTER_PAGE_SHIFT         = 12
+        MLX5_ADAPTER_PAGE_SHIFT         = 12,
+        MLX5_ADAPTER_PAGE_SIZE          = 1 << MLX5_ADAPTER_PAGE_SHIFT,
 };
 
 enum {
@@ -697,6 +701,20 @@ struct mlx5_query_cq_mbox_out {
         __be64                  pas[0];
 };
 
+struct mlx5_modify_cq_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        __be32                  cqn;
+        __be32                  field_select;
+        struct mlx5_cq_context  ctx;
+        u8                      rsvd[192];
+        __be64                  pas[0];
+};
+
+struct mlx5_modify_cq_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        u8                      rsvd[8];
+};
+
 struct mlx5_enable_hca_mbox_in {
         struct mlx5_inbox_hdr   hdr;
         u8                      rsvd[8];
@@ -831,8 +849,8 @@ struct mlx5_create_mkey_mbox_in {
         struct mlx5_mkey_seg    seg;
         u8                      rsvd1[16];
         __be32                  xlat_oct_act_size;
-        __be32                  bsf_coto_act_size;
-        u8                      rsvd2[168];
+        __be32                  rsvd2;
+        u8                      rsvd3[168];
         __be64                  pas[0];
 };
 
@@ -871,6 +889,7 @@ struct mlx5_modify_mkey_mbox_in {
 
 struct mlx5_modify_mkey_mbox_out {
         struct mlx5_outbox_hdr  hdr;
+        u8                      rsvd[8];
 };
 
 struct mlx5_dump_mkey_mbox_in {
diff --git a/include/linux/mlx5/qp.h b/include/linux/mlx5/qp.h
index d9e3eacb3a7f..d51eff713549 100644
--- a/include/linux/mlx5/qp.h
+++ b/include/linux/mlx5/qp.h
@@ -464,4 +464,49 @@ void mlx5_cleanup_qp_table(struct mlx5_core_dev *dev);
 int mlx5_debug_qp_add(struct mlx5_core_dev *dev, struct mlx5_core_qp *qp);
 void mlx5_debug_qp_remove(struct mlx5_core_dev *dev, struct mlx5_core_qp *qp);
 
+static inline const char *mlx5_qp_type_str(int type)
+{
+        switch (type) {
+        case MLX5_QP_ST_RC: return "RC";
+        case MLX5_QP_ST_UC: return "C";
+        case MLX5_QP_ST_UD: return "UD";
+        case MLX5_QP_ST_XRC: return "XRC";
+        case MLX5_QP_ST_MLX: return "MLX";
+        case MLX5_QP_ST_QP0: return "QP0";
+        case MLX5_QP_ST_QP1: return "QP1";
+        case MLX5_QP_ST_RAW_ETHERTYPE: return "RAW_ETHERTYPE";
+        case MLX5_QP_ST_RAW_IPV6: return "RAW_IPV6";
+        case MLX5_QP_ST_SNIFFER: return "SNIFFER";
+        case MLX5_QP_ST_SYNC_UMR: return "SYNC_UMR";
+        case MLX5_QP_ST_PTP_1588: return "PTP_1588";
+        case MLX5_QP_ST_REG_UMR: return "REG_UMR";
+        default: return "Invalid transport type";
+        }
+}
+
+static inline const char *mlx5_qp_state_str(int state)
+{
+        switch (state) {
+        case MLX5_QP_STATE_RST:
+        return "RST";
+        case MLX5_QP_STATE_INIT:
+        return "INIT";
+        case MLX5_QP_STATE_RTR:
+        return "RTR";
+        case MLX5_QP_STATE_RTS:
+        return "RTS";
+        case MLX5_QP_STATE_SQER:
+        return "SQER";
+        case MLX5_QP_STATE_SQD:
+        return "SQD";
+        case MLX5_QP_STATE_ERR:
+        return "ERR";
+        case MLX5_QP_STATE_SQ_DRAINING:
+        return "SQ_DRAINING";
+        case MLX5_QP_STATE_SUSPENDED:
+        return "SUSPENDED";
+        default: return "Invalid QP state";
+        }
+}
+
 #endif /* MLX5_QP_H */