Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef681ce1 authored by Andre Detsch's avatar Andre Detsch Committed by David S. Miller
Browse files

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.

Signed-off-by: default avatarAndre Detsch <adetsch@br.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1d0ebfe7

drivers/net/e100.c

+6 −5
Original line number Diff line number Diff line
@@ -2822,12 +2822,13 @@ static pci_ers_result_t e100_io_error_detected(struct pci_dev *pdev, pci_channel 
	struct 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. */