Commit 0e258cec authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'devlink-reload-simplification' 

Leon Romanovsky says:

====================
devlink reload simplification

Simplify devlink reload APIs.
====================

Link: https://lore.kernel.org/r/cover.1634044267.git.leonro@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 177c9235 82465bec

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c

+1 −3
Original line number Diff line number Diff line
@@ -119,8 +119,8 @@ int hclge_devlink_init(struct hclge_dev *hdev) 
	priv->hdev = hdev;

	hdev->devlink = devlink;



	devlink_set_features(devlink, DEVLINK_F_RELOAD);

	devlink_register(devlink);

	devlink_reload_enable(devlink);

	return 0;

}
@@ -128,8 +128,6 @@ void hclge_devlink_uninit(struct hclge_dev *hdev) 
{

	struct devlink *devlink = hdev->devlink;



	devlink_reload_disable(devlink);



	devlink_unregister(devlink);



	devlink_free(devlink);

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_devlink.c

+1 −3
Original line number Diff line number Diff line
@@ -121,8 +121,8 @@ int hclgevf_devlink_init(struct hclgevf_dev *hdev) 
	priv->hdev = hdev;

	hdev->devlink = devlink;



	devlink_set_features(devlink, DEVLINK_F_RELOAD);

	devlink_register(devlink);

	devlink_reload_enable(devlink);

	return 0;

}
@@ -130,8 +130,6 @@ void hclgevf_devlink_uninit(struct hclgevf_dev *hdev) 
{

	struct devlink *devlink = hdev->devlink;



	devlink_reload_disable(devlink);



	devlink_unregister(devlink);



	devlink_free(devlink);

drivers/net/ethernet/mellanox/mlx4/main.c

+1 −2
Original line number Diff line number Diff line
@@ -4025,8 +4025,8 @@ static int mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
		goto err_params_unregister;



	pci_save_state(pdev);

	devlink_set_features(devlink, DEVLINK_F_RELOAD);

	devlink_register(devlink);

	devlink_reload_enable(devlink);

	return 0;



err_params_unregister:
@@ -4135,7 +4135,6 @@ static void mlx4_remove_one(struct pci_dev *pdev) 
	struct devlink *devlink = priv_to_devlink(priv);

	int active_vfs = 0;



	devlink_reload_disable(devlink);

	devlink_unregister(devlink);



	if (mlx4_is_slave(dev))

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

+4 −0
Original line number Diff line number Diff line
@@ -796,6 +796,7 @@ static void mlx5_devlink_traps_unregister(struct devlink *devlink) 


int mlx5_devlink_register(struct devlink *devlink)

{

	struct mlx5_core_dev *dev = devlink_priv(devlink);

	int err;



	err = devlink_params_register(devlink, mlx5_devlink_params,
@@ -813,6 +814,9 @@ int mlx5_devlink_register(struct devlink *devlink) 
	if (err)

		goto traps_reg_err;



	if (!mlx5_core_is_mp_slave(dev))

		devlink_set_features(devlink, DEVLINK_F_RELOAD);



	return 0;



traps_reg_err:

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

+0 −3
Original line number Diff line number Diff line
@@ -1538,8 +1538,6 @@ static int probe_one(struct pci_dev *pdev, const struct pci_device_id *id) 


	pci_save_state(pdev);

	devlink_register(devlink);

	if (!mlx5_core_is_mp_slave(dev))

		devlink_reload_enable(devlink);

	return 0;



err_init_one:
@@ -1559,7 +1557,6 @@ static void remove_one(struct pci_dev *pdev) 
	struct mlx5_core_dev *dev  = pci_get_drvdata(pdev);

	struct devlink *devlink = priv_to_devlink(dev);



	devlink_reload_disable(devlink);

	devlink_unregister(devlink);

	mlx5_crdump_disable(dev);

	mlx5_drain_health_wq(dev);