From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Mitch Williams <mitch.a.williams@intel.com>,
netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
jogreene@redhat.com, Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 07/14] i40evf: Add longer wait after remove module
Date: Tue, 5 Apr 2016 20:36:02 -0700 [thread overview]
Message-ID: <1459913769-56510-8-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1459913769-56510-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Mitch Williams <mitch.a.williams@intel.com>
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 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 2d018b4..6561a33 100644
--- 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) {
--
2.5.5
next prev parent reply other threads:[~2016-04-06 3:36 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-06 3:35 [net-next 00/14][pull request] 40GbE Intel Wired LAN Driver Updates 2016-04-05 Jeff Kirsher
2016-04-06 3:35 ` [net-next 01/14] i40e: remove redundant check on vsi->active_vlans Jeff Kirsher
2016-04-06 3:35 ` [net-next 02/14] i40e: Enable Geneve offload for FW API ver > 1.4 for XL710/X710 devices Jeff Kirsher
2016-04-06 3:35 ` [net-next 03/14] i40e: Remove unused variable Jeff Kirsher
2016-04-06 3:35 ` [net-next 04/14] i40evf: Fix VLAN features Jeff Kirsher
2016-04-06 3:36 ` [net-next 05/14] i40e: Add new device ID for X722 Jeff Kirsher
2016-04-06 3:36 ` [net-next 06/14] i40e: Make VF resets more reliable Jeff Kirsher
2016-04-06 3:36 ` Jeff Kirsher [this message]
2016-04-06 3:36 ` [net-next 08/14] i40e: Disable link polling Jeff Kirsher
2016-04-06 3:36 ` [net-next 09/14] i40evf: Fix get_rss_aq Jeff Kirsher
2016-04-06 3:36 ` [net-next 10/14] i40e: Fix for supported link modes in 10GBaseT PHY's Jeff Kirsher
2016-04-06 3:36 ` [net-next 11/14] i40e: Lower some message levels Jeff Kirsher
2016-04-06 3:36 ` [net-next 12/14] i40e: Request PHY media event at reset time Jeff Kirsher
2016-04-06 3:36 ` [net-next 13/14] i40e/i40evf: Bump patch from 1.5.1 to 1.5.2 Jeff Kirsher
2016-04-06 3:36 ` [net-next 14/14] i40e/i40evf: Fix TSO checksum pseudo-header adjustment Jeff Kirsher
2016-04-06 21:04 ` [net-next 00/14][pull request] 40GbE Intel Wired LAN Driver Updates 2016-04-05 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1459913769-56510-8-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=jogreene@redhat.com \
--cc=mitch.a.williams@intel.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@redhat.com \
--cc=sassmann@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).