e100: Fix napi_enable BUG_ON when recovering from EEH error
Subsystems (2)
PATCH 1/1 e100: Fix napi_enable BUG_ON when recovering from EEH error
BUG_ON(!test_bit(NAPI_STATE_SCHED, &n->state)) was being hit during e100 EEH recovery. The problem source was a napi_enable call being made during e100_io_error_detected. Napi should remain disabled after e100_down, and only be reenabled when the interface is recovered.
This patch also updates e100_io_error_detected in order to make it similar to the current versions of the error_detected callback in drivers such as e1000e and ixgbe.
--- drivers/net/e100.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-)
drivers/net/e100.c +6 -5
@@ -2822,12 +2822,13 @@ static pci_ers_result_t e100_io_error_detected(struct pci_dev *pdev, pci_channelstruct net_device *netdev =pci_get_drvdata (pdev);struct nic *nic =netdev_priv (netdev); -/* Similar to calling e100_down(), but avoids adapter I/O. */ -e100_close (netdev); - -/* Detach; put netif into a state similar to hotplug unplug. */ -napi_enable (&nic->napi);netif_device_detach (netdev); + +if (state == pci_channel_io_perm_failure) +return PCI_ERS_RESULT_DISCONNECT ; + +if (netif_running (netdev)) +e100_down (nic);pci_disable_device (pdev);/* Request a slot reset. */
Signature · 1 line
1.6.0.2
From: Andre Detsch <[email protected]>
Date: Fri, 5 Jun 2009 17:04:25 -0300
Quoted 11 lines
BUG_ON(!test_bit(NAPI_STATE_SCHED, &n->state))was being hit during e100 EEH recovery. The problem source was anapi_enablecall being made duringe100_io_error_detected. Napi should remain disabled aftere100_down, and only be reenabled when the interface is recovered.This patch also updates
e100_io_error_detectedin order to make it similar to the current versions of theerror_detectedcallback in drivers such as e1000e and ixgbe.Signed-off-by Andre Detsch <[email protected]>
Applied, thank you.
------------------------------------------------------------------------------
OpenSolaris 2009.06 is a cutting edge operating system for enterprises looking to deploy the next generation of Solaris that includes the latest innovations from Sun and the OpenSource community. Download a copy and enjoy capabilities such as Networking, Storage and Virtualization. Go to: http://p.sf.net/sfu/opensolaris-get