Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d8b17be authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

nfp: move the start/stop app callbacks back 



Since representors are now created with a separate callback
start/stop app callbacks can be moved again to their original
location.  They are intended to app-specific init/clean up
over the control channel.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 192e6851

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

+11 −15
Original line number Original line Diff line number Diff line
@@ -469,10 +469,14 @@ static int nfp_net_pf_app_start(struct nfp_pf *pf) 
{

{

	int err;

	int err;





	err = nfp_app_start(pf->app, pf->ctrl_vnic);

	err = nfp_net_pf_app_start_ctrl(pf);

	if (err)

	if (err)

		return err;

		return err;





	err = nfp_app_start(pf->app, pf->ctrl_vnic);

	if (err)

		goto err_ctrl_stop;



	if (pf->num_vfs) {

	if (pf->num_vfs) {

		err = nfp_app_sriov_enable(pf->app, pf->num_vfs);

		err = nfp_app_sriov_enable(pf->app, pf->num_vfs);

		if (err)

		if (err)
@@ -483,6 +487,8 @@ static int nfp_net_pf_app_start(struct nfp_pf *pf) 




err_app_stop:

err_app_stop:

	nfp_app_stop(pf->app);

	nfp_app_stop(pf->app);

err_ctrl_stop:

	nfp_net_pf_app_stop_ctrl(pf);

	return err;

	return err;

}

}
@@ -491,6 +497,7 @@ static void nfp_net_pf_app_stop(struct nfp_pf *pf) 
	if (pf->num_vfs)

	if (pf->num_vfs)

		nfp_app_sriov_disable(pf->app);

		nfp_app_sriov_disable(pf->app);

	nfp_app_stop(pf->app);

	nfp_app_stop(pf->app);

	nfp_net_pf_app_stop_ctrl(pf);

}

}





static void nfp_net_pci_unmap_mem(struct nfp_pf *pf)

static void nfp_net_pci_unmap_mem(struct nfp_pf *pf)
@@ -582,7 +589,7 @@ static int nfp_net_pci_map_mem(struct nfp_pf *pf) 




static void nfp_net_pci_remove_finish(struct nfp_pf *pf)

static void nfp_net_pci_remove_finish(struct nfp_pf *pf)

{

{

	nfp_net_pf_app_stop_ctrl(pf);

	nfp_net_pf_app_stop(pf);

	/* stop app first, to avoid double free of ctrl vNIC's ddir */

	/* stop app first, to avoid double free of ctrl vNIC's ddir */

	nfp_net_debugfs_dir_clean(&pf->ddir);

	nfp_net_debugfs_dir_clean(&pf->ddir);
@@ -713,7 +720,6 @@ int nfp_net_pci_probe(struct nfp_pf *pf) 
{

{

	struct nfp_net_fw_version fw_ver;

	struct nfp_net_fw_version fw_ver;

	u8 __iomem *ctrl_bar, *qc_bar;

	u8 __iomem *ctrl_bar, *qc_bar;

	struct nfp_net *nn;

	int stride;

	int stride;

	int err;

	int err;
@@ -790,7 +796,7 @@ int nfp_net_pci_probe(struct nfp_pf *pf) 
	if (err)

	if (err)

		goto err_free_vnics;

		goto err_free_vnics;





	err = nfp_net_pf_app_start_ctrl(pf);

	err = nfp_net_pf_app_start(pf);

	if (err)

	if (err)

		goto err_free_irqs;

		goto err_free_irqs;
@@ -798,20 +804,12 @@ int nfp_net_pci_probe(struct nfp_pf *pf) 
	if (err)

	if (err)

		goto err_stop_app;

		goto err_stop_app;





	err = nfp_net_pf_app_start(pf);

	if (err)

		goto err_clean_vnics;



	mutex_unlock(&pf->lock);

	mutex_unlock(&pf->lock);





	return 0;

	return 0;





err_clean_vnics:

	list_for_each_entry(nn, &pf->vnics, vnic_list)

		if (nfp_net_is_data_vnic(nn))

			nfp_net_pf_clean_vnic(pf, nn);

err_stop_app:

err_stop_app:

	nfp_net_pf_app_stop_ctrl(pf);

	nfp_net_pf_app_stop(pf);

err_free_irqs:

err_free_irqs:

	nfp_net_pf_free_irqs(pf);

	nfp_net_pf_free_irqs(pf);

err_free_vnics:

err_free_vnics:
@@ -835,8 +833,6 @@ void nfp_net_pci_remove(struct nfp_pf *pf) 
	if (list_empty(&pf->vnics))

	if (list_empty(&pf->vnics))

		goto out;

		goto out;





	nfp_net_pf_app_stop(pf);



	list_for_each_entry(nn, &pf->vnics, vnic_list)

	list_for_each_entry(nn, &pf->vnics, vnic_list)

		if (nfp_net_is_data_vnic(nn))

		if (nfp_net_is_data_vnic(nn))

			nfp_net_pf_clean_vnic(pf, nn);

			nfp_net_pf_clean_vnic(pf, nn);