Commit b5b219a1 authored by Michal Schmidt's avatar Michal Schmidt Committed by Jakub Kicinski
Browse files

iavf: add a common function for undoing the interrupt scheme 



Add a new function iavf_free_interrupt_scheme that does the inverse of
iavf_init_interrupt_scheme. Symmetry is nice. And there will be three
callers already.

Signed-off-by: default avatarMichal Schmidt <mschmidt@redhat.com>
Reviewed-by: default avatarWojciech Drewek <wojciech.drewek@intel.com>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Link: https://lore.kernel.org/r/20231027175941.1340255-8-jacob.e.keller@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 5c4e1d18

drivers/net/ethernet/intel/iavf/iavf_main.c

+15 −11
Original line number Diff line number Diff line
@@ -1954,6 +1954,17 @@ static int iavf_init_interrupt_scheme(struct iavf_adapter *adapter) 
	return err;

}



/**

 * iavf_free_interrupt_scheme - Undo what iavf_init_interrupt_scheme does

 * @adapter: board private structure

 **/

static void iavf_free_interrupt_scheme(struct iavf_adapter *adapter)

{

	iavf_free_q_vectors(adapter);

	iavf_reset_interrupt_capability(adapter);

	iavf_free_queues(adapter);

}



/**

 * iavf_free_rss - Free memory used by RSS structs

 * @adapter: board private structure
@@ -1982,9 +1993,7 @@ static int iavf_reinit_interrupt_scheme(struct iavf_adapter *adapter, bool runni 
	if (running)

		iavf_free_traffic_irqs(adapter);

	iavf_free_misc_irq(adapter);

	iavf_reset_interrupt_capability(adapter);

	iavf_free_q_vectors(adapter);

	iavf_free_queues(adapter);

	iavf_free_interrupt_scheme(adapter);



	err = iavf_init_interrupt_scheme(adapter);

	if (err)
@@ -2968,9 +2977,7 @@ static void iavf_disable_vf(struct iavf_adapter *adapter) 
	spin_unlock_bh(&adapter->cloud_filter_list_lock);



	iavf_free_misc_irq(adapter);

	iavf_reset_interrupt_capability(adapter);

	iavf_free_q_vectors(adapter);

	iavf_free_queues(adapter);

	iavf_free_interrupt_scheme(adapter);

	memset(adapter->vf_res, 0, IAVF_VIRTCHNL_VF_RESOURCE_SIZE);

	iavf_shutdown_adminq(&adapter->hw);

	adapter->flags &= ~IAVF_FLAG_RESET_PENDING;
@@ -5202,9 +5209,7 @@ static void iavf_remove(struct pci_dev *pdev) 
	iavf_free_all_tx_resources(adapter);

	iavf_free_all_rx_resources(adapter);

	iavf_free_misc_irq(adapter);



	iavf_reset_interrupt_capability(adapter);

	iavf_free_q_vectors(adapter);

	iavf_free_interrupt_scheme(adapter);



	iavf_free_rss(adapter);
@@ -5220,7 +5225,6 @@ static void iavf_remove(struct pci_dev *pdev) 


	iounmap(hw->hw_addr);

	pci_release_regions(pdev);

	iavf_free_queues(adapter);

	kfree(adapter->vf_res);

	spin_lock_bh(&adapter->mac_vlan_list_lock);

	/* If we got removed before an up/down sequence, we've got a filter