Commit 091400a5 authored by Tariq Toukan's avatar Tariq Toukan Committed by Jakub Kicinski
Browse files

net/mlx5e: Enhance function structures for self loopback prevention application 



The re-application of self loopback prevention attributes in TIRs is
necessary in old firmwares (where tis_tir_td_order cap is cleared) after
recreation of SQs.

However, this is not needed in new firmware with tis_tir_td_order=1.

As a preparation patch, enhance the function structures to differentiate
between an explicit loopback prevention configuration apply, and the
re-apply operation required by old firmware.

Loopback selftests should now call mlx5e_modify_tirs_lb() directly, as
their use case is not related to the firmware limitation.

Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Reviewed-by: default avatarCarolina Jubran <cjubran@nvidia.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/1761831159-1013140-2-git-send-email-tariqt@nvidia.com


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

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

+3 −1
Original line number Diff line number Diff line
@@ -1156,7 +1156,9 @@ extern const struct ethtool_ops mlx5e_ethtool_ops; 
int mlx5e_create_mkey(struct mlx5_core_dev *mdev, u32 pdn, u32 *mkey);

int mlx5e_create_mdev_resources(struct mlx5_core_dev *mdev, bool create_tises);

void mlx5e_destroy_mdev_resources(struct mlx5_core_dev *mdev);

int mlx5e_refresh_tirs(struct mlx5e_priv *priv, bool enable_uc_lb,

int mlx5e_modify_tirs_lb(struct mlx5_core_dev *mdev, bool enable_uc_lb,

			 bool enable_mc_lb);

int mlx5e_refresh_tirs(struct mlx5_core_dev *mdev, bool enable_uc_lb,

		       bool enable_mc_lb);

void mlx5e_mkey_set_relaxed_ordering(struct mlx5_core_dev *mdev, void *mkc);

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

+12 −4
Original line number Diff line number Diff line
@@ -247,10 +247,9 @@ void mlx5e_destroy_mdev_resources(struct mlx5_core_dev *mdev) 
	memset(res, 0, sizeof(*res));

}



int mlx5e_refresh_tirs(struct mlx5e_priv *priv, bool enable_uc_lb,

int mlx5e_modify_tirs_lb(struct mlx5_core_dev *mdev, bool enable_uc_lb,

			 bool enable_mc_lb)

{

	struct mlx5_core_dev *mdev = priv->mdev;

	struct mlx5e_tir *tir;

	u8 lb_flags = 0;

	int err  = 0;
@@ -285,7 +284,16 @@ int mlx5e_refresh_tirs(struct mlx5e_priv *priv, bool enable_uc_lb, 


	kvfree(in);

	if (err)

		netdev_err(priv->netdev, "refresh tir(0x%x) failed, %d\n", tirn, err);

		mlx5_core_err(mdev,

			      "modify tir(0x%x) enable_lb uc(%d) mc(%d) failed, %d\n",

			      tirn,

			      enable_uc_lb, enable_mc_lb, err);



	return err;

}



int mlx5e_refresh_tirs(struct mlx5_core_dev *mdev, bool enable_uc_lb,

		       bool enable_mc_lb)

{

	return mlx5e_modify_tirs_lb(mdev, enable_uc_lb, enable_mc_lb);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -6136,7 +6136,7 @@ static void mlx5e_nic_disable(struct mlx5e_priv *priv) 


static int mlx5e_update_nic_rx(struct mlx5e_priv *priv)

{

	return mlx5e_refresh_tirs(priv, false, false);

	return mlx5e_refresh_tirs(priv->mdev, false, false);

}



static const struct mlx5e_profile mlx5e_nic_profile = {

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

+2 −2
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static int mlx5e_test_loopback_setup(struct mlx5e_priv *priv, 
			return err;

	}



	err = mlx5e_refresh_tirs(priv, true, false);

	err = mlx5e_modify_tirs_lb(priv->mdev, true, false);

	if (err)

		goto out;
@@ -243,7 +243,7 @@ static void mlx5e_test_loopback_cleanup(struct mlx5e_priv *priv, 
		mlx5_nic_vport_update_local_lb(priv->mdev, false);



	dev_remove_pack(&lbtp->pt);

	mlx5e_refresh_tirs(priv, false, false);

	mlx5e_modify_tirs_lb(priv->mdev, false, false);

}



static int mlx5e_cond_loopback(struct mlx5e_priv *priv)

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

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ void mlx5i_destroy_underlay_qp(struct mlx5_core_dev *mdev, u32 qpn) 


int mlx5i_update_nic_rx(struct mlx5e_priv *priv)

{

	return mlx5e_refresh_tirs(priv, true, true);

	return mlx5e_refresh_tirs(priv->mdev, true, true);

}



int mlx5i_create_tis(struct mlx5_core_dev *mdev, u32 underlay_qpn, u32 *tisn)