net/mlx5e: Enable local loopback in loopback selftest

Before running the ethtool's loopback selftest, we need
to make sure that the local loopback is enabled.

Signed-off-by: Huy Nguyen <huyn@mellanox.com>
Reviewed-by: Daniel Jurgens <danielj@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c b/drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c
index 898759fcf9ec79f5ea433c3095d986a572002d08..1f1f8af87d4df8d10f90eacda6d0d6f2c69b22b1 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c
@@ -189,6 +189,7 @@ struct mlx5e_lbt_priv {
        struct packet_type pt;
        struct completion comp;
        bool loopback_ok;
+       bool local_lb;
 };
 
 static int
@@ -236,6 +237,13 @@ static int mlx5e_test_loopback_setup(struct mlx5e_priv *priv,
 {
        int err = 0;
 
+       /* Temporarily enable local_lb */
+       if (MLX5_CAP_GEN(priv->mdev, disable_local_lb)) {
+               mlx5_nic_vport_query_local_lb(priv->mdev, &lbtp->local_lb);
+               if (!lbtp->local_lb)
+                       mlx5_nic_vport_update_local_lb(priv->mdev, true);
+       }
+
        err = mlx5e_refresh_tirs(priv, true);
        if (err)
                return err;
@@ -254,6 +262,11 @@ static int mlx5e_test_loopback_setup(struct mlx5e_priv *priv,
 static void mlx5e_test_loopback_cleanup(struct mlx5e_priv *priv,
                                        struct mlx5e_lbt_priv *lbtp)
 {
+       if (MLX5_CAP_GEN(priv->mdev, disable_local_lb)) {
+               if (!lbtp->local_lb)
+                       mlx5_nic_vport_update_local_lb(priv->mdev, false);
+       }
+
        dev_remove_pack(&lbtp->pt);
        mlx5e_refresh_tirs(priv, false);
 }