i40evf: Add longer wait after remove module

Orabug: 23176970

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>
(cherry picked from commit 22ead37f8af83b4fa32c15cc21d3541e74661339)
Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 1663243fada0b8824cc6735840f23e8047c8462e..1e29f37d96fb9fe98122916acadbf9f5fafe4cbe 100644 (file)
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -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) {