Commit 3cb5599a authored Sep 05, 2008 by Rafael J. Wysocki Committed by Linus Torvalds Sep 05, 2008

forcedeth: fix kexec regression

Fix regression tracked as http://bugzilla.kernel.org/show_bug.cgi?id=11361
and caused by commit f735a2a1 ("[netdrvr]
forcedeth: setup wake-on-lan before shutting down") that makes network
adapters integrated into the NVidia MCP55 chipsets fail to work in kexeced
kernels.  The problem appears to be that if the adapter is put into D3_hot
during ->shutdown(), it cannot be brought back into D0 after kexec (ref.
http://marc.info/?l=linux-kernel&m=121900062814967&w=4

).  Therefore, only
put forcedeth into D3 during ->shutdown() if the system is to be powered
off.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Tested-by: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: Ayaz Abdulla <aabdulla@nvidia.com>
Acked-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 11d55d2c

drivers/net/forcedeth.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -5975,11 +5975,13 @@ static void nv_shutdown(struct pci_dev *pdev)
		if (netif_running(dev))
		nv_close(dev);

		pci_enable_wake(pdev, PCI_D3hot, np->wolenabled);
		pci_enable_wake(pdev, PCI_D3cold, np->wolenabled);
		pci_disable_device(pdev);
		if (system_state == SYSTEM_POWER_OFF) {
		if (pci_enable_wake(pdev, PCI_D3cold, np->wolenabled))
		pci_enable_wake(pdev, PCI_D3hot, np->wolenabled);
		pci_set_power_state(pdev, PCI_D3hot);
		}
		}
		#else
		#define nv_suspend NULL
		#define nv_shutdown NULL

Admin message