aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Gunthorpe <jgg@mellanox.com>2018-01-26 17:16:46 -0500
committerJason Gunthorpe <jgg@mellanox.com>2018-01-29 14:58:34 -0500
commitbeb801ac51be3e024edef435333198d59ccfbb8f (patch)
treed713ebb4cecea250eb02841cadd91d3306035456
parent0812ed13217827d3c84cb7e5cb267c787d94d0a4 (diff)
RDMA: Move enum ib_cq_creation_flags to uapi headers
The flags field the enum is used with comes directly from the uapi so it belongs in the uapi headers for clarity and so userspace can use it. Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
-rw-r--r--drivers/infiniband/hw/mlx4/cq.c4
-rw-r--r--drivers/infiniband/hw/mlx5/cq.c2
-rw-r--r--drivers/infiniband/hw/mlx5/mlx5_ib.h4
-rw-r--r--include/rdma/ib_verbs.h5
-rw-r--r--include/uapi/rdma/ib_user_verbs.h7
5 files changed, 11 insertions, 11 deletions
diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c
index bf4f14a1b4fc..9a566ee3ceff 100644
--- a/drivers/infiniband/hw/mlx4/cq.c
+++ b/drivers/infiniband/hw/mlx4/cq.c
@@ -170,7 +170,7 @@ err_buf:
170 return err; 170 return err;
171} 171}
172 172
173#define CQ_CREATE_FLAGS_SUPPORTED IB_CQ_FLAGS_TIMESTAMP_COMPLETION 173#define CQ_CREATE_FLAGS_SUPPORTED IB_UVERBS_CQ_FLAGS_TIMESTAMP_COMPLETION
174struct ib_cq *mlx4_ib_create_cq(struct ib_device *ibdev, 174struct ib_cq *mlx4_ib_create_cq(struct ib_device *ibdev,
175 const struct ib_cq_init_attr *attr, 175 const struct ib_cq_init_attr *attr,
176 struct ib_ucontext *context, 176 struct ib_ucontext *context,
@@ -246,7 +246,7 @@ struct ib_cq *mlx4_ib_create_cq(struct ib_device *ibdev,
246 246
247 err = mlx4_cq_alloc(dev->dev, entries, &cq->buf.mtt, uar, 247 err = mlx4_cq_alloc(dev->dev, entries, &cq->buf.mtt, uar,
248 cq->db.dma, &cq->mcq, vector, 0, 248 cq->db.dma, &cq->mcq, vector, 0,
249 !!(cq->create_flags & IB_CQ_FLAGS_TIMESTAMP_COMPLETION)); 249 !!(cq->create_flags & IB_UVERBS_CQ_FLAGS_TIMESTAMP_COMPLETION));
250 if (err) 250 if (err)
251 goto err_dbmap; 251 goto err_dbmap;
252 252
diff --git a/drivers/infiniband/hw/mlx5/cq.c b/drivers/infiniband/hw/mlx5/cq.c
index 18705cbcdc8c..5b974fb97611 100644
--- a/drivers/infiniband/hw/mlx5/cq.c
+++ b/drivers/infiniband/hw/mlx5/cq.c
@@ -1010,7 +1010,7 @@ struct ib_cq *mlx5_ib_create_cq(struct ib_device *ibdev,
1010 MLX5_SET(cqc, cqc, uar_page, index); 1010 MLX5_SET(cqc, cqc, uar_page, index);
1011 MLX5_SET(cqc, cqc, c_eqn, eqn); 1011 MLX5_SET(cqc, cqc, c_eqn, eqn);
1012 MLX5_SET64(cqc, cqc, dbr_addr, cq->db.dma); 1012 MLX5_SET64(cqc, cqc, dbr_addr, cq->db.dma);
1013 if (cq->create_flags & IB_CQ_FLAGS_IGNORE_OVERRUN) 1013 if (cq->create_flags & IB_UVERBS_CQ_FLAGS_IGNORE_OVERRUN)
1014 MLX5_SET(cqc, cqc, oi, 1); 1014 MLX5_SET(cqc, cqc, oi, 1);
1015 1015
1016 err = mlx5_core_create_cq(dev->mdev, &cq->mcq, cqb, inlen); 1016 err = mlx5_core_create_cq(dev->mdev, &cq->mcq, cqb, inlen);
diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index 69a80f7512f0..139385129973 100644
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -1123,8 +1123,8 @@ static inline u32 check_cq_create_flags(u32 flags)
1123 * It returns non-zero value for unsupported CQ 1123 * It returns non-zero value for unsupported CQ
1124 * create flags, otherwise it returns zero. 1124 * create flags, otherwise it returns zero.
1125 */ 1125 */
1126 return (flags & ~(IB_CQ_FLAGS_IGNORE_OVERRUN | 1126 return (flags & ~(IB_UVERBS_CQ_FLAGS_IGNORE_OVERRUN |
1127 IB_CQ_FLAGS_TIMESTAMP_COMPLETION)); 1127 IB_UVERBS_CQ_FLAGS_TIMESTAMP_COMPLETION));
1128} 1128}
1129 1129
1130static inline int verify_assign_uidx(u8 cqe_version, u32 cmd_uidx, 1130static inline int verify_assign_uidx(u8 cqe_version, u32 cmd_uidx,
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 5e32fe781ca3..0b2942586840 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -300,11 +300,6 @@ struct ib_tm_caps {
300 u32 max_sge; 300 u32 max_sge;
301}; 301};
302 302
303enum ib_cq_creation_flags {
304 IB_CQ_FLAGS_TIMESTAMP_COMPLETION = 1 << 0,
305 IB_CQ_FLAGS_IGNORE_OVERRUN = 1 << 1,
306};
307
308struct ib_cq_init_attr { 303struct ib_cq_init_attr {
309 unsigned int cqe; 304 unsigned int cqe;
310 int comp_vector; 305 int comp_vector;
diff --git a/include/uapi/rdma/ib_user_verbs.h b/include/uapi/rdma/ib_user_verbs.h
index fd035641cf41..04d0e67b1312 100644
--- a/include/uapi/rdma/ib_user_verbs.h
+++ b/include/uapi/rdma/ib_user_verbs.h
@@ -402,13 +402,18 @@ struct ib_uverbs_create_cq {
402 __u64 driver_data[0]; 402 __u64 driver_data[0];
403}; 403};
404 404
405enum ib_uverbs_ex_create_cq_flags {
406 IB_UVERBS_CQ_FLAGS_TIMESTAMP_COMPLETION = 1 << 0,
407 IB_UVERBS_CQ_FLAGS_IGNORE_OVERRUN = 1 << 1,
408};
409
405struct ib_uverbs_ex_create_cq { 410struct ib_uverbs_ex_create_cq {
406 __u64 user_handle; 411 __u64 user_handle;
407 __u32 cqe; 412 __u32 cqe;
408 __u32 comp_vector; 413 __u32 comp_vector;
409 __s32 comp_channel; 414 __s32 comp_channel;
410 __u32 comp_mask; 415 __u32 comp_mask;
411 __u32 flags; 416 __u32 flags; /* bitmask of ib_uverbs_ex_create_cq_flags */
412 __u32 reserved; 417 __u32 reserved;
413}; 418};
414 419