5 files changed, 141 insertions, 5 deletions

diff --git a/include/rdma/ib_cm.h b/include/rdma/ib_cm.h
index 77fe9039209b..5308683c8c41 100644
--- a/include/rdma/ib_cm.h
+++ b/include/rdma/ib_cm.h
@@ -290,6 +290,7 @@ struct ib_cm_id {
         enum ib_cm_lap_state    lap_state;      /* internal CM/debug use */
         __be32                  local_id;
         __be32                  remote_id;
+        u32                     remote_cm_qpn;  /* 1 unless redirected */
 };
 
 /**
diff --git a/include/rdma/ib_mad.h b/include/rdma/ib_mad.h
index fc6b1c18ffc6..53184a38fdf6 100644
--- a/include/rdma/ib_mad.h
+++ b/include/rdma/ib_mad.h
@@ -173,6 +173,27 @@ struct ib_vendor_mad {
         u8                      data[216];
 };
 
+struct ib_class_port_info
+{
+        u8                      base_version;
+        u8                      class_version;
+        __be16                  capability_mask;
+        u8                      reserved[3];
+        u8                      resp_time_value;
+        u8                      redirect_gid[16];
+        __be32                  redirect_tcslfl;
+        __be16                  redirect_lid;
+        __be16                  redirect_pkey;
+        __be32                  redirect_qp;
+        __be32                  redirect_qkey;
+        u8                      trap_gid[16];
+        __be32                  trap_tcslfl;
+        __be16                  trap_lid;
+        __be16                  trap_pkey;
+        __be32                  trap_hlqp;
+        __be32                  trap_qkey;
+};
+
 /**
  * ib_mad_send_buf - MAD data buffer and work request for sends.
  * @mad: References an allocated MAD data buffer.  The size of the data
diff --git a/include/rdma/ib_sa.h b/include/rdma/ib_sa.h
index c022edfc49da..a7555c800ecf 100644
--- a/include/rdma/ib_sa.h
+++ b/include/rdma/ib_sa.h
@@ -46,7 +46,36 @@ enum {
 
         IB_SA_METHOD_GET_TABLE          = 0x12,
         IB_SA_METHOD_GET_TABLE_RESP     = 0x92,
-        IB_SA_METHOD_DELETE             = 0x15
+        IB_SA_METHOD_DELETE             = 0x15,
+        IB_SA_METHOD_DELETE_RESP        = 0x95,
+        IB_SA_METHOD_GET_MULTI          = 0x14,
+        IB_SA_METHOD_GET_MULTI_RESP     = 0x94,
+        IB_SA_METHOD_GET_TRACE_TBL      = 0x13
+};
+
+enum {
+        IB_SA_ATTR_CLASS_PORTINFO    = 0x01,
+        IB_SA_ATTR_NOTICE            = 0x02,
+        IB_SA_ATTR_INFORM_INFO       = 0x03,
+        IB_SA_ATTR_NODE_REC          = 0x11,
+        IB_SA_ATTR_PORT_INFO_REC     = 0x12,
+        IB_SA_ATTR_SL2VL_REC         = 0x13,
+        IB_SA_ATTR_SWITCH_REC        = 0x14,
+        IB_SA_ATTR_LINEAR_FDB_REC    = 0x15,
+        IB_SA_ATTR_RANDOM_FDB_REC    = 0x16,
+        IB_SA_ATTR_MCAST_FDB_REC     = 0x17,
+        IB_SA_ATTR_SM_INFO_REC       = 0x18,
+        IB_SA_ATTR_LINK_REC          = 0x20,
+        IB_SA_ATTR_GUID_INFO_REC     = 0x30,
+        IB_SA_ATTR_SERVICE_REC       = 0x31,
+        IB_SA_ATTR_PARTITION_REC     = 0x33,
+        IB_SA_ATTR_PATH_REC          = 0x35,
+        IB_SA_ATTR_VL_ARB_REC        = 0x36,
+        IB_SA_ATTR_MC_MEMBER_REC     = 0x38,
+        IB_SA_ATTR_TRACE_REC         = 0x39,
+        IB_SA_ATTR_MULTI_PATH_REC    = 0x3a,
+        IB_SA_ATTR_SERVICE_ASSOC_REC = 0x3b,
+        IB_SA_ATTR_INFORM_INFO_REC   = 0xf3
 };
 
 enum ib_sa_selector {
diff --git a/include/rdma/ib_user_cm.h b/include/rdma/ib_user_cm.h
index 72182d16778b..e4d1654276ad 100644
--- a/include/rdma/ib_user_cm.h
+++ b/include/rdma/ib_user_cm.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2005 Topspin Communications.  All rights reserved.
+ * Copyright (c) 2005 Intel Corporation.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -37,7 +38,7 @@
 
 #include <linux/types.h>
 
-#define IB_USER_CM_ABI_VERSION 1
+#define IB_USER_CM_ABI_VERSION 2
 
 enum {
         IB_USER_CM_CMD_CREATE_ID,
@@ -60,6 +61,7 @@ enum {
         IB_USER_CM_CMD_SEND_SIDR_REP,
 
         IB_USER_CM_CMD_EVENT,
+        IB_USER_CM_CMD_INIT_QP_ATTR,
 };
 /*
  * command ABI structures.
@@ -71,6 +73,7 @@ struct ib_ucm_cmd_hdr {
 };
 
 struct ib_ucm_create_id {
+        __u64 uid;
         __u64 response;
 };
 
@@ -79,9 +82,14 @@ struct ib_ucm_create_id_resp {
 };
 
 struct ib_ucm_destroy_id {
+        __u64 response;
         __u32 id;
 };
 
+struct ib_ucm_destroy_id_resp {
+        __u32 events_reported;
+};
+
 struct ib_ucm_attr_id {
         __u64 response;
         __u32 id;
@@ -94,6 +102,64 @@ struct ib_ucm_attr_id_resp {
         __be32 remote_id;
 };
 
+struct ib_ucm_init_qp_attr {
+        __u64 response;
+        __u32 id;
+        __u32 qp_state;
+};
+
+struct ib_ucm_ah_attr {
+        __u8    grh_dgid[16];
+        __u32   grh_flow_label;
+        __u16   dlid;
+        __u16   reserved;
+        __u8    grh_sgid_index;
+        __u8    grh_hop_limit;
+        __u8    grh_traffic_class;
+        __u8    sl;
+        __u8    src_path_bits;
+        __u8    static_rate;
+        __u8    is_global;
+        __u8    port_num;
+};
+
+struct ib_ucm_init_qp_attr_resp {
+        __u32   qp_attr_mask;
+        __u32   qp_state;
+        __u32   cur_qp_state;
+        __u32   path_mtu;
+        __u32   path_mig_state;
+        __u32   qkey;
+        __u32   rq_psn;
+        __u32   sq_psn;
+        __u32   dest_qp_num;
+        __u32   qp_access_flags;
+
+        struct ib_ucm_ah_attr   ah_attr;
+        struct ib_ucm_ah_attr   alt_ah_attr;
+
+        /* ib_qp_cap */
+        __u32   max_send_wr;
+        __u32   max_recv_wr;
+        __u32   max_send_sge;
+        __u32   max_recv_sge;
+        __u32   max_inline_data;
+
+        __u16   pkey_index;
+        __u16   alt_pkey_index;
+        __u8    en_sqd_async_notify;
+        __u8    sq_draining;
+        __u8    max_rd_atomic;
+        __u8    max_dest_rd_atomic;
+        __u8    min_rnr_timer;
+        __u8    port_num;
+        __u8    timeout;
+        __u8    retry_cnt;
+        __u8    rnr_retry;
+        __u8    alt_port_num;
+        __u8    alt_timeout;
+};
+
 struct ib_ucm_listen {
         __be64 service_id;
         __be64 service_mask;
@@ -157,6 +223,7 @@ struct ib_ucm_req {
 };
 
 struct ib_ucm_rep {
+        __u64 uid;
         __u64 data;
         __u32 id;
         __u32 qpn;
@@ -232,7 +299,6 @@ struct ib_ucm_event_get {
 };
 
 struct ib_ucm_req_event_resp {
-        __u32                  listen_id;
         /* device */
         /* port */
         struct ib_ucm_path_rec primary_path;
@@ -287,7 +353,6 @@ struct ib_ucm_apr_event_resp {
 };
 
 struct ib_ucm_sidr_req_event_resp {
-        __u32 listen_id;
         /* device */
         /* port */
         __u16 pkey;
@@ -307,6 +372,7 @@ struct ib_ucm_sidr_rep_event_resp {
 #define IB_UCM_PRES_ALTERNATE 0x08
 
 struct ib_ucm_event_resp {
+        __u64 uid;
         __u32 id;
         __u32 event;
         __u32 present;
diff --git a/include/rdma/ib_user_verbs.h b/include/rdma/ib_user_verbs.h
index 7ebb01c8f996..fd85725391a4 100644
--- a/include/rdma/ib_user_verbs.h
+++ b/include/rdma/ib_user_verbs.h
@@ -42,7 +42,7 @@
  * Increment this value if any changes that break userspace ABI
  * compatibility are made.
  */
-#define IB_USER_VERBS_ABI_VERSION       1
+#define IB_USER_VERBS_ABI_VERSION       2
 
 enum {
         IB_USER_VERBS_CMD_QUERY_PARAMS,
@@ -292,7 +292,14 @@ struct ib_uverbs_create_cq_resp {
 };
 
 struct ib_uverbs_destroy_cq {
+        __u64 response;
         __u32 cq_handle;
+        __u32 reserved;
+};
+
+struct ib_uverbs_destroy_cq_resp {
+        __u32 comp_events_reported;
+        __u32 async_events_reported;
 };
 
 struct ib_uverbs_create_qp {
@@ -372,7 +379,13 @@ struct ib_uverbs_modify_qp_resp {
 };
 
 struct ib_uverbs_destroy_qp {
+        __u64 response;
         __u32 qp_handle;
+        __u32 reserved;
+};
+
+struct ib_uverbs_destroy_qp_resp {
+        __u32 events_reported;
 };
 
 struct ib_uverbs_attach_mcast {
@@ -416,7 +429,13 @@ struct ib_uverbs_modify_srq {
 };
 
 struct ib_uverbs_destroy_srq {
+        __u64 response;
         __u32 srq_handle;
+        __u32 reserved;
+};
+
+struct ib_uverbs_destroy_srq_resp {
+        __u32 events_reported;
 };
 
 #endif /* IB_USER_VERBS_H */