Commit 4ad31849 authored by Maxim Mikityanskiy's avatar Maxim Mikityanskiy Committed by Saeed Mahameed
Browse files

net/mlx5e: Move mlx5e_build_rss_params() call to init_rx 



RSS params belong to the RX side initialization. Move them from
profile->init to profile->init_rx stage to allow the next commit to move
rss_params out of priv to a dynamically-allocated struct.

Signed-off-by: default avatarMaxim Mikityanskiy <maximmi@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 06e9f13a

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

+3 −5
Original line number Diff line number Diff line
@@ -4538,7 +4538,6 @@ void mlx5e_build_rss_params(struct mlx5e_rss_params *rss_params, 


void mlx5e_build_nic_params(struct mlx5e_priv *priv, struct mlx5e_xsk *xsk, u16 mtu)

{

	struct mlx5e_rss_params *rss_params = &priv->rss_params;

	struct mlx5e_params *params = &priv->channels.params;

	struct mlx5_core_dev *mdev = priv->mdev;

	u8 rx_cq_period_mode;
@@ -4598,10 +4597,7 @@ void mlx5e_build_nic_params(struct mlx5e_priv *priv, struct mlx5e_xsk *xsk, u16 
	/* TX inline */

	mlx5_query_min_inline(mdev, &params->tx_min_inline_mode);



	/* RSS */

	mlx5e_build_rss_params(rss_params, params->num_channels);

	params->tunneled_offload_en =

		mlx5e_tunnel_inner_ft_supported(mdev);

	params->tunneled_offload_en = mlx5e_tunnel_inner_ft_supported(mdev);



	/* AF_XDP */

	params->xsk = xsk;
@@ -4873,6 +4869,8 @@ static int mlx5e_init_nic_rx(struct mlx5e_priv *priv) 
	u16 max_nch = priv->max_nch;

	int err;



	mlx5e_build_rss_params(&priv->rss_params, priv->channels.params.num_channels);



	mlx5e_create_q_counters(priv);



	err = mlx5e_open_drop_rq(priv, &priv->drop_rq);

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

+2 −3
Original line number Diff line number Diff line
@@ -585,9 +585,6 @@ static void mlx5e_build_rep_params(struct net_device *netdev) 
	params->tunneled_offload_en = false;



	mlx5_query_min_inline(mdev, &params->tx_min_inline_mode);



	/* RSS */

	mlx5e_build_rss_params(&priv->rss_params, params->num_channels);

}



static void mlx5e_build_rep_netdev(struct net_device *netdev,
@@ -763,6 +760,8 @@ static int mlx5e_init_rep_rx(struct mlx5e_priv *priv) 
	u16 max_nch = priv->max_nch;

	int err;



	mlx5e_build_rss_params(&priv->rss_params, priv->channels.params.num_channels);



	mlx5e_init_l2_addr(priv);



	err = mlx5e_open_drop_rq(priv, &priv->drop_rq);

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

+2 −0
Original line number Diff line number Diff line
@@ -362,6 +362,8 @@ static int mlx5i_init_rx(struct mlx5e_priv *priv) 
	u16 max_nch = priv->max_nch;

	int err;



	mlx5e_build_rss_params(&priv->rss_params, priv->channels.params.num_channels);



	mlx5e_create_q_counters(priv);



	err = mlx5e_open_drop_rq(priv, &priv->drop_rq);