Commit 3fd3fb6b authored by Emeel Hakim's avatar Emeel Hakim Committed by Jakub Kicinski
Browse files

net/mlx5e: Move MACsec initialization from profile init stage to profile enable stage 



Postpone MACsec initialization to the mlx5e profile enable stage to have
user access region (UAR) pages and other resources ready before MACsec
initialization to initialize advanced steering operation (ASO) hardware
resources.

Reviewed-by: default avatarRaed Salem <raeds@nvidia.com>
Signed-off-by: default avatarEmeel Hakim <ehakim@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1f53da67

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

+6 −5
Original line number Diff line number Diff line
@@ -5055,10 +5055,6 @@ static int mlx5e_nic_init(struct mlx5_core_dev *mdev, 
	}

	priv->fs = fs;



	err = mlx5e_macsec_init(priv);

	if (err)

		mlx5_core_err(mdev, "MACsec initialization failed, %d\n", err);



	err = mlx5e_ipsec_init(priv);

	if (err)

		mlx5_core_err(mdev, "IPSec initialization failed, %d\n", err);
@@ -5076,7 +5072,6 @@ static void mlx5e_nic_cleanup(struct mlx5e_priv *priv) 
	mlx5e_health_destroy_reporters(priv);

	mlx5e_ktls_cleanup(priv);

	mlx5e_ipsec_cleanup(priv);

	mlx5e_macsec_cleanup(priv);

	mlx5e_fs_cleanup(priv->fs);

}
@@ -5202,9 +5197,14 @@ static void mlx5e_nic_enable(struct mlx5e_priv *priv) 
{

	struct net_device *netdev = priv->netdev;

	struct mlx5_core_dev *mdev = priv->mdev;

	int err;



	mlx5e_fs_init_l2_addr(priv->fs, netdev);



	err = mlx5e_macsec_init(priv);

	if (err)

		mlx5_core_err(mdev, "MACsec initialization failed, %d\n", err);



	/* Marking the link as currently not needed by the Driver */

	if (!netif_running(netdev))

		mlx5e_modify_admin_state(mdev, MLX5_PORT_DOWN);
@@ -5262,6 +5262,7 @@ static void mlx5e_nic_disable(struct mlx5e_priv *priv) 
	mlx5e_disable_async_events(priv);

	mlx5_lag_remove_netdev(mdev, priv->netdev);

	mlx5_vxlan_reset_to_default(mdev->vxlan);

	mlx5e_macsec_cleanup(priv);

}



int mlx5e_update_nic_rx(struct mlx5e_priv *priv)