Commit 865d6d1c authored by Roi Dayan's avatar Roi Dayan Committed by Saeed Mahameed
Browse files

net/mlx5e: Move devlink port register and unregister calls 



We will re-use the native NIC port net device instance for the Uplink
representor. As such we also don't want to unregister/register the
devlink port as part of the profile.

Signed-off-by: default avatarRoi Dayan <roid@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 2ff349c5

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

+11 −6
Original line number Diff line number Diff line
@@ -5306,10 +5306,6 @@ static int mlx5e_nic_init(struct mlx5_core_dev *mdev, 
	if (err)

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



	err = mlx5e_devlink_port_register(priv);

	if (err)

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



	mlx5e_health_create_reporters(priv);



	return 0;
@@ -5318,7 +5314,6 @@ static int mlx5e_nic_init(struct mlx5_core_dev *mdev, 
static void mlx5e_nic_cleanup(struct mlx5e_priv *priv)

{

	mlx5e_health_destroy_reporters(priv);

	mlx5e_devlink_port_unregister(priv);

	mlx5e_tls_cleanup(priv);

	mlx5e_ipsec_cleanup(priv);

}
@@ -5829,10 +5824,17 @@ static int mlx5e_probe(struct auxiliary_device *adev, 


	priv->profile = profile;

	priv->ppriv = NULL;



	err = mlx5e_devlink_port_register(priv);

	if (err) {

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

		goto err_destroy_netdev;

	}



	err = profile->init(mdev, netdev);

	if (err) {

		mlx5_core_err(mdev, "mlx5e_nic_profile init failed, %d\n", err);

		goto err_destroy_netdev;

		goto err_devlink_cleanup;

	}



	err = mlx5e_resume(adev);
@@ -5856,6 +5858,8 @@ static int mlx5e_probe(struct auxiliary_device *adev, 
	mlx5e_suspend(adev, state);

err_profile_cleanup:

	profile->cleanup(priv);

err_devlink_cleanup:

	mlx5e_devlink_port_unregister(priv);

err_destroy_netdev:

	mlx5e_destroy_netdev(priv);

	return err;
@@ -5870,6 +5874,7 @@ static void mlx5e_remove(struct auxiliary_device *adev) 
	unregister_netdev(priv->netdev);

	mlx5e_suspend(adev, state);

	priv->profile->cleanup(priv);

	mlx5e_devlink_port_unregister(priv);

	mlx5e_destroy_netdev(priv);

}

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

+10 −5
Original line number Diff line number Diff line
@@ -2259,9 +2259,11 @@ int esw_offloads_load_rep(struct mlx5_eswitch *esw, u16 vport_num) 
	if (esw->mode != MLX5_ESWITCH_OFFLOADS)

		return 0;



	if (vport_num != MLX5_VPORT_UPLINK) {

		err = mlx5_esw_offloads_devlink_port_register(esw, vport_num);

		if (err)

			return err;

	}



	err = mlx5_esw_offloads_rep_load(esw, vport_num);

	if (err)
@@ -2269,6 +2271,7 @@ int esw_offloads_load_rep(struct mlx5_eswitch *esw, u16 vport_num) 
	return err;



load_err:

	if (vport_num != MLX5_VPORT_UPLINK)

		mlx5_esw_offloads_devlink_port_unregister(esw, vport_num);

	return err;

}
@@ -2279,6 +2282,8 @@ void esw_offloads_unload_rep(struct mlx5_eswitch *esw, u16 vport_num) 
		return;



	mlx5_esw_offloads_rep_unload(esw, vport_num);



	if (vport_num != MLX5_VPORT_UPLINK)

		mlx5_esw_offloads_devlink_port_unregister(esw, vport_num);

}