diff options
Diffstat (limited to 'include/arch/x86_64/rdma')
| -rw-r--r-- | include/arch/x86_64/rdma/hfi/hfi1_ioctl.h | 16 | ||||
| -rw-r--r-- | include/arch/x86_64/rdma/hfi/hfi1_user.h | 6 | ||||
| -rw-r--r-- | include/arch/x86_64/rdma/ib_user_ioctl_cmds.h | 3 | ||||
| -rw-r--r-- | include/arch/x86_64/rdma/ib_user_ioctl_verbs.h | 5 | ||||
| -rw-r--r-- | include/arch/x86_64/rdma/mlx4-abi.h | 4 | ||||
| -rw-r--r-- | include/arch/x86_64/rdma/mlx5-abi.h | 18 | ||||
| -rw-r--r-- | include/arch/x86_64/rdma/mlx5_user_ioctl_cmds.h | 15 | ||||
| -rw-r--r-- | include/arch/x86_64/rdma/rdma_netlink.h | 30 | ||||
| -rw-r--r-- | include/arch/x86_64/rdma/rdma_user_cm.h | 6 | ||||
| -rw-r--r-- | include/arch/x86_64/rdma/rdma_user_ioctl.h | 15 | ||||
| -rw-r--r-- | include/arch/x86_64/rdma/siw-abi.h | 3 |
11 files changed, 40 insertions, 81 deletions
diff --git a/include/arch/x86_64/rdma/hfi/hfi1_ioctl.h b/include/arch/x86_64/rdma/hfi/hfi1_ioctl.h index 2a60a3f8..66423b1d 100644 --- a/include/arch/x86_64/rdma/hfi/hfi1_ioctl.h +++ b/include/arch/x86_64/rdma/hfi/hfi1_ioctl.h @@ -87,14 +87,14 @@ struct hfi1_ctxt_info { __u16 ctxt; /* ctxt on unit assigned to caller */ __u16 subctxt; /* subctxt on unit assigned to caller */ __u16 rcvtids; /* number of Rcv TIDs for this context */ - __u16 credits; /* number of PIO credits for this context */ - __u16 numa_node; /* NUMA node of the assigned device */ - __u16 rec_cpu; /* cpu # for affinity (0xffff if none) */ - __u16 send_ctxt; /* send context in use by this user context */ - __u16 egrtids; /* number of RcvArray entries for Eager Rcvs */ - __u16 rcvhdrq_cnt; /* number of RcvHdrQ entries */ - __u16 rcvhdrq_entsize; /* size (in bytes) for each RcvHdrQ entry */ - __u16 sdma_ring_size; /* number of entries in SDMA request ring */ + __u16 credits; /* number of PIO credits for this context */ + __u16 numa_node; /* NUMA node of the assigned device */ + __u16 rec_cpu; /* cpu # for affinity (0xffff if none) */ + __u16 send_ctxt; /* send context in use by this user context */ + __u16 egrtids; /* number of RcvArray entries for Eager Rcvs */ + __u16 rcvhdrq_cnt; /* number of RcvHdrQ entries */ + __u16 rcvhdrq_entsize; /* size (in bytes) for each RcvHdrQ entry */ + __u16 sdma_ring_size; /* number of entries in SDMA request ring */ }; struct hfi1_tid_info { diff --git a/include/arch/x86_64/rdma/hfi/hfi1_user.h b/include/arch/x86_64/rdma/hfi/hfi1_user.h index 31e9eb3c..7cf7e526 100644 --- a/include/arch/x86_64/rdma/hfi/hfi1_user.h +++ b/include/arch/x86_64/rdma/hfi/hfi1_user.h @@ -108,9 +108,9 @@ */ #define HFI1_CAP_NO_INTEGRITY (1UL << 13) /* Enable ctxt integrity checks */ #define HFI1_CAP_PKEY_CHECK (1UL << 14) /* Enable ctxt PKey checking */ -#define HFI1_CAP_STATIC_RATE_CTRL \ - (1UL << 15) /* Allow PBC.StaticRateControl \ - */ +#define HFI1_CAP_STATIC_RATE_CTRL \ + (1UL << 15) /* Allow PBC.StaticRateControl \ + */ #define HFI1_CAP_OPFN (1UL << 16) /* Enable the OPFN protocol */ #define HFI1_CAP_SDMA_HEAD_CHECK (1UL << 17) /* SDMA head checking */ #define HFI1_CAP_EARLY_CREDIT_RETURN (1UL << 18) /* early credit return */ diff --git a/include/arch/x86_64/rdma/ib_user_ioctl_cmds.h b/include/arch/x86_64/rdma/ib_user_ioctl_cmds.h index 1cc9b6b5..7f40ce47 100644 --- a/include/arch/x86_64/rdma/ib_user_ioctl_cmds.h +++ b/include/arch/x86_64/rdma/ib_user_ioctl_cmds.h @@ -127,8 +127,7 @@ enum uverbs_attrs_create_flow_action_esp { }; enum uverbs_attrs_modify_flow_action_esp { - UVERBS_ATTR_MODIFY_FLOW_ACTION_ESP_HANDLE = - UVERBS_ATTR_CREATE_FLOW_ACTION_ESP_HANDLE, + UVERBS_ATTR_MODIFY_FLOW_ACTION_ESP_HANDLE = UVERBS_ATTR_CREATE_FLOW_ACTION_ESP_HANDLE, }; enum uverbs_attrs_destroy_flow_action_esp { diff --git a/include/arch/x86_64/rdma/ib_user_ioctl_verbs.h b/include/arch/x86_64/rdma/ib_user_ioctl_verbs.h index f67eec9d..f2e2c5d0 100644 --- a/include/arch/x86_64/rdma/ib_user_ioctl_verbs.h +++ b/include/arch/x86_64/rdma/ib_user_ioctl_verbs.h @@ -62,9 +62,8 @@ enum ib_uverbs_access_flags { IB_UVERBS_ACCESS_FLUSH_PERSISTENT = 1 << 9, IB_UVERBS_ACCESS_RELAXED_ORDERING = IB_UVERBS_ACCESS_OPTIONAL_FIRST, - IB_UVERBS_ACCESS_OPTIONAL_RANGE = - ((IB_UVERBS_ACCESS_OPTIONAL_LAST << 1) - 1) & - ~(IB_UVERBS_ACCESS_OPTIONAL_FIRST - 1) + IB_UVERBS_ACCESS_OPTIONAL_RANGE = ((IB_UVERBS_ACCESS_OPTIONAL_LAST << 1) - 1) & + ~(IB_UVERBS_ACCESS_OPTIONAL_FIRST - 1) }; enum ib_uverbs_srq_type { diff --git a/include/arch/x86_64/rdma/mlx4-abi.h b/include/arch/x86_64/rdma/mlx4-abi.h index 75627f40..8004c7ce 100644 --- a/include/arch/x86_64/rdma/mlx4-abi.h +++ b/include/arch/x86_64/rdma/mlx4-abi.h @@ -104,7 +104,7 @@ struct mlx4_ib_create_srq_resp { struct mlx4_ib_create_qp_rss { __aligned_u64 rx_hash_fields_mask; /* Use enum mlx4_ib_rx_hash_fields */ - __u8 rx_hash_function; /* Use enum mlx4_ib_rx_hash_function_flags */ + __u8 rx_hash_function; /* Use enum mlx4_ib_rx_hash_function_flags */ __u8 reserved[7]; __u8 rx_hash_key[40]; __u32 comp_mask; @@ -164,7 +164,7 @@ enum mlx4_ib_rx_hash_fields { struct mlx4_ib_rss_caps { __aligned_u64 rx_hash_fields_mask; /* enum mlx4_ib_rx_hash_fields */ - __u8 rx_hash_function; /* enum mlx4_ib_rx_hash_function_flags */ + __u8 rx_hash_function; /* enum mlx4_ib_rx_hash_function_flags */ __u8 reserved[7]; }; diff --git a/include/arch/x86_64/rdma/mlx5-abi.h b/include/arch/x86_64/rdma/mlx5-abi.h index f85708de..846c1eef 100644 --- a/include/arch/x86_64/rdma/mlx5-abi.h +++ b/include/arch/x86_64/rdma/mlx5-abi.h @@ -127,14 +127,10 @@ enum mlx5_user_inline_mode { enum { MLX5_USER_ALLOC_UCONTEXT_FLOW_ACTION_FLAGS_ESP_AES_GCM = 1 << 0, - MLX5_USER_ALLOC_UCONTEXT_FLOW_ACTION_FLAGS_ESP_AES_GCM_REQ_METADATA = - 1 << 1, - MLX5_USER_ALLOC_UCONTEXT_FLOW_ACTION_FLAGS_ESP_AES_GCM_SPI_STEERING = - 1 << 2, - MLX5_USER_ALLOC_UCONTEXT_FLOW_ACTION_FLAGS_ESP_AES_GCM_FULL_OFFLOAD = - 1 << 3, - MLX5_USER_ALLOC_UCONTEXT_FLOW_ACTION_FLAGS_ESP_AES_GCM_TX_IV_IS_ESN = - 1 << 4, + MLX5_USER_ALLOC_UCONTEXT_FLOW_ACTION_FLAGS_ESP_AES_GCM_REQ_METADATA = 1 << 1, + MLX5_USER_ALLOC_UCONTEXT_FLOW_ACTION_FLAGS_ESP_AES_GCM_SPI_STEERING = 1 << 2, + MLX5_USER_ALLOC_UCONTEXT_FLOW_ACTION_FLAGS_ESP_AES_GCM_FULL_OFFLOAD = 1 << 3, + MLX5_USER_ALLOC_UCONTEXT_FLOW_ACTION_FLAGS_ESP_AES_GCM_TX_IV_IS_ESN = 1 << 4, }; struct mlx5_ib_alloc_ucontext_resp { @@ -178,7 +174,7 @@ struct mlx5_ib_tso_caps { struct mlx5_ib_rss_caps { __aligned_u64 rx_hash_fields_mask; /* enum mlx5_rx_hash_fields */ - __u8 rx_hash_function; /* enum mlx5_rx_hash_function_flags */ + __u8 rx_hash_function; /* enum mlx5_rx_hash_function_flags */ __u8 reserved[7]; }; @@ -381,8 +377,8 @@ enum mlx5_rx_hash_fields { struct mlx5_ib_create_qp_rss { __aligned_u64 rx_hash_fields_mask; /* enum mlx5_rx_hash_fields */ - __u8 rx_hash_function; /* enum mlx5_rx_hash_function_flags */ - __u8 rx_key_len; /* valid only for Toeplitz */ + __u8 rx_hash_function; /* enum mlx5_rx_hash_function_flags */ + __u8 rx_key_len; /* valid only for Toeplitz */ __u8 reserved[6]; __u8 rx_hash_key[128]; /* valid only for Toeplitz */ __u32 comp_mask; diff --git a/include/arch/x86_64/rdma/mlx5_user_ioctl_cmds.h b/include/arch/x86_64/rdma/mlx5_user_ioctl_cmds.h index 333bd0e1..fa9fecc2 100644 --- a/include/arch/x86_64/rdma/mlx5_user_ioctl_cmds.h +++ b/include/arch/x86_64/rdma/mlx5_user_ioctl_cmds.h @@ -114,8 +114,7 @@ enum mlx5_ib_devx_obj_query_async_attrs { }; enum mlx5_ib_devx_subscribe_event_attrs { - MLX5_IB_ATTR_DEVX_SUBSCRIBE_EVENT_FD_HANDLE = - (1U << UVERBS_ID_NS_SHIFT), + MLX5_IB_ATTR_DEVX_SUBSCRIBE_EVENT_FD_HANDLE = (1U << UVERBS_ID_NS_SHIFT), MLX5_IB_ATTR_DEVX_SUBSCRIBE_EVENT_OBJ_HANDLE, MLX5_IB_ATTR_DEVX_SUBSCRIBE_EVENT_TYPE_NUM_LIST, MLX5_IB_ATTR_DEVX_SUBSCRIBE_EVENT_FD_NUM, @@ -204,13 +203,11 @@ enum mlx5_ib_devx_umem_methods { }; enum mlx5_ib_devx_async_cmd_fd_alloc_attrs { - MLX5_IB_ATTR_DEVX_ASYNC_CMD_FD_ALLOC_HANDLE = - (1U << UVERBS_ID_NS_SHIFT), + MLX5_IB_ATTR_DEVX_ASYNC_CMD_FD_ALLOC_HANDLE = (1U << UVERBS_ID_NS_SHIFT), }; enum mlx5_ib_devx_async_event_fd_alloc_attrs { - MLX5_IB_ATTR_DEVX_ASYNC_EVENT_FD_ALLOC_HANDLE = - (1U << UVERBS_ID_NS_SHIFT), + MLX5_IB_ATTR_DEVX_ASYNC_EVENT_FD_ALLOC_HANDLE = (1U << UVERBS_ID_NS_SHIFT), MLX5_IB_ATTR_DEVX_ASYNC_EVENT_FD_ALLOC_FLAGS, }; @@ -262,8 +259,7 @@ enum mlx5_ib_flow_steering_anchor_create_attrs { }; enum mlx5_ib_flow_steering_anchor_destroy_attrs { - MLX5_IB_ATTR_STEERING_ANCHOR_DESTROY_HANDLE = - (1U << UVERBS_ID_NS_SHIFT), + MLX5_IB_ATTR_STEERING_ANCHOR_DESTROY_HANDLE = (1U << UVERBS_ID_NS_SHIFT), }; enum mlx5_ib_steering_anchor_methods { @@ -324,8 +320,7 @@ enum mlx5_ib_flow_methods { }; enum mlx5_ib_flow_action_methods { - MLX5_IB_METHOD_FLOW_ACTION_CREATE_MODIFY_HEADER = - (1U << UVERBS_ID_NS_SHIFT), + MLX5_IB_METHOD_FLOW_ACTION_CREATE_MODIFY_HEADER = (1U << UVERBS_ID_NS_SHIFT), MLX5_IB_METHOD_FLOW_ACTION_CREATE_PACKET_REFORMAT, }; diff --git a/include/arch/x86_64/rdma/rdma_netlink.h b/include/arch/x86_64/rdma/rdma_netlink.h index a11920e2..bc53767a 100644 --- a/include/arch/x86_64/rdma/rdma_netlink.h +++ b/include/arch/x86_64/rdma/rdma_netlink.h @@ -12,12 +12,7 @@ enum { RDMA_NL_NUM_CLIENTS }; -enum { - RDMA_NL_GROUP_IWPM = 2, - RDMA_NL_GROUP_LS, - RDMA_NL_GROUP_NOTIFY, - RDMA_NL_NUM_GROUPS -}; +enum { RDMA_NL_GROUP_IWPM = 2, RDMA_NL_GROUP_LS, RDMA_NL_GROUP_NOTIFY, RDMA_NL_NUM_GROUPS }; #define RDMA_NL_GET_CLIENT(type) ((type & (((1 << 6) - 1) << 10)) >> 10) #define RDMA_NL_GET_OP(type) (type & ((1 << 10) - 1)) @@ -135,18 +130,9 @@ enum { IWPM_NLA_MAPINFO_NUM_MAX }; -enum { - IWPM_NLA_ERR_UNSPEC = 0, - IWPM_NLA_ERR_SEQ, - IWPM_NLA_ERR_CODE, - IWPM_NLA_ERR_MAX -}; +enum { IWPM_NLA_ERR_UNSPEC = 0, IWPM_NLA_ERR_SEQ, IWPM_NLA_ERR_CODE, IWPM_NLA_ERR_MAX }; -enum { - IWPM_NLA_HELLO_UNSPEC = 0, - IWPM_NLA_HELLO_ABI_VERSION, - IWPM_NLA_HELLO_MAX -}; +enum { IWPM_NLA_HELLO_UNSPEC = 0, IWPM_NLA_HELLO_ABI_VERSION, IWPM_NLA_HELLO_MAX }; /* For RDMA_NLDEV_ATTR_DEV_NODE_TYPE */ enum { @@ -166,12 +152,7 @@ enum { * SET_TIMEOUT - The local service requests the client to set the timeout. * IP_RESOLVE - The client requests the local service to resolve an IP to GID. */ -enum { - RDMA_NL_LS_OP_RESOLVE = 0, - RDMA_NL_LS_OP_SET_TIMEOUT, - RDMA_NL_LS_OP_IP_RESOLVE, - RDMA_NL_LS_NUM_OPS -}; +enum { RDMA_NL_LS_OP_RESOLVE = 0, RDMA_NL_LS_OP_SET_TIMEOUT, RDMA_NL_LS_OP_IP_RESOLVE, RDMA_NL_LS_NUM_OPS }; /* Local service netlink message flags */ #define RDMA_NL_LS_F_ERR 0x0100 /* Failed response */ @@ -213,8 +194,7 @@ struct rdma_ls_ip_resolve_header { /* Local service attribute type */ #define RDMA_NLA_F_MANDATORY (1 << 13) -#define RDMA_NLA_TYPE_MASK \ - (~(NLA_F_NESTED | NLA_F_NET_BYTEORDER | RDMA_NLA_F_MANDATORY)) +#define RDMA_NLA_TYPE_MASK (~(NLA_F_NESTED | NLA_F_NET_BYTEORDER | RDMA_NLA_F_MANDATORY)) /* * Local service attributes: diff --git a/include/arch/x86_64/rdma/rdma_user_cm.h b/include/arch/x86_64/rdma/rdma_user_cm.h index 9ca67d9d..fce14f3f 100644 --- a/include/arch/x86_64/rdma/rdma_user_cm.h +++ b/include/arch/x86_64/rdma/rdma_user_cm.h @@ -145,11 +145,7 @@ struct rdma_ucm_resolve_route { __u32 timeout_ms; }; -enum { - RDMA_USER_CM_QUERY_ADDR, - RDMA_USER_CM_QUERY_PATH, - RDMA_USER_CM_QUERY_GID -}; +enum { RDMA_USER_CM_QUERY_ADDR, RDMA_USER_CM_QUERY_PATH, RDMA_USER_CM_QUERY_GID }; struct rdma_ucm_query { __aligned_u64 response; diff --git a/include/arch/x86_64/rdma/rdma_user_ioctl.h b/include/arch/x86_64/rdma/rdma_user_ioctl.h index 27b08ecf..4953659f 100644 --- a/include/arch/x86_64/rdma/rdma_user_ioctl.h +++ b/include/arch/x86_64/rdma/rdma_user_ioctl.h @@ -50,24 +50,20 @@ */ /* MAD specific section */ -#define IB_USER_MAD_REGISTER_AGENT \ - _IOWR(RDMA_IOCTL_MAGIC, 0x01, struct ib_user_mad_reg_req) +#define IB_USER_MAD_REGISTER_AGENT _IOWR(RDMA_IOCTL_MAGIC, 0x01, struct ib_user_mad_reg_req) #define IB_USER_MAD_UNREGISTER_AGENT _IOW(RDMA_IOCTL_MAGIC, 0x02, __u32) #define IB_USER_MAD_ENABLE_PKEY _IO(RDMA_IOCTL_MAGIC, 0x03) -#define IB_USER_MAD_REGISTER_AGENT2 \ - _IOWR(RDMA_IOCTL_MAGIC, 0x04, struct ib_user_mad_reg_req2) +#define IB_USER_MAD_REGISTER_AGENT2 _IOWR(RDMA_IOCTL_MAGIC, 0x04, struct ib_user_mad_reg_req2) /* HFI specific section */ /* allocate HFI and context */ -#define HFI1_IOCTL_ASSIGN_CTXT \ - _IOWR(RDMA_IOCTL_MAGIC, 0xE1, struct hfi1_user_info) +#define HFI1_IOCTL_ASSIGN_CTXT _IOWR(RDMA_IOCTL_MAGIC, 0xE1, struct hfi1_user_info) /* find out what resources we got */ #define HFI1_IOCTL_CTXT_INFO _IOW(RDMA_IOCTL_MAGIC, 0xE2, struct hfi1_ctxt_info) /* set up userspace */ #define HFI1_IOCTL_USER_INFO _IOW(RDMA_IOCTL_MAGIC, 0xE3, struct hfi1_base_info) /* update expected TID entries */ -#define HFI1_IOCTL_TID_UPDATE \ - _IOWR(RDMA_IOCTL_MAGIC, 0xE4, struct hfi1_tid_info) +#define HFI1_IOCTL_TID_UPDATE _IOWR(RDMA_IOCTL_MAGIC, 0xE4, struct hfi1_tid_info) /* free expected TID entries */ #define HFI1_IOCTL_TID_FREE _IOWR(RDMA_IOCTL_MAGIC, 0xE5, struct hfi1_tid_info) /* force an update of PIO credit */ @@ -83,8 +79,7 @@ /* reset context's HW send context */ #define HFI1_IOCTL_CTXT_RESET _IO(RDMA_IOCTL_MAGIC, 0xEC) /* read TID cache invalidations */ -#define HFI1_IOCTL_TID_INVAL_READ \ - _IOWR(RDMA_IOCTL_MAGIC, 0xED, struct hfi1_tid_info) +#define HFI1_IOCTL_TID_INVAL_READ _IOWR(RDMA_IOCTL_MAGIC, 0xED, struct hfi1_tid_info) /* get the version of the user cdev */ #define HFI1_IOCTL_GET_VERS _IOR(RDMA_IOCTL_MAGIC, 0xEE, int) diff --git a/include/arch/x86_64/rdma/siw-abi.h b/include/arch/x86_64/rdma/siw-abi.h index 2ae8ca8b..96f57393 100644 --- a/include/arch/x86_64/rdma/siw-abi.h +++ b/include/arch/x86_64/rdma/siw-abi.h @@ -140,8 +140,7 @@ enum siw_notify_flags { SIW_NOTIFY_SOLICITED = (1 << 0), SIW_NOTIFY_NEXT_COMPLETION = (1 << 1), SIW_NOTIFY_MISSED_EVENTS = (1 << 2), - SIW_NOTIFY_ALL = SIW_NOTIFY_SOLICITED | SIW_NOTIFY_NEXT_COMPLETION | - SIW_NOTIFY_MISSED_EVENTS + SIW_NOTIFY_ALL = SIW_NOTIFY_SOLICITED | SIW_NOTIFY_NEXT_COMPLETION | SIW_NOTIFY_MISSED_EVENTS }; enum siw_wc_status { |
