[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <200808192045.54779.rjw@sisk.pl>
Date: Tue, 19 Aug 2008 20:45:53 +0200
From: "Rafael J. Wysocki" <rjw@...k.pl>
To: "Jeff Garzik" <jgarzik@...hat.com>,
David Miller <davem@...emloft.net>
Cc: "Yinghai Lu" <yhlu.kernel@...il.com>,
"Ingo Molnar" <mingo@...e.hu>,
"Eric W. Biederman" <ebiederm@...ssion.com>,
"Andrew Morton" <akpm@...ux-foundation.org>,
linux-kernel@...r.kernel.org, netdev <netdev@...r.kernel.org>,
"Jesse Barnes" <jbarnes@...tuousgeek.org>,
"Simon Arlott" <simon@...e.lp0.eu>
Subject: [PATCH] forcedeth: Fix kexec regression
From: Rafael J. Wysocki <rjw@...k.pl>
forcedeth: Fix kexec regression
Fix regression tracked as
http://bugzilla.kernel.org/show_bug.cgi?id=11361 and
caused by commit f735a2a1a4f2a0f5cd823ce323e82675990469e2
("[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@...k.pl>
Tested-by: Yinghai Lu <yhlu.kernel@...il.com>
---
drivers/net/forcedeth.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
Index: linux-2.6/drivers/net/forcedeth.c
===================================================================
--- linux-2.6.orig/drivers/net/forcedeth.c
+++ linux-2.6/drivers/net/forcedeth.c
@@ -5975,10 +5975,12 @@ static void nv_shutdown(struct pci_dev *
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);
- pci_set_power_state(pdev, PCI_D3hot);
+ 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
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists