Commit eee529c0 authored by Lama Kayal's avatar Lama Kayal Committed by Jakub Kicinski
Browse files

net/mlx5e: SHAMPO, Remove mlx5e_shampo_get_log_hd_entry_size() 



Refactor mlx5e_shampo_get_log_hd_entry_size() as macro, for more
simplicity.

Signed-off-by: default avatarLama Kayal <lkayal@nvidia.com>
Reviewed-by: default avatarDragos Tatulea <dtatulea@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Reviewed-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Link: https://patch.msgid.link/1753081999-326247-3-git-send-email-tariqt@nvidia.com


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

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

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ struct page_pool; 
#define MLX5E_SHAMPO_LOG_MAX_HEADER_ENTRY_SIZE (9)

#define MLX5E_SHAMPO_WQ_HEADER_PER_PAGE (PAGE_SIZE >> MLX5E_SHAMPO_LOG_MAX_HEADER_ENTRY_SIZE)

#define MLX5E_SHAMPO_LOG_WQ_HEADER_PER_PAGE (PAGE_SHIFT - MLX5E_SHAMPO_LOG_MAX_HEADER_ENTRY_SIZE)

#define MLX5E_SHAMPO_WQ_BASE_HEAD_ENTRY_SIZE (64)

#define MLX5E_SHAMPO_WQ_BASE_HEAD_ENTRY_SIZE_SHIFT (6)

#define MLX5E_SHAMPO_WQ_RESRV_SIZE_BASE_SHIFT (12)

#define MLX5E_SHAMPO_WQ_LOG_RESRV_SIZE (16)

#define MLX5E_SHAMPO_WQ_RESRV_SIZE BIT(MLX5E_SHAMPO_WQ_LOG_RESRV_SIZE)

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

+2 −7
Original line number Diff line number Diff line
@@ -414,12 +414,6 @@ u8 mlx5e_mpwqe_get_log_rq_size(struct mlx5_core_dev *mdev, 
	return params->log_rq_mtu_frames - log_pkts_per_wqe;

}



u8 mlx5e_shampo_get_log_hd_entry_size(struct mlx5_core_dev *mdev,

				      struct mlx5e_params *params)

{

	return order_base_2(DIV_ROUND_UP(MLX5E_RX_MAX_HEAD, MLX5E_SHAMPO_WQ_BASE_HEAD_ENTRY_SIZE));

}



static u8 mlx5e_shampo_get_log_pkt_per_rsrv(struct mlx5e_params *params)

{

	return order_base_2(DIV_ROUND_UP(MLX5E_SHAMPO_WQ_RESRV_SIZE,
@@ -928,7 +922,8 @@ int mlx5e_build_rq_param(struct mlx5_core_dev *mdev, 
			 log_max_num_of_packets_per_reservation,

			 mlx5e_shampo_get_log_pkt_per_rsrv(params));

		MLX5_SET(wq, wq, log_headers_entry_size,

			 mlx5e_shampo_get_log_hd_entry_size(mdev, params));

			 MLX5E_SHAMPO_LOG_HEADER_ENTRY_SIZE -

			 MLX5E_SHAMPO_WQ_BASE_HEAD_ENTRY_SIZE_SHIFT);

		lro_timeout =

			mlx5e_choose_lro_timeout(mdev,

						 MLX5E_DEFAULT_SHAMPO_TIMEOUT);

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

+0 −2
Original line number Diff line number Diff line
@@ -95,8 +95,6 @@ bool mlx5e_rx_mpwqe_is_linear_skb(struct mlx5_core_dev *mdev, 
u8 mlx5e_mpwqe_get_log_rq_size(struct mlx5_core_dev *mdev,

			       struct mlx5e_params *params,

			       struct mlx5e_xsk_param *xsk);

u8 mlx5e_shampo_get_log_hd_entry_size(struct mlx5_core_dev *mdev,

				      struct mlx5e_params *params);

u32 mlx5e_shampo_hd_per_wqe(struct mlx5_core_dev *mdev,

			    struct mlx5e_params *params,

			    struct mlx5e_rq_param *rq_param);