i40e: remove irqs only when they are set up

Use an extra state variable to keep track of when the IRQs are fully
set up.  This keeps us from trying to unhook IRQs that already were
left unhooked in a failed reset recovery, e.g. when firmware is broken.

Change-ID: I073eb081e4ef8aedcbdf1ee0717c0ed64fa172f2
Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
index 581898f23223e2ddcde4ddf0226025276caeea91..9c27d8b657b2ed8fe795c2c68084ceb12a8fe40a 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -414,6 +414,7 @@ struct i40e_vsi {
        struct i40e_q_vector **q_vectors;
        int num_q_vectors;
        int base_vector;
+       bool irqs_ready;
 
        u16 seid;            /* HW index of this VSI (absolute index) */
        u16 id;              /* VSI number */

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 52bd69d38d9c1d369a74d4900f90bf770e858992..029288e1bb987da6cab6bc0601b2302642e335bf 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -2790,6 +2790,7 @@ static int i40e_vsi_request_irq_msix(struct i40e_vsi *vsi, char *basename)
                                      &q_vector->affinity_mask);
        }
 
+       vsi->irqs_ready = true;
        return 0;
 
 free_queue_irqs:
@@ -3349,6 +3350,10 @@ static void i40e_vsi_free_irq(struct i40e_vsi *vsi)
                if (!vsi->q_vectors)
                        return;
 
+               if (!vsi->irqs_ready)
+                       return;
+
+               vsi->irqs_ready = false;
                for (i = 0; i < vsi->num_q_vectors; i++) {
                        u16 vector = i + base;
 
@@ -5953,6 +5958,7 @@ static int i40e_vsi_mem_alloc(struct i40e_pf *pf, enum i40e_vsi_type type)
        vsi->netdev_registered = false;
        vsi->work_limit = I40E_DEFAULT_IRQ_WORK;
        INIT_LIST_HEAD(&vsi->mac_filter_list);
+       vsi->irqs_ready = false;
 
        ret = i40e_set_num_rings_in_vsi(vsi);
        if (ret)