Commit 042ce722 authored by David S. Miller's avatar David S. Miller

Merge tag 'shared' of git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma

Mellanox shared code between RDMA and net-next trees

This is Mellanox mlx5_core shared code for both net-next and RDMA
trees for 4.8 kernel cycle.
parents a78c16e1 7486216b
...@@ -123,6 +123,10 @@ enum { ...@@ -123,6 +123,10 @@ enum {
MLX5_CMD_OP_DRAIN_DCT = 0x712, MLX5_CMD_OP_DRAIN_DCT = 0x712,
MLX5_CMD_OP_QUERY_DCT = 0x713, MLX5_CMD_OP_QUERY_DCT = 0x713,
MLX5_CMD_OP_ARM_DCT_FOR_KEY_VIOLATION = 0x714, MLX5_CMD_OP_ARM_DCT_FOR_KEY_VIOLATION = 0x714,
MLX5_CMD_OP_CREATE_XRQ = 0x717,
MLX5_CMD_OP_DESTROY_XRQ = 0x718,
MLX5_CMD_OP_QUERY_XRQ = 0x719,
MLX5_CMD_OP_ARM_XRQ = 0x71a,
MLX5_CMD_OP_QUERY_VPORT_STATE = 0x750, MLX5_CMD_OP_QUERY_VPORT_STATE = 0x750,
MLX5_CMD_OP_MODIFY_VPORT_STATE = 0x751, MLX5_CMD_OP_MODIFY_VPORT_STATE = 0x751,
MLX5_CMD_OP_QUERY_ESW_VPORT_CONTEXT = 0x752, MLX5_CMD_OP_QUERY_ESW_VPORT_CONTEXT = 0x752,
...@@ -139,6 +143,8 @@ enum { ...@@ -139,6 +143,8 @@ enum {
MLX5_CMD_OP_ALLOC_Q_COUNTER = 0x771, MLX5_CMD_OP_ALLOC_Q_COUNTER = 0x771,
MLX5_CMD_OP_DEALLOC_Q_COUNTER = 0x772, MLX5_CMD_OP_DEALLOC_Q_COUNTER = 0x772,
MLX5_CMD_OP_QUERY_Q_COUNTER = 0x773, MLX5_CMD_OP_QUERY_Q_COUNTER = 0x773,
MLX5_CMD_OP_SET_RATE_LIMIT = 0x780,
MLX5_CMD_OP_QUERY_RATE_LIMIT = 0x781,
MLX5_CMD_OP_ALLOC_PD = 0x800, MLX5_CMD_OP_ALLOC_PD = 0x800,
MLX5_CMD_OP_DEALLOC_PD = 0x801, MLX5_CMD_OP_DEALLOC_PD = 0x801,
MLX5_CMD_OP_ALLOC_UAR = 0x802, MLX5_CMD_OP_ALLOC_UAR = 0x802,
...@@ -362,7 +368,8 @@ struct mlx5_ifc_fte_match_set_lyr_2_4_bits { ...@@ -362,7 +368,8 @@ struct mlx5_ifc_fte_match_set_lyr_2_4_bits {
}; };
struct mlx5_ifc_fte_match_set_misc_bits { struct mlx5_ifc_fte_match_set_misc_bits {
u8 reserved_at_0[0x20]; u8 reserved_at_0[0x8];
u8 source_sqn[0x18];
u8 reserved_at_20[0x10]; u8 reserved_at_20[0x10];
u8 source_port[0x10]; u8 source_port[0x10];
...@@ -508,6 +515,17 @@ struct mlx5_ifc_e_switch_cap_bits { ...@@ -508,6 +515,17 @@ struct mlx5_ifc_e_switch_cap_bits {
u8 reserved_at_20[0x7e0]; u8 reserved_at_20[0x7e0];
}; };
struct mlx5_ifc_qos_cap_bits {
u8 packet_pacing[0x1];
u8 reserved_0[0x1f];
u8 reserved_1[0x20];
u8 packet_pacing_max_rate[0x20];
u8 packet_pacing_min_rate[0x20];
u8 reserved_2[0x10];
u8 packet_pacing_rate_table_size[0x10];
u8 reserved_3[0x760];
};
struct mlx5_ifc_per_protocol_networking_offload_caps_bits { struct mlx5_ifc_per_protocol_networking_offload_caps_bits {
u8 csum_cap[0x1]; u8 csum_cap[0x1];
u8 vlan_cap[0x1]; u8 vlan_cap[0x1];
...@@ -747,7 +765,8 @@ struct mlx5_ifc_cmd_hca_cap_bits { ...@@ -747,7 +765,8 @@ struct mlx5_ifc_cmd_hca_cap_bits {
u8 out_of_seq_cnt[0x1]; u8 out_of_seq_cnt[0x1];
u8 vport_counters[0x1]; u8 vport_counters[0x1];
u8 reserved_at_182[0x4]; u8 retransmission_q_counters[0x1];
u8 reserved_at_183[0x3];
u8 max_qp_cnt[0xa]; u8 max_qp_cnt[0xa];
u8 pkey_table_size[0x10]; u8 pkey_table_size[0x10];
...@@ -774,7 +793,9 @@ struct mlx5_ifc_cmd_hca_cap_bits { ...@@ -774,7 +793,9 @@ struct mlx5_ifc_cmd_hca_cap_bits {
u8 log_max_msg[0x5]; u8 log_max_msg[0x5];
u8 reserved_at_1c8[0x4]; u8 reserved_at_1c8[0x4];
u8 max_tc[0x4]; u8 max_tc[0x4];
u8 reserved_at_1d0[0x6]; u8 reserved_at_1d0[0x1];
u8 dcbx[0x1];
u8 reserved_at_1d2[0x4];
u8 rol_s[0x1]; u8 rol_s[0x1];
u8 rol_g[0x1]; u8 rol_g[0x1];
u8 reserved_at_1d8[0x1]; u8 reserved_at_1d8[0x1];
...@@ -806,7 +827,7 @@ struct mlx5_ifc_cmd_hca_cap_bits { ...@@ -806,7 +827,7 @@ struct mlx5_ifc_cmd_hca_cap_bits {
u8 tph[0x1]; u8 tph[0x1];
u8 rf[0x1]; u8 rf[0x1];
u8 dct[0x1]; u8 dct[0x1];
u8 reserved_at_21b[0x1]; u8 qos[0x1];
u8 eth_net_offloads[0x1]; u8 eth_net_offloads[0x1];
u8 roce[0x1]; u8 roce[0x1];
u8 atomic[0x1]; u8 atomic[0x1];
...@@ -932,7 +953,15 @@ struct mlx5_ifc_cmd_hca_cap_bits { ...@@ -932,7 +953,15 @@ struct mlx5_ifc_cmd_hca_cap_bits {
u8 cqe_compression_timeout[0x10]; u8 cqe_compression_timeout[0x10];
u8 cqe_compression_max_num[0x10]; u8 cqe_compression_max_num[0x10];
u8 reserved_at_5e0[0x220]; u8 reserved_at_5e0[0x10];
u8 tag_matching[0x1];
u8 rndv_offload_rc[0x1];
u8 rndv_offload_dc[0x1];
u8 log_tag_matching_list_sz[0x5];
u8 reserved_at_5e8[0x3];
u8 log_max_xrq[0x5];
u8 reserved_at_5f0[0x200];
}; };
enum mlx5_flow_destination_type { enum mlx5_flow_destination_type {
...@@ -1970,7 +1999,7 @@ struct mlx5_ifc_qpc_bits { ...@@ -1970,7 +1999,7 @@ struct mlx5_ifc_qpc_bits {
u8 reserved_at_560[0x5]; u8 reserved_at_560[0x5];
u8 rq_type[0x3]; u8 rq_type[0x3];
u8 srqn_rmpn[0x18]; u8 srqn_rmpn_xrqn[0x18];
u8 reserved_at_580[0x8]; u8 reserved_at_580[0x8];
u8 rmsn[0x18]; u8 rmsn[0x18];
...@@ -2021,6 +2050,7 @@ union mlx5_ifc_hca_cap_union_bits { ...@@ -2021,6 +2050,7 @@ union mlx5_ifc_hca_cap_union_bits {
struct mlx5_ifc_flow_table_eswitch_cap_bits flow_table_eswitch_cap; struct mlx5_ifc_flow_table_eswitch_cap_bits flow_table_eswitch_cap;
struct mlx5_ifc_e_switch_cap_bits e_switch_cap; struct mlx5_ifc_e_switch_cap_bits e_switch_cap;
struct mlx5_ifc_vector_calc_cap_bits vector_calc_cap; struct mlx5_ifc_vector_calc_cap_bits vector_calc_cap;
struct mlx5_ifc_qos_cap_bits qos_cap;
u8 reserved_at_0[0x8000]; u8 reserved_at_0[0x8000];
}; };
...@@ -2247,8 +2277,9 @@ struct mlx5_ifc_sqc_bits { ...@@ -2247,8 +2277,9 @@ struct mlx5_ifc_sqc_bits {
u8 reserved_at_40[0x8]; u8 reserved_at_40[0x8];
u8 cqn[0x18]; u8 cqn[0x18];
u8 reserved_at_60[0xa0]; u8 reserved_at_60[0x90];
u8 packet_pacing_rate_limit_index[0x10];
u8 tis_lst_sz[0x10]; u8 tis_lst_sz[0x10];
u8 reserved_at_110[0x10]; u8 reserved_at_110[0x10];
...@@ -2596,7 +2627,7 @@ struct mlx5_ifc_dctc_bits { ...@@ -2596,7 +2627,7 @@ struct mlx5_ifc_dctc_bits {
u8 reserved_at_98[0x8]; u8 reserved_at_98[0x8];
u8 reserved_at_a0[0x8]; u8 reserved_at_a0[0x8];
u8 srqn[0x18]; u8 srqn_xrqn[0x18];
u8 reserved_at_c0[0x8]; u8 reserved_at_c0[0x8];
u8 pd[0x18]; u8 pd[0x18];
...@@ -2648,6 +2679,7 @@ enum { ...@@ -2648,6 +2679,7 @@ enum {
enum { enum {
MLX5_CQ_PERIOD_MODE_START_FROM_EQE = 0x0, MLX5_CQ_PERIOD_MODE_START_FROM_EQE = 0x0,
MLX5_CQ_PERIOD_MODE_START_FROM_CQE = 0x1, MLX5_CQ_PERIOD_MODE_START_FROM_CQE = 0x1,
MLX5_CQ_PERIOD_NUM_MODES
}; };
struct mlx5_ifc_cqc_bits { struct mlx5_ifc_cqc_bits {
...@@ -2725,6 +2757,54 @@ struct mlx5_ifc_query_adapter_param_block_bits { ...@@ -2725,6 +2757,54 @@ struct mlx5_ifc_query_adapter_param_block_bits {
u8 vsd_contd_psid[16][0x8]; u8 vsd_contd_psid[16][0x8];
}; };
enum {
MLX5_XRQC_STATE_GOOD = 0x0,
MLX5_XRQC_STATE_ERROR = 0x1,
};
enum {
MLX5_XRQC_TOPOLOGY_NO_SPECIAL_TOPOLOGY = 0x0,
MLX5_XRQC_TOPOLOGY_TAG_MATCHING = 0x1,
};
enum {
MLX5_XRQC_OFFLOAD_RNDV = 0x1,
};
struct mlx5_ifc_tag_matching_topology_context_bits {
u8 log_matching_list_sz[0x4];
u8 reserved_at_4[0xc];
u8 append_next_index[0x10];
u8 sw_phase_cnt[0x10];
u8 hw_phase_cnt[0x10];
u8 reserved_at_40[0x40];
};
struct mlx5_ifc_xrqc_bits {
u8 state[0x4];
u8 rlkey[0x1];
u8 reserved_at_5[0xf];
u8 topology[0x4];
u8 reserved_at_18[0x4];
u8 offload[0x4];
u8 reserved_at_20[0x8];
u8 user_index[0x18];
u8 reserved_at_40[0x8];
u8 cqn[0x18];
u8 reserved_at_60[0xa0];
struct mlx5_ifc_tag_matching_topology_context_bits tag_matching_topology_context;
u8 reserved_at_180[0x180];
struct mlx5_ifc_wq_bits wq;
};
union mlx5_ifc_modify_field_select_resize_field_select_auto_bits { union mlx5_ifc_modify_field_select_resize_field_select_auto_bits {
struct mlx5_ifc_modify_field_select_bits modify_field_select; struct mlx5_ifc_modify_field_select_bits modify_field_select;
struct mlx5_ifc_resize_field_select_bits resize_field_select; struct mlx5_ifc_resize_field_select_bits resize_field_select;
...@@ -3147,6 +3227,30 @@ struct mlx5_ifc_rst2init_qp_in_bits { ...@@ -3147,6 +3227,30 @@ struct mlx5_ifc_rst2init_qp_in_bits {
u8 reserved_at_800[0x80]; u8 reserved_at_800[0x80];
}; };
struct mlx5_ifc_query_xrq_out_bits {
u8 status[0x8];
u8 reserved_at_8[0x18];
u8 syndrome[0x20];
u8 reserved_at_40[0x40];
struct mlx5_ifc_xrqc_bits xrq_context;
};
struct mlx5_ifc_query_xrq_in_bits {
u8 opcode[0x10];
u8 reserved_at_10[0x10];
u8 reserved_at_20[0x10];
u8 op_mod[0x10];
u8 reserved_at_40[0x8];
u8 xrqn[0x18];
u8 reserved_at_60[0x20];
};
struct mlx5_ifc_query_xrc_srq_out_bits { struct mlx5_ifc_query_xrc_srq_out_bits {
u8 status[0x8]; u8 status[0x8];
u8 reserved_at_8[0x18]; u8 reserved_at_8[0x18];
...@@ -3550,7 +3654,27 @@ struct mlx5_ifc_query_q_counter_out_bits { ...@@ -3550,7 +3654,27 @@ struct mlx5_ifc_query_q_counter_out_bits {
u8 out_of_sequence[0x20]; u8 out_of_sequence[0x20];
u8 reserved_at_1e0[0x620]; u8 reserved_at_1e0[0x20];
u8 duplicate_request[0x20];
u8 reserved_at_220[0x20];
u8 rnr_nak_retry_err[0x20];
u8 reserved_at_260[0x20];
u8 packet_seq_err[0x20];
u8 reserved_at_2a0[0x20];
u8 implied_nak_seq_err[0x20];
u8 reserved_at_2e0[0x20];
u8 local_ack_timeout_err[0x20];
u8 reserved_at_320[0x4e0];
}; };
struct mlx5_ifc_query_q_counter_in_bits { struct mlx5_ifc_query_q_counter_in_bits {
...@@ -5004,6 +5128,28 @@ struct mlx5_ifc_detach_from_mcg_in_bits { ...@@ -5004,6 +5128,28 @@ struct mlx5_ifc_detach_from_mcg_in_bits {
u8 multicast_gid[16][0x8]; u8 multicast_gid[16][0x8];
}; };
struct mlx5_ifc_destroy_xrq_out_bits {
u8 status[0x8];
u8 reserved_at_8[0x18];
u8 syndrome[0x20];
u8 reserved_at_40[0x40];
};
struct mlx5_ifc_destroy_xrq_in_bits {
u8 opcode[0x10];
u8 reserved_at_10[0x10];
u8 reserved_at_20[0x10];
u8 op_mod[0x10];
u8 reserved_at_40[0x8];
u8 xrqn[0x18];
u8 reserved_at_60[0x20];
};
struct mlx5_ifc_destroy_xrc_srq_out_bits { struct mlx5_ifc_destroy_xrc_srq_out_bits {
u8 status[0x8]; u8 status[0x8];
u8 reserved_at_8[0x18]; u8 reserved_at_8[0x18];
...@@ -5589,6 +5735,30 @@ struct mlx5_ifc_dealloc_flow_counter_in_bits { ...@@ -5589,6 +5735,30 @@ struct mlx5_ifc_dealloc_flow_counter_in_bits {
u8 reserved_at_60[0x20]; u8 reserved_at_60[0x20];
}; };
struct mlx5_ifc_create_xrq_out_bits {
u8 status[0x8];
u8 reserved_at_8[0x18];
u8 syndrome[0x20];
u8 reserved_at_40[0x8];
u8 xrqn[0x18];
u8 reserved_at_60[0x20];
};
struct mlx5_ifc_create_xrq_in_bits {
u8 opcode[0x10];
u8 reserved_at_10[0x10];
u8 reserved_at_20[0x10];
u8 op_mod[0x10];
u8 reserved_at_40[0x40];
struct mlx5_ifc_xrqc_bits xrq_context;
};
struct mlx5_ifc_create_xrc_srq_out_bits { struct mlx5_ifc_create_xrc_srq_out_bits {
u8 status[0x8]; u8 status[0x8];
u8 reserved_at_8[0x18]; u8 reserved_at_8[0x18];
...@@ -6130,6 +6300,29 @@ struct mlx5_ifc_attach_to_mcg_in_bits { ...@@ -6130,6 +6300,29 @@ struct mlx5_ifc_attach_to_mcg_in_bits {
u8 multicast_gid[16][0x8]; u8 multicast_gid[16][0x8];
}; };
struct mlx5_ifc_arm_xrq_out_bits {
u8 status[0x8];
u8 reserved_at_8[0x18];
u8 syndrome[0x20];
u8 reserved_at_40[0x40];
};
struct mlx5_ifc_arm_xrq_in_bits {
u8 opcode[0x10];
u8 reserved_at_10[0x10];
u8 reserved_at_20[0x10];
u8 op_mod[0x10];
u8 reserved_at_40[0x8];
u8 xrqn[0x18];
u8 reserved_at_60[0x10];
u8 lwm[0x10];
};
struct mlx5_ifc_arm_xrc_srq_out_bits { struct mlx5_ifc_arm_xrc_srq_out_bits {
u8 status[0x8]; u8 status[0x8];
u8 reserved_at_8[0x18]; u8 reserved_at_8[0x18];
...@@ -6167,7 +6360,8 @@ struct mlx5_ifc_arm_rq_out_bits { ...@@ -6167,7 +6360,8 @@ struct mlx5_ifc_arm_rq_out_bits {
}; };
enum { enum {
MLX5_ARM_RQ_IN_OP_MOD_SRQ_ = 0x1, MLX5_ARM_RQ_IN_OP_MOD_SRQ = 0x1,
MLX5_ARM_RQ_IN_OP_MOD_XRQ = 0x2,
}; };
struct mlx5_ifc_arm_rq_in_bits { struct mlx5_ifc_arm_rq_in_bits {
...@@ -6360,6 +6554,30 @@ struct mlx5_ifc_add_vxlan_udp_dport_in_bits { ...@@ -6360,6 +6554,30 @@ struct mlx5_ifc_add_vxlan_udp_dport_in_bits {
u8 vxlan_udp_port[0x10]; u8 vxlan_udp_port[0x10];
}; };
struct mlx5_ifc_set_rate_limit_out_bits {
u8 status[0x8];
u8 reserved_at_8[0x18];
u8 syndrome[0x20];
u8 reserved_at_40[0x40];
};
struct mlx5_ifc_set_rate_limit_in_bits {
u8 opcode[0x10];
u8 reserved_at_10[0x10];
u8 reserved_at_20[0x10];
u8 op_mod[0x10];
u8 reserved_at_40[0x10];
u8 rate_limit_index[0x10];
u8 reserved_at_60[0x20];
u8 rate_limit[0x20];
};
struct mlx5_ifc_access_register_out_bits { struct mlx5_ifc_access_register_out_bits {
u8 status[0x8]; u8 status[0x8];
u8 reserved_at_8[0x18]; u8 reserved_at_8[0x18];
...@@ -6484,12 +6702,15 @@ struct mlx5_ifc_pude_reg_bits { ...@@ -6484,12 +6702,15 @@ struct mlx5_ifc_pude_reg_bits {
}; };
struct mlx5_ifc_ptys_reg_bits { struct mlx5_ifc_ptys_reg_bits {
u8 reserved_at_0[0x8]; u8 an_disable_cap[0x1];
u8 an_disable_admin[0x1];
u8 reserved_at_2[0x6];
u8 local_port[0x8]; u8 local_port[0x8];
u8 reserved_at_10[0xd]; u8 reserved_at_10[0xd];
u8 proto_mask[0x3]; u8 proto_mask[0x3];
u8 reserved_at_20[0x40]; u8 an_status[0x4];
u8 reserved_at_24[0x3c];
u8 eth_proto_capability[0x20]; u8 eth_proto_capability[0x20];
...@@ -7450,4 +7671,34 @@ struct mlx5_ifc_mcia_reg_bits { ...@@ -7450,4 +7671,34 @@ struct mlx5_ifc_mcia_reg_bits {
u8 dword_11[0x20]; u8 dword_11[0x20];
}; };
struct mlx5_ifc_dcbx_param_bits {
u8 dcbx_cee_cap[0x1];
u8 dcbx_ieee_cap[0x1];
u8 dcbx_standby_cap[0x1];
u8 reserved_at_0[0x5];
u8 port_number[0x8];
u8 reserved_at_10[0xa];
u8 max_application_table_size[6];
u8 reserved_at_20[0x15];
u8 version_oper[0x3];
u8 reserved_at_38[5];
u8 version_admin[0x3];
u8 willing_admin[0x1];
u8 reserved_at_41[0x3];
u8 pfc_cap_oper[0x4];
u8 reserved_at_48[0x4];
u8 pfc_cap_admin[0x4];
u8 reserved_at_50[0x4];
u8 num_of_tc_oper[0x4];
u8 reserved_at_58[0x4];
u8 num_of_tc_admin[0x4];
u8 remote_willing[0x1];
u8 reserved_at_61[3];
u8 remote_pfc_cap[4];
u8 reserved_at_68[0x14];
u8 remote_num_of_tc[0x4];
u8 reserved_at_80[0x18];
u8 error[0x8];
u8 reserved_at_a0[0x160];
};
#endif /* MLX5_IFC_H */ #endif /* MLX5_IFC_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment