Commit 2b5bd5b1 authored by Adham Faris's avatar Adham Faris Committed by Jakub Kicinski
Browse files

net/mlx5e: Rename RQ/SQ adaptive moderation state flag 



Dynamic interrupt moderation RQ and SQ feature represented by
MLX5E_RQ_STATE_AM and MLX5E_SQ_STATE_AM enums respectively, is not
consistent with the feature naming in the driver, and with the formal
feature and library names.

Hence, change MLX5E_RQ_STATE_AM and MLX5E_SQ_STATE_AM enum type names in
core/en.h to MLX5E_RQ_STATE_DIM and MLX5E_SQ_STATE_DIM respectively.

Signed-off-by: default avatarAdham Faris <afaris@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Link: https://lore.kernel.org/r/20230314054234.267365-7-saeed@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent aa98d15e

drivers/net/ethernet/mellanox/mlx5/core/en.h

+2 −2
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ static inline u8 mlx5e_get_dcb_num_tc(struct mlx5e_params *params) 
enum {

	MLX5E_RQ_STATE_ENABLED,

	MLX5E_RQ_STATE_RECOVERING,

	MLX5E_RQ_STATE_AM,

	MLX5E_RQ_STATE_DIM,

	MLX5E_RQ_STATE_NO_CSUM_COMPLETE,

	MLX5E_RQ_STATE_CSUM_FULL, /* cqe_csum_full hw bit is set */

	MLX5E_RQ_STATE_MINI_CQE_HW_STRIDX, /* set when mini_cqe_resp_stride_index cap is used */
@@ -390,7 +390,7 @@ enum { 
	MLX5E_SQ_STATE_MPWQE,

	MLX5E_SQ_STATE_RECOVERING,

	MLX5E_SQ_STATE_IPSEC,

	MLX5E_SQ_STATE_AM,

	MLX5E_SQ_STATE_DIM,

	MLX5E_SQ_STATE_VLAN_NEED_L2_INLINE,

	MLX5E_SQ_STATE_PENDING_XSK_TX,

	MLX5E_SQ_STATE_PENDING_TLS_RX_RESYNC,

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

+2 −2
Original line number Diff line number Diff line
@@ -1188,7 +1188,7 @@ int mlx5e_open_rq(struct mlx5e_params *params, struct mlx5e_rq_param *param, 
		__set_bit(MLX5E_RQ_STATE_CSUM_FULL, &rq->state);



	if (params->rx_dim_enabled)

		__set_bit(MLX5E_RQ_STATE_AM, &rq->state);

		__set_bit(MLX5E_RQ_STATE_DIM, &rq->state);



	/* We disable csum_complete when XDP is enabled since

	 * XDP programs might manipulate packets which will render
@@ -1664,7 +1664,7 @@ int mlx5e_open_txqsq(struct mlx5e_channel *c, u32 tisn, int txq_ix, 
		mlx5e_set_sq_maxrate(c->netdev, sq, tx_rate);



	if (params->tx_dim_enabled)

		sq->state |= BIT(MLX5E_SQ_STATE_AM);

		sq->state |= BIT(MLX5E_SQ_STATE_DIM);



	return 0;

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

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static void mlx5e_handle_tx_dim(struct mlx5e_txqsq *sq) 
	struct mlx5e_sq_stats *stats = sq->stats;

	struct dim_sample dim_sample = {};



	if (unlikely(!test_bit(MLX5E_SQ_STATE_AM, &sq->state)))

	if (unlikely(!test_bit(MLX5E_SQ_STATE_DIM, &sq->state)))

		return;



	dim_update_sample(sq->cq.event_ctr, stats->packets, stats->bytes, &dim_sample);
@@ -63,7 +63,7 @@ static void mlx5e_handle_rx_dim(struct mlx5e_rq *rq) 
	struct mlx5e_rq_stats *stats = rq->stats;

	struct dim_sample dim_sample = {};



	if (unlikely(!test_bit(MLX5E_RQ_STATE_AM, &rq->state)))

	if (unlikely(!test_bit(MLX5E_RQ_STATE_DIM, &rq->state)))

		return;



	dim_update_sample(rq->cq.event_ctr, stats->packets, stats->bytes, &dim_sample);