Commit f8623085 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

Merge branch 'mlx5-next' into rdma.git for-next 

From the mlx5-next branch at
git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux

Merged due to dependencies in the next patches.

* branch 'mlx5-next':
  net/mlx5: Expose relaxed ordering bits
  net/mlx5: Add RoCE accelerator counters
parents 0fbb37dd a880a6dd

include/linux/mlx5/mlx5_ifc.h

+20 −4
Original line number Diff line number Diff line
@@ -1174,7 +1174,8 @@ struct mlx5_ifc_cmd_hca_cap_bits { 
	u8         log_max_cq[0x5];



	u8         log_max_eq_sz[0x8];

	u8         reserved_at_e8[0x2];

	u8         relaxed_ordering_write[0x1];

	u8         relaxed_ordering_read[0x1];

	u8         log_max_mkey[0x6];

	u8         reserved_at_f0[0x8];

	u8         dump_fill_mkey[0x1];
@@ -1197,7 +1198,8 @@ struct mlx5_ifc_cmd_hca_cap_bits { 
	u8         reserved_at_130[0xa];

	u8         log_max_ra_res_dc[0x6];



	u8         reserved_at_140[0xa];

	u8         reserved_at_140[0x9];

	u8         roce_accl[0x1];

	u8         log_max_ra_req_qp[0x6];

	u8         reserved_at_150[0xa];

	u8         log_max_ra_res_qp[0x6];
@@ -3286,7 +3288,9 @@ struct mlx5_ifc_mkc_bits { 


	u8         translations_octword_size[0x20];



	u8         reserved_at_1c0[0x1b];

	u8         reserved_at_1c0[0x19];

	u8         relaxed_ordering_read[0x1];

	u8         reserved_at_1d9[0x1];

	u8         log_page_size[0x5];



	u8         reserved_at_1e0[0x20];
@@ -4746,7 +4750,19 @@ struct mlx5_ifc_query_q_counter_out_bits { 


	u8         req_cqe_flush_error[0x20];



	u8         reserved_at_620[0x1e0];

	u8         reserved_at_620[0x20];



	u8         roce_adp_retrans[0x20];



	u8         roce_adp_retrans_to[0x20];



	u8         roce_slow_restart[0x20];



	u8         roce_slow_restart_cnps[0x20];



	u8         roce_slow_restart_trans[0x20];



	u8         reserved_at_6e0[0x120];

};



struct mlx5_ifc_query_q_counter_in_bits {

CRA Git | Maintained and supported by SUSTech CRA and CCSE