Commit e00e23bc authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher

fm10k: Cleanup exception handling for mailbox interrupt

This patch addresses two issues.

First is the fact that the fm10k_mbx_free_irq was assuming msix_entries was
valid and that will not always be the case.  As such we need to add a check
for if it is NULL.

Second is the fact that we weren't freeing the IRQ if the mailbox API
returned an error on trying to connect.
Signed-off-by: default avatarAlexander Duyck <aduyck@mirantis.com>
Reviewed-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarKrishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 587731e6
...@@ -1124,6 +1124,10 @@ void fm10k_mbx_free_irq(struct fm10k_intfc *interface) ...@@ -1124,6 +1124,10 @@ void fm10k_mbx_free_irq(struct fm10k_intfc *interface)
struct fm10k_hw *hw = &interface->hw; struct fm10k_hw *hw = &interface->hw;
int itr_reg; int itr_reg;
/* no mailbox IRQ to free if MSI-X is not enabled */
if (!interface->msix_entries)
return;
/* disconnect the mailbox */ /* disconnect the mailbox */
hw->mbx.ops.disconnect(hw, &hw->mbx); hw->mbx.ops.disconnect(hw, &hw->mbx);
...@@ -1446,10 +1450,15 @@ int fm10k_mbx_request_irq(struct fm10k_intfc *interface) ...@@ -1446,10 +1450,15 @@ int fm10k_mbx_request_irq(struct fm10k_intfc *interface)
err = fm10k_mbx_request_irq_pf(interface); err = fm10k_mbx_request_irq_pf(interface);
else else
err = fm10k_mbx_request_irq_vf(interface); err = fm10k_mbx_request_irq_vf(interface);
if (err)
return err;
/* connect mailbox */ /* connect mailbox */
if (!err) err = hw->mbx.ops.connect(hw, &hw->mbx);
err = hw->mbx.ops.connect(hw, &hw->mbx);
/* if the mailbox failed to connect, then free IRQ */
if (err)
fm10k_mbx_free_irq(interface);
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment