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

Commit ff289f2b authored by Przemyslaw Patynowski's avatar Przemyslaw Patynowski Committed by Greg Kroah-Hartman
Browse files

iavf: Fix adminq error handling 



commit 419831617ed349992c84344dbd9e627f9e68f842 upstream.

iavf_alloc_asq_bufs/iavf_alloc_arq_bufs allocates with dma_alloc_coherent
memory for VF mailbox.
Free DMA regions for both ASQ and ARQ in case error happens during
configuration of ASQ/ARQ registers.
Without this change it is possible to see when unloading interface:
74626.583369: dma_debug_device_change: device driver has pending DMA allocations while released from device [count=32]
One of leaked entries details: [device address=0x0000000b27ff9000] [size=4096 bytes] [mapped with DMA_BIDIRECTIONAL] [mapped as coherent]

Fixes: d358aa9a ("i40evf: init code and hardware support")
Signed-off-by: default avatarPrzemyslaw Patynowski <przemyslawx.patynowski@intel.com>
Signed-off-by: default avatarJedrzej Jagielski <jedrzej.jagielski@intel.com>
Tested-by: default avatarMarek Szlosek <marek.szlosek@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2b4daaed

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

+13 −2
Original line number Diff line number Diff line
@@ -324,6 +324,7 @@ static enum iavf_status iavf_config_arq_regs(struct iavf_hw *hw) 
static enum iavf_status iavf_init_asq(struct iavf_hw *hw)

{

	enum iavf_status ret_code = 0;

	int i;



	if (hw->aq.asq.count > 0) {

		/* queue already initialized */
@@ -354,12 +355,17 @@ static enum iavf_status iavf_init_asq(struct iavf_hw *hw) 
	/* initialize base registers */

	ret_code = iavf_config_asq_regs(hw);

	if (ret_code)

		goto init_adminq_free_rings;

		goto init_free_asq_bufs;



	/* success! */

	hw->aq.asq.count = hw->aq.num_asq_entries;

	goto init_adminq_exit;



init_free_asq_bufs:

	for (i = 0; i < hw->aq.num_asq_entries; i++)

		iavf_free_dma_mem(hw, &hw->aq.asq.r.asq_bi[i]);

	iavf_free_virt_mem(hw, &hw->aq.asq.dma_head);



init_adminq_free_rings:

	iavf_free_adminq_asq(hw);
@@ -383,6 +389,7 @@ static enum iavf_status iavf_init_asq(struct iavf_hw *hw) 
static enum iavf_status iavf_init_arq(struct iavf_hw *hw)

{

	enum iavf_status ret_code = 0;

	int i;



	if (hw->aq.arq.count > 0) {

		/* queue already initialized */
@@ -413,12 +420,16 @@ static enum iavf_status iavf_init_arq(struct iavf_hw *hw) 
	/* initialize base registers */

	ret_code = iavf_config_arq_regs(hw);

	if (ret_code)

		goto init_adminq_free_rings;

		goto init_free_arq_bufs;



	/* success! */

	hw->aq.arq.count = hw->aq.num_arq_entries;

	goto init_adminq_exit;



init_free_arq_bufs:

	for (i = 0; i < hw->aq.num_arq_entries; i++)

		iavf_free_dma_mem(hw, &hw->aq.arq.r.arq_bi[i]);

	iavf_free_virt_mem(hw, &hw->aq.arq.dma_head);

init_adminq_free_rings:

	iavf_free_adminq_arq(hw);