1 files changed, 59 insertions, 14 deletions

diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index 1391a82da98e..f4e417686f62 100644
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -502,7 +502,7 @@ struct mlx5_ifc_ads_bits {
         u8         dei_cfi[0x1];
         u8         eth_prio[0x3];
         u8         sl[0x4];
-        u8         port[0x8];
+        u8         vhca_port_num[0x8];
         u8         rmac_47_32[0x10];
 
         u8         rmac_31_0[0x20];
@@ -794,7 +794,10 @@ enum {
 };
 
 struct mlx5_ifc_cmd_hca_cap_bits {
-        u8         reserved_at_0[0x80];
+        u8         reserved_at_0[0x30];
+        u8         vhca_id[0x10];
+
+        u8         reserved_at_40[0x40];
 
         u8         log_max_srq_sz[0x8];
         u8         log_max_qp_sz[0x8];
@@ -1023,13 +1026,21 @@ struct mlx5_ifc_cmd_hca_cap_bits {
         u8         reserved_at_3b8[0x3];
         u8         log_min_stride_sz_sq[0x5];
 
-        u8         reserved_at_3c0[0x1b];
+        u8         hairpin[0x1];
+        u8         reserved_at_3c1[0x2];
+        u8         log_max_hairpin_queues[0x5];
+        u8         reserved_at_3c8[0x3];
+        u8         log_max_hairpin_wq_data_sz[0x5];
+        u8         reserved_at_3d0[0x3];
+        u8         log_max_hairpin_num_packets[0x5];
+        u8         reserved_at_3d8[0x3];
         u8         log_max_wq_sz[0x5];
 
         u8         nic_vport_change_event[0x1];
         u8         disable_local_lb_uc[0x1];
         u8         disable_local_lb_mc[0x1];
-        u8         reserved_at_3e3[0x8];
+        u8         log_min_hairpin_wq_data_sz[0x5];
+        u8         reserved_at_3e8[0x3];
         u8         log_max_vlan_list[0x5];
         u8         reserved_at_3f0[0x3];
         u8         log_max_current_mc_list[0x5];
@@ -1067,7 +1078,12 @@ struct mlx5_ifc_cmd_hca_cap_bits {
         u8         reserved_at_5f8[0x3];
         u8         log_max_xrq[0x5];
 
-        u8         reserved_at_600[0x200];
+        u8         affiliate_nic_vport_criteria[0x8];
+        u8         native_port_num[0x8];
+        u8         num_vhca_ports[0x8];
+        u8         reserved_at_618[0x6];
+        u8         sw_owner_id[0x1];
+        u8         reserved_at_61f[0x1e1];
 };
 
 enum mlx5_flow_destination_type {
@@ -1163,7 +1179,12 @@ struct mlx5_ifc_wq_bits {
         u8         reserved_at_118[0x3];
         u8         log_wq_sz[0x5];
 
-        u8         reserved_at_120[0x15];
+        u8         reserved_at_120[0x3];
+        u8         log_hairpin_num_packets[0x5];
+        u8         reserved_at_128[0x3];
+        u8         log_hairpin_data_sz[0x5];
+        u8         reserved_at_130[0x5];
+
         u8         log_wqe_num_of_strides[0x3];
         u8         two_byte_shift_en[0x1];
         u8         reserved_at_139[0x4];
@@ -2483,7 +2504,8 @@ struct mlx5_ifc_sqc_bits {
         u8         state[0x4];
         u8         reg_umr[0x1];
         u8         allow_swp[0x1];
-        u8         reserved_at_e[0x12];
+        u8         hairpin[0x1];
+        u8         reserved_at_f[0x11];
 
         u8         reserved_at_20[0x8];
         u8         user_index[0x18];
@@ -2491,7 +2513,13 @@ struct mlx5_ifc_sqc_bits {
         u8         reserved_at_40[0x8];
         u8         cqn[0x18];
 
-        u8         reserved_at_60[0x90];
+        u8         reserved_at_60[0x8];
+        u8         hairpin_peer_rq[0x18];
+
+        u8         reserved_at_80[0x10];
+        u8         hairpin_peer_vhca[0x10];
+
+        u8         reserved_at_a0[0x50];
 
         u8         packet_pacing_rate_limit_index[0x10];
         u8         tis_lst_sz[0x10];
@@ -2563,7 +2591,8 @@ struct mlx5_ifc_rqc_bits {
         u8         state[0x4];
         u8         reserved_at_c[0x1];
         u8         flush_in_error_en[0x1];
-        u8         reserved_at_e[0x12];
+        u8         hairpin[0x1];
+        u8         reserved_at_f[0x11];
 
         u8         reserved_at_20[0x8];
         u8         user_index[0x18];
@@ -2577,7 +2606,13 @@ struct mlx5_ifc_rqc_bits {
         u8         reserved_at_80[0x8];
         u8         rmpn[0x18];
 
-        u8         reserved_at_a0[0xe0];
+        u8         reserved_at_a0[0x8];
+        u8         hairpin_peer_sq[0x18];
+
+        u8         reserved_at_c0[0x10];
+        u8         hairpin_peer_vhca[0x10];
+
+        u8         reserved_at_e0[0xa0];
 
         struct mlx5_ifc_wq_bits wq;
 };
@@ -2616,7 +2651,12 @@ struct mlx5_ifc_nic_vport_context_bits {
         u8         event_on_mc_address_change[0x1];
         u8         event_on_uc_address_change[0x1];
 
-        u8         reserved_at_40[0xf0];
+        u8         reserved_at_40[0xc];
+
+        u8         affiliation_criteria[0x4];
+        u8         affiliated_vhca_id[0x10];
+
+        u8         reserved_at_60[0xd0];
 
         u8         mtu[0x10];
 
@@ -3259,7 +3299,8 @@ struct mlx5_ifc_set_roce_address_in_bits {
         u8         op_mod[0x10];
 
         u8         roce_address_index[0x10];
-        u8         reserved_at_50[0x10];
+        u8         reserved_at_50[0xc];
+        u8         vhca_port_num[0x4];
 
         u8         reserved_at_60[0x20];
 
@@ -3879,7 +3920,8 @@ struct mlx5_ifc_query_roce_address_in_bits {
         u8         op_mod[0x10];
 
         u8         roce_address_index[0x10];
-        u8         reserved_at_50[0x10];
+        u8         reserved_at_50[0xc];
+        u8         vhca_port_num[0x4];
 
         u8         reserved_at_60[0x20];
 };
@@ -5311,7 +5353,9 @@ struct mlx5_ifc_modify_nic_vport_context_out_bits {
 };
 
 struct mlx5_ifc_modify_nic_vport_field_select_bits {
-        u8         reserved_at_0[0x14];
+        u8         reserved_at_0[0x12];
+        u8         affiliation[0x1];
+        u8         reserved_at_e[0x1];
         u8         disable_uc_local_lb[0x1];
         u8         disable_mc_local_lb[0x1];
         u8         node_guid[0x1];
@@ -5532,6 +5576,7 @@ struct mlx5_ifc_init_hca_in_bits {
         u8         op_mod[0x10];
 
         u8         reserved_at_40[0x40];
+        u8         sw_owner_id[4][0x20];
 };
 
 struct mlx5_ifc_init2rtr_qp_out_bits {