From: Leon Romanovsky <leonro@xxxxxxxxxxxx> MAD and HFI1 have different naming convention, this patch simplifies and unifies their defines and names. As part of cleanup, the HFI1 _NUM() macro was removed. It has a potential to break applications which use this macro directly. Signed-off-by: Matan Barak <matanb@xxxxxxxxxxxx> Signed-off-by: Haggai Eran <haggaie@xxxxxxxxxxxx> Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxxxx> Signed-off-by: Leon Romanovsky <leon@xxxxxxxxxx> --- include/uapi/rdma/rdma_user_ioctl.h | 98 ++++++++++++++++++++++--------------- 1 file changed, 58 insertions(+), 40 deletions(-) diff --git a/include/uapi/rdma/rdma_user_ioctl.h b/include/uapi/rdma/rdma_user_ioctl.h index 7ecf8cd..9abd6d1 100644 --- a/include/uapi/rdma/rdma_user_ioctl.h +++ b/include/uapi/rdma/rdma_user_ioctl.h @@ -39,71 +39,89 @@ #include <rdma/hfi/hfi1_ioctl.h> /* Documentation/ioctl/ioctl-number.txt */ -#define RDMA_IOCTL_MAGIC 0x1b +#define RDMA_IOCTL_MAGIC 0x1b /* Legacy name, for user space application which already use it */ -#define IB_IOCTL_MAGIC RDMA_IOCTL_MAGIC +#define IB_IOCTL_MAGIC RDMA_IOCTL_MAGIC -#define IB_USER_MAD_REGISTER_AGENT _IOWR(RDMA_IOCTL_MAGIC, 1, \ - struct ib_user_mad_reg_req) +/* General blocks assignments */ +#define MAD_CMD_BASE 0x00 +#define HFI1_CMD_BASE 0xE0 -#define IB_USER_MAD_UNREGISTER_AGENT _IOW(RDMA_IOCTL_MAGIC, 2, __u32) +/* MAD specific section */ +#define MAD_CMD_REG_AGENT (MAD_CMD_BASE + 0x01) +#define MAD_CMD_UNREG_AGENT (MAD_CMD_BASE + 0x02) +#define MAD_CMD_ENABLE_PKEY (MAD_CMD_BASE + 0x03) +#define MAD_CMD_REG_AGENT2 (MAD_CMD_BASE + 0x04) -#define IB_USER_MAD_ENABLE_PKEY _IO(RDMA_IOCTL_MAGIC, 3) - -#define IB_USER_MAD_REGISTER_AGENT2 _IOWR(RDMA_IOCTL_MAGIC, 4, \ - struct ib_user_mad_reg_req2) +#define IB_USER_MAD_REGISTER_AGENT \ + _IOWR(RDMA_IOCTL_MAGIC, MAD_CMD_REG_AGENT, struct ib_user_mad_reg_req) +#define IB_USER_MAD_UNREGISTER_AGENT \ + _IOW(RDMA_IOCTL_MAGIC, MAD_CMD_UNREG_AGENT, __u32) +#define IB_USER_MAD_ENABLE_PKEY \ + _IO(RDMA_IOCTL_MAGIC, MAD_CMD_ENABLE_PKEY) +#define IB_USER_MAD_REGISTER_AGENT2 \ + _IOWR(RDMA_IOCTL_MAGIC, MAD_CMD_REG_AGENT2, struct ib_user_mad_reg_req2) +/* HFI specific section */ /* User commands. */ -#define HFI1_CMD_ASSIGN_CTXT 1 /* allocate HFI and context */ -#define HFI1_CMD_CTXT_INFO 2 /* find out what resources we got */ -#define HFI1_CMD_USER_INFO 3 /* set up userspace */ -#define HFI1_CMD_TID_UPDATE 4 /* update expected TID entries */ -#define HFI1_CMD_TID_FREE 5 /* free expected TID entries */ -#define HFI1_CMD_CREDIT_UPD 6 /* force an update of PIO credit */ +/* allocate HFI and context */ +#define HFI1_CMD_ASSIGN_CTXT (HFI1_CMD_BASE + 0x01) +/* find out what resources we got */ +#define HFI1_CMD_CTXT_INFO (HFI1_CMD_BASE + 0x02) +/* set up userspace */ +#define HFI1_CMD_USER_INFO (HFI1_CMD_BASE + 0x03) +/* update expected TID entries */ +#define HFI1_CMD_TID_UPDATE (HFI1_CMD_BASE + 0x04) +/* free expected TID entries */ +#define HFI1_CMD_TID_FREE (HFI1_CMD_BASE + 0x05) +/* force an update of PIO credit */ +#define HFI1_CMD_CREDIT_UPD (HFI1_CMD_BASE + 0x06) -#define HFI1_CMD_RECV_CTRL 8 /* control receipt of packets */ -#define HFI1_CMD_POLL_TYPE 9 /* set the kind of polling we want */ -#define HFI1_CMD_ACK_EVENT 10 /* ack & clear user status bits */ -#define HFI1_CMD_SET_PKEY 11 /* set context's pkey */ -#define HFI1_CMD_CTXT_RESET 12 /* reset context's HW send context */ -#define HFI1_CMD_TID_INVAL_READ 13 /* read TID cache invalidations */ -#define HFI1_CMD_GET_VERS 14 /* get the version of the user cdev */ +/* control receipt of packets */ +#define HFI1_CMD_RECV_CTRL (HFI1_CMD_BASE + 0x08) +/* set the kind of polling we want */ +#define HFI1_CMD_POLL_TYPE (HFI1_CMD_BASE + 0x09) +/* ack & clear user status bits */ +#define HFI1_CMD_ACK_EVENT (HFI1_CMD_BASE + 0x0A) +/* set context's pkey */ +#define HFI1_CMD_SET_PKEY (HFI1_CMD_BASE + 0x0B) +/* reset context's HW send context */ +#define HFI1_CMD_CTXT_RESET (HFI1_CMD_BASE + 0x0C) +/* read TID cache invalidations */ +#define HFI1_CMD_TID_INVAL_READ (HFI1_CMD_BASE + 0x0D) +/* get the version of the user cdev */ +#define HFI1_CMD_GET_VERS (HFI1_CMD_BASE + 0x0E) /* * User IOCTLs can not go above 128 if they do then see common.h and change the * base for the snoop ioctl */ -/* - * Make the ioctls occupy the last 0xf0-0xff portion of the IB range - */ -#define __NUM(cmd) (HFI1_CMD_##cmd + 0xe0) - #define HFI1_IOCTL_ASSIGN_CTXT \ - _IOWR(RDMA_IOCTL_MAGIC, __NUM(ASSIGN_CTXT), struct hfi1_user_info) + _IOWR(RDMA_IOCTL_MAGIC, HFI1_CMD_ASSIGN_CTXT, struct hfi1_user_info) #define HFI1_IOCTL_CTXT_INFO \ - _IOW(RDMA_IOCTL_MAGIC, __NUM(CTXT_INFO), struct hfi1_ctxt_info) + _IOW(RDMA_IOCTL_MAGIC, HFI1_CMD_CTXT_INFO, struct hfi1_ctxt_info) #define HFI1_IOCTL_USER_INFO \ - _IOW(RDMA_IOCTL_MAGIC, __NUM(USER_INFO), struct hfi1_base_info) + _IOW(RDMA_IOCTL_MAGIC, HFI1_CMD_USER_INFO, struct hfi1_base_info) #define HFI1_IOCTL_TID_UPDATE \ - _IOWR(RDMA_IOCTL_MAGIC, __NUM(TID_UPDATE), struct hfi1_tid_info) + _IOWR(RDMA_IOCTL_MAGIC, HFI1_CMD_TID_UPDATE, struct hfi1_tid_info) #define HFI1_IOCTL_TID_FREE \ - _IOWR(RDMA_IOCTL_MAGIC, __NUM(TID_FREE), struct hfi1_tid_info) + _IOWR(RDMA_IOCTL_MAGIC, HFI1_CMD_TID_FREE, struct hfi1_tid_info) #define HFI1_IOCTL_CREDIT_UPD \ - _IO(RDMA_IOCTL_MAGIC, __NUM(CREDIT_UPD)) + _IO(RDMA_IOCTL_MAGIC, HFI1_CMD_CREDIT_UPD) #define HFI1_IOCTL_RECV_CTRL \ - _IOW(RDMA_IOCTL_MAGIC, __NUM(RECV_CTRL), int) + _IOW(RDMA_IOCTL_MAGIC, HFI1_CMD_RECV_CTRL, int) #define HFI1_IOCTL_POLL_TYPE \ - _IOW(RDMA_IOCTL_MAGIC, __NUM(POLL_TYPE), int) + _IOW(RDMA_IOCTL_MAGIC, HFI1_CMD_POLL_TYPE, int) #define HFI1_IOCTL_ACK_EVENT \ - _IOW(RDMA_IOCTL_MAGIC, __NUM(ACK_EVENT), unsigned long) + _IOW(RDMA_IOCTL_MAGIC, HFI1_CMD_ACK_EVENT, unsigned long) #define HFI1_IOCTL_SET_PKEY \ - _IOW(RDMA_IOCTL_MAGIC, __NUM(SET_PKEY), __u16) + _IOW(RDMA_IOCTL_MAGIC, HFI1_CMD_SET_PKEY, __u16) #define HFI1_IOCTL_CTXT_RESET \ - _IO(RDMA_IOCTL_MAGIC, __NUM(CTXT_RESET)) + _IO(RDMA_IOCTL_MAGIC, HFI1_CMD_CTXT_RESET) #define HFI1_IOCTL_TID_INVAL_READ \ - _IOWR(RDMA_IOCTL_MAGIC, __NUM(TID_INVAL_READ), struct hfi1_tid_info) + _IOWR(RDMA_IOCTL_MAGIC, HFI1_CMD_TID_INVAL_READ, struct hfi1_tid_info) #define HFI1_IOCTL_GET_VERS \ - _IOR(RDMA_IOCTL_MAGIC, __NUM(GET_VERS), int) + _IOR(RDMA_IOCTL_MAGIC, HFI1_CMD_GET_VERS, int) #endif /* RDMA_USER_IOCTL_H */ -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
