Commit eb755a95 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'mlx5-misc-fixes-2024-08-08' 

Tariq Toukan says:

====================
mlx5 misc fixes 2024-08-08

This patchset provides misc bug fixes from the team to the mlx5 core and
Eth drivers.
====================

Link: https://patch.msgid.link/20240808144107.2095424-1-tariqt@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents d2438c16 0b4a4534

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

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ struct page_pool; 
#define MLX5E_PARAMS_MINIMUM_LOG_RQ_SIZE_MPW            0x2



#define MLX5E_DEFAULT_LRO_TIMEOUT                       32

#define MLX5E_LRO_TIMEOUT_ARR_SIZE                      4

#define MLX5E_DEFAULT_SHAMPO_TIMEOUT			1024



#define MLX5E_PARAMS_DEFAULT_RX_CQ_MODERATION_USEC      0x10

#define MLX5E_PARAMS_DEFAULT_RX_CQ_MODERATION_USEC_FROM_CQE 0x3

drivers/net/ethernet/mellanox/mlx5/core/en/params.c

+15 −1
Original line number Diff line number Diff line
@@ -928,7 +928,7 @@ int mlx5e_build_rq_param(struct mlx5_core_dev *mdev, 
			MLX5_SET(wq, wq, log_headers_entry_size,

				 mlx5e_shampo_get_log_hd_entry_size(mdev, params));

			MLX5_SET(rqc, rqc, reservation_timeout,

				 params->packet_merge.timeout);

				 mlx5e_choose_lro_timeout(mdev, MLX5E_DEFAULT_SHAMPO_TIMEOUT));

			MLX5_SET(rqc, rqc, shampo_match_criteria_type,

				 params->packet_merge.shampo.match_criteria_type);

			MLX5_SET(rqc, rqc, shampo_no_match_alignment_granularity,
@@ -1087,6 +1087,20 @@ static u32 mlx5e_shampo_icosq_sz(struct mlx5_core_dev *mdev, 
	return wqebbs;

}



#define MLX5E_LRO_TIMEOUT_ARR_SIZE                      4



u32 mlx5e_choose_lro_timeout(struct mlx5_core_dev *mdev, u32 wanted_timeout)

{

	int i;



	/* The supported periods are organized in ascending order */

	for (i = 0; i < MLX5E_LRO_TIMEOUT_ARR_SIZE - 1; i++)

		if (MLX5_CAP_ETH(mdev, lro_timer_supported_periods[i]) >= wanted_timeout)

			break;



	return MLX5_CAP_ETH(mdev, lro_timer_supported_periods[i]);

}



static u32 mlx5e_mpwrq_total_umr_wqebbs(struct mlx5_core_dev *mdev,

					struct mlx5e_params *params,

					struct mlx5e_xsk_param *xsk)

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

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ u32 mlx5e_shampo_hd_per_wqe(struct mlx5_core_dev *mdev, 
u32 mlx5e_shampo_hd_per_wq(struct mlx5_core_dev *mdev,

			   struct mlx5e_params *params,

			   struct mlx5e_rq_param *rq_param);

u32 mlx5e_choose_lro_timeout(struct mlx5_core_dev *mdev, u32 wanted_timeout);

u8 mlx5e_mpwqe_get_log_stride_size(struct mlx5_core_dev *mdev,

				   struct mlx5e_params *params,

				   struct mlx5e_xsk_param *xsk);

drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c

+2 −0
Original line number Diff line number Diff line
@@ -146,7 +146,9 @@ static int mlx5e_tx_reporter_timeout_recover(void *ctx) 
		return err;

	}



	mutex_lock(&priv->state_lock);

	err = mlx5e_safe_reopen_channels(priv);

	mutex_unlock(&priv->state_lock);

	if (!err) {

		to_ctx->status = 1; /* all channels recovered */

		return err;

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

+1 −1
Original line number Diff line number Diff line
@@ -734,7 +734,7 @@ mlx5e_ethtool_flow_replace(struct mlx5e_priv *priv, 
	if (num_tuples <= 0) {

		netdev_warn(priv->netdev, "%s: flow is not valid %d\n",

			    __func__, num_tuples);

		return num_tuples;

		return num_tuples < 0 ? num_tuples : -EINVAL;

	}



	eth_ft = get_flow_table(priv, fs, num_tuples);