Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83b502a1 authored by Alex Vesker's avatar Alex Vesker Committed by Leon Romanovsky
Browse files

net/mlx5: Modify RQ bitmask from mlx5 ifc 



Use mlx5 ifc MODIFY_BITMASK_VSD in mlx5e_modify_rq_vsd and expose counter
set capability bit in hca caps structure.

Signed-off-by: default avatarAlex Vesker <valex@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent 575ddf58

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+2 −1
Original line number Diff line number Diff line
@@ -489,7 +489,8 @@ static int mlx5e_modify_rq_vsd(struct mlx5e_rq *rq, bool vsd) 
	rqc = MLX5_ADDR_OF(modify_rq_in, in, ctx);



	MLX5_SET(modify_rq_in, in, rq_state, MLX5_RQC_STATE_RDY);

	MLX5_SET64(modify_rq_in, in, modify_bitmask, MLX5_RQ_BITMASK_VSD);

	MLX5_SET64(modify_rq_in, in, modify_bitmask,

		   MLX5_MODIFY_RQ_IN_MODIFY_BITMASK_VSD);

	MLX5_SET(rqc, rqc, vsd, vsd);

	MLX5_SET(rqc, rqc, state, MLX5_RQC_STATE_RDY);

include/linux/mlx5/driver.h

+0 −4
Original line number Diff line number Diff line
@@ -48,10 +48,6 @@ 
#include <linux/mlx5/doorbell.h>

#include <linux/mlx5/srq.h>



enum {

	MLX5_RQ_BITMASK_VSD = 1 << 1,

};



enum {

	MLX5_BOARD_ID_LEN = 64,

	MLX5_MAX_NAME_LEN = 16,

include/linux/mlx5/mlx5_ifc.h

+8 −1
Original line number Diff line number Diff line
@@ -779,7 +779,9 @@ struct mlx5_ifc_cmd_hca_cap_bits { 
	u8         out_of_seq_cnt[0x1];

	u8         vport_counters[0x1];

	u8         retransmission_q_counters[0x1];

	u8         reserved_at_183[0x3];

	u8         reserved_at_183[0x1];

	u8         modify_rq_counter_set_id[0x1];

	u8         reserved_at_185[0x1];

	u8         max_qp_cnt[0xa];

	u8         pkey_table_size[0x10];
@@ -4750,6 +4752,11 @@ struct mlx5_ifc_modify_rq_out_bits { 
	u8         reserved_at_40[0x40];

};



enum {

	MLX5_MODIFY_RQ_IN_MODIFY_BITMASK_VSD = 1ULL << 1,

	MLX5_MODIFY_RQ_IN_MODIFY_BITMASK_MODIFY_RQ_COUNTER_SET_ID = 1ULL << 3,

};



struct mlx5_ifc_modify_rq_in_bits {

	u8         opcode[0x10];

	u8         reserved_at_10[0x10];