Commit 4f2a81c4 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by David S. Miller
Browse files

nfp: Move delink_register to be last command 



Open user space access to the devlink after driver is probed.

Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 67d78e7f

drivers/net/ethernet/netronome/nfp/devlink_param.c

+2 −7
Original line number Diff line number Diff line
@@ -233,13 +233,8 @@ int nfp_devlink_params_register(struct nfp_pf *pf) 
	if (err <= 0)

		return err;



	err = devlink_params_register(devlink, nfp_devlink_params,

	return devlink_params_register(devlink, nfp_devlink_params,

				       ARRAY_SIZE(nfp_devlink_params));

	if (err)

		return err;



	devlink_params_publish(devlink);

	return 0;

}



void nfp_devlink_params_unregister(struct nfp_pf *pf)

drivers/net/ethernet/netronome/nfp/nfp_net_main.c

+2 −3
Original line number Diff line number Diff line
@@ -701,7 +701,6 @@ int nfp_net_pci_probe(struct nfp_pf *pf) 
	if (err)

		goto err_unmap;



	devlink_register(devlink);

	err = nfp_shared_buf_register(pf);

	if (err)

		goto err_devlink_unreg;
@@ -731,6 +730,7 @@ int nfp_net_pci_probe(struct nfp_pf *pf) 
		goto err_stop_app;



	mutex_unlock(&pf->lock);

	devlink_register(devlink);



	return 0;
@@ -748,7 +748,6 @@ int nfp_net_pci_probe(struct nfp_pf *pf) 
	nfp_shared_buf_unregister(pf);

err_devlink_unreg:

	cancel_work_sync(&pf->port_refresh_work);

	devlink_unregister(devlink);

	nfp_net_pf_app_clean(pf);

err_unmap:

	nfp_net_pci_unmap_mem(pf);
@@ -759,6 +758,7 @@ void nfp_net_pci_remove(struct nfp_pf *pf) 
{

	struct nfp_net *nn, *next;



	devlink_unregister(priv_to_devlink(pf));

	mutex_lock(&pf->lock);

	list_for_each_entry_safe(nn, next, &pf->vnics, vnic_list) {

		if (!nfp_net_is_data_vnic(nn))
@@ -775,7 +775,6 @@ void nfp_net_pci_remove(struct nfp_pf *pf) 


	nfp_devlink_params_unregister(pf);

	nfp_shared_buf_unregister(pf);

	devlink_unregister(priv_to_devlink(pf));



	nfp_net_pf_free_irqs(pf);

	nfp_net_pf_app_clean(pf);