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

Commit 080d1b17 authored by Aya Levin's avatar Aya Levin Committed by Saeed Mahameed
Browse files

net/mlx5e: Move modify tirs hash functionality 



Move modify tirs hash functionality (mlx5e_modify_tirs_hash) from
en_ethtool.c to en_main.c. This allows future use of this fuctionality
from en_fs_ethtool.c, while keeping current convention: en_ethtool.c
doesn't have an API.  There is no functional change here.

Signed-off-by: default avatarAya Levin <ayal@mellanox.com>
Reviewed-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 30543831

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

+1 −0
Original line number Diff line number Diff line
@@ -799,6 +799,7 @@ int mlx5e_redirect_rqt(struct mlx5e_priv *priv, u32 rqtn, int sz, 
void mlx5e_build_indir_tir_ctx_hash(struct mlx5e_params *params,

				    enum mlx5e_traffic_types tt,

				    void *tirc, bool inner);

void mlx5e_modify_tirs_hash(struct mlx5e_priv *priv, void *in, int inlen);



int mlx5e_open_locked(struct net_device *netdev);

int mlx5e_close_locked(struct net_device *netdev);

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

+0 −25
Original line number Diff line number Diff line
@@ -972,31 +972,6 @@ static int mlx5e_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key, 
	return 0;

}



static void mlx5e_modify_tirs_hash(struct mlx5e_priv *priv, void *in, int inlen)

{

	void *tirc = MLX5_ADDR_OF(modify_tir_in, in, ctx);

	struct mlx5_core_dev *mdev = priv->mdev;

	int ctxlen = MLX5_ST_SZ_BYTES(tirc);

	int tt;



	MLX5_SET(modify_tir_in, in, bitmask.hash, 1);



	for (tt = 0; tt < MLX5E_NUM_INDIR_TIRS; tt++) {

		memset(tirc, 0, ctxlen);

		mlx5e_build_indir_tir_ctx_hash(&priv->channels.params, tt, tirc, false);

		mlx5_core_modify_tir(mdev, priv->indir_tir[tt].tirn, in, inlen);

	}



	if (!mlx5e_tunnel_inner_ft_supported(priv->mdev))

		return;



	for (tt = 0; tt < MLX5E_NUM_INDIR_TIRS; tt++) {

		memset(tirc, 0, ctxlen);

		mlx5e_build_indir_tir_ctx_hash(&priv->channels.params, tt, tirc, true);

		mlx5_core_modify_tir(mdev, priv->inner_indir_tir[tt].tirn, in, inlen);

	}

}



static int mlx5e_set_rxfh(struct net_device *dev, const u32 *indir,

			  const u8 *key, const u8 hfunc)

{

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

+28 −0
Original line number Diff line number Diff line
@@ -2735,6 +2735,34 @@ void mlx5e_build_indir_tir_ctx_hash(struct mlx5e_params *params, 
	}

}



void mlx5e_modify_tirs_hash(struct mlx5e_priv *priv, void *in, int inlen)

{

	void *tirc = MLX5_ADDR_OF(modify_tir_in, in, ctx);

	struct mlx5_core_dev *mdev = priv->mdev;

	int ctxlen = MLX5_ST_SZ_BYTES(tirc);

	int tt;



	MLX5_SET(modify_tir_in, in, bitmask.hash, 1);



	for (tt = 0; tt < MLX5E_NUM_INDIR_TIRS; tt++) {

		memset(tirc, 0, ctxlen);

		mlx5e_build_indir_tir_ctx_hash(&priv->channels.params, tt, tirc,

					       false);

		mlx5_core_modify_tir(mdev, priv->indir_tir[tt].tirn, in, inlen);

	}



	if (!mlx5e_tunnel_inner_ft_supported(priv->mdev))

		return;



	for (tt = 0; tt < MLX5E_NUM_INDIR_TIRS; tt++) {

		memset(tirc, 0, ctxlen);

		mlx5e_build_indir_tir_ctx_hash(&priv->channels.params, tt, tirc,

					       true);

		mlx5_core_modify_tir(mdev, priv->inner_indir_tir[tt].tirn, in,

				     inlen);

	}

}



static int mlx5e_modify_tirs_lro(struct mlx5e_priv *priv)

{

	struct mlx5_core_dev *mdev = priv->mdev;