diff options
| author | Greg Rose <gregory.v.rose@intel.com> | 2010-03-24 09:36:08 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-26 11:56:01 -0700 |
| commit | 5809a1ae77721931ca7bd7aeacb37fdabe6f07c0 (patch) | |
| tree | 13852a149ca356bb10627ad67b927363e7450700 /drivers/net | |
| parent | 65deeed7b34bc5b8d3cbff495e8fa2ae7b563480 (diff) | |
| download | linux-3.10-5809a1ae77721931ca7bd7aeacb37fdabe6f07c0.tar.gz linux-3.10-5809a1ae77721931ca7bd7aeacb37fdabe6f07c0.tar.bz2 linux-3.10-5809a1ae77721931ca7bd7aeacb37fdabe6f07c0.zip | |
ixgbe: In SR-IOV mode insert delay before bring the adapter up
VFs running in guest VMs do not respond in as timely a manner to
PF indication it is going down as they do when running in the host
domain. If the adapter is in SR-IOV mode insert a two second delay
to guarantee that all VFs have had time to respond to the PF reset.
In any case resetting the PF while VFs are active should be
discouraged but if it must be done then there will be a two
second delay to help synchronize resets among the PF and all the
VFs.
Signed-off-by: Greg Rose <gregory.v.rose@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index d75c46ff31f..d2cda9e5963 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -3056,6 +3056,14 @@ void ixgbe_reinit_locked(struct ixgbe_adapter *adapter) while (test_and_set_bit(__IXGBE_RESETTING, &adapter->state)) msleep(1); ixgbe_down(adapter); + /* + * If SR-IOV enabled then wait a bit before bringing the adapter + * back up to give the VFs time to respond to the reset. The + * two second wait is based upon the watchdog timer cycle in + * the VF driver. + */ + if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) + msleep(2000); ixgbe_up(adapter); clear_bit(__IXGBE_RESETTING, &adapter->state); } |