Merge branch 'sched-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / include / uapi / rdma / ib_user_verbs.h

diff --git a/include/uapi/rdma/ib_user_verbs.h b/include/uapi/rdma/ib_user_verbs.h
index 867cc5084afbfce8ab24cfd87d5f52cda93697de..978841eeaff10e1cffc5d1c6e37fbe175c3db197 100644 (file)
--- a/include/uapi/rdma/ib_user_verbs.h
+++ b/include/uapi/rdma/ib_user_verbs.h
@@ -90,6 +90,8 @@ enum {
 };
 
 enum {
+       IB_USER_VERBS_EX_CMD_QUERY_DEVICE = IB_USER_VERBS_CMD_QUERY_DEVICE,
+       IB_USER_VERBS_EX_CMD_CREATE_CQ = IB_USER_VERBS_CMD_CREATE_CQ,
        IB_USER_VERBS_EX_CMD_CREATE_FLOW = IB_USER_VERBS_CMD_THRESHOLD,
        IB_USER_VERBS_EX_CMD_DESTROY_FLOW,
 };
@@ -201,6 +203,30 @@ struct ib_uverbs_query_device_resp {
        __u8  reserved[4];
 };
 
+struct ib_uverbs_ex_query_device {
+       __u32 comp_mask;
+       __u32 reserved;
+};
+
+struct ib_uverbs_odp_caps {
+       __u64 general_caps;
+       struct {
+               __u32 rc_odp_caps;
+               __u32 uc_odp_caps;
+               __u32 ud_odp_caps;
+       } per_transport_caps;
+       __u32 reserved;
+};
+
+struct ib_uverbs_ex_query_device_resp {
+       struct ib_uverbs_query_device_resp base;
+       __u32 comp_mask;
+       __u32 response_length;
+       struct ib_uverbs_odp_caps odp_caps;
+       __u64 timestamp_mask;
+       __u64 hca_core_clock; /* in KHZ */
+};
+
 struct ib_uverbs_query_port {
        __u64 response;
        __u8  port_num;
@@ -330,11 +356,27 @@ struct ib_uverbs_create_cq {
        __u64 driver_data[0];
 };
 
+struct ib_uverbs_ex_create_cq {
+       __u64 user_handle;
+       __u32 cqe;
+       __u32 comp_vector;
+       __s32 comp_channel;
+       __u32 comp_mask;
+       __u32 flags;
+       __u32 reserved;
+};
+
 struct ib_uverbs_create_cq_resp {
        __u32 cq_handle;
        __u32 cqe;
 };
 
+struct ib_uverbs_ex_create_cq_resp {
+       struct ib_uverbs_create_cq_resp base;
+       __u32 comp_mask;
+       __u32 response_length;
+};
+
 struct ib_uverbs_resize_cq {
        __u64 response;
        __u32 cq_handle;