OSDN Git Service

i40evf: Add longer wait after remove module
authorMitch Williams <mitch.a.williams@intel.com>
Fri, 18 Mar 2016 19:18:10 +0000 (12:18 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 6 Apr 2016 03:33:27 +0000 (20:33 -0700)
Upon module remove, wait a little longer after requesting a reset before
checking to see if the firmware responded. This change prevents double
resets when the firmware is busy.

Change-ID: Ieedc988ee82fac1f32a074bf4d9e4dba426bfa58
Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/i40evf/i40evf_main.c

index 2d018b4..6561a33 100644 (file)
@@ -2854,11 +2854,11 @@ static void i40evf_remove(struct pci_dev *pdev)
        adapter->state = __I40EVF_REMOVE;
        adapter->aq_required = 0;
        i40evf_request_reset(adapter);
-       msleep(20);
+       msleep(50);
        /* If the FW isn't responding, kick it once, but only once. */
        if (!i40evf_asq_done(hw)) {
                i40evf_request_reset(adapter);
-               msleep(20);
+               msleep(50);
        }
 
        if (adapter->msix_entries) {