iavf: Fix adminq error handling
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: d358aa9a7a
("i40evf: init code and hardware support")
Signed-off-by: Przemyslaw Patynowski <przemyslawx.patynowski@intel.com>
Signed-off-by: Jedrzej Jagielski <jedrzej.jagielski@intel.com>
Tested-by: Marek Szlosek <marek.szlosek@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
This commit is contained in:
Родитель
40b4ac880e
Коммит
419831617e
|
@ -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 @@ init_adminq_exit:
|
|||
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);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче