From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: "Jeff Garzik" <jgarzik@redhat.com>, David Miller <davem@davemloft.net>
Cc: "Yinghai Lu" <yhlu.kernel@gmail.com>,
"Ingo Molnar" <mingo@elte.hu>,
"Eric W. Biederman" <ebiederm@xmission.com>,
"Andrew Morton" <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org, netdev <netdev@vger.kernel.org>,
"Jesse Barnes" <jbarnes@virtuousgeek.org>,
"Simon Arlott" <simon@fire.lp0.eu>
Subject: [PATCH] forcedeth: Fix kexec regression
Date: Tue, 19 Aug 2008 20:45:53 +0200 [thread overview]
Message-ID: <200808192045.54779.rjw@sisk.pl> (raw)
In-Reply-To: <86802c440808181536j2c214cc3k47e73fd147b4fee1@mail.gmail.com>
From: Rafael J. Wysocki <rjw@sisk.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@sisk.pl>
Tested-by: Yinghai Lu <yhlu.kernel@gmail.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
next prev parent reply other threads:[~2008-08-19 18:44 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-17 6:25 [PATCH] net: forcedeth use pci_choose_state instead of PCI_D3hot - v2 Yinghai Lu
2008-08-17 13:02 ` Rafael J. Wysocki
2008-08-17 16:55 ` Rafael J. Wysocki
2008-08-17 19:16 ` Yinghai Lu
2008-08-17 19:29 ` Rafael J. Wysocki
2008-08-17 19:34 ` Rafael J. Wysocki
2008-08-17 20:58 ` Yinghai Lu
2008-08-17 21:47 ` Rafael J. Wysocki
2008-08-18 10:22 ` Rafael J. Wysocki
2008-08-18 21:50 ` Yinghai Lu
2008-08-18 22:08 ` Rafael J. Wysocki
2008-08-18 22:36 ` Yinghai Lu
2008-08-19 18:45 ` Rafael J. Wysocki [this message]
2008-08-19 20:37 ` [PATCH] forcedeth: Fix kexec regression Andrew Morton
2008-08-19 20:49 ` Rafael J. Wysocki
2008-08-20 7:01 ` Eric W. Biederman
2008-08-20 13:12 ` Rafael J. Wysocki
2008-08-18 22:37 ` [PATCH] net: forcedeth use pci_choose_state instead of PCI_D3hot - v2 Yinghai Lu
2008-08-18 22:42 ` Simon Arlott
2008-08-19 17:58 ` Rafael J. Wysocki
2008-08-19 18:33 ` Simon Arlott
2008-08-19 21:09 ` Rafael J. Wysocki
2008-08-30 19:39 ` Simon Arlott
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200808192045.54779.rjw@sisk.pl \
--to=rjw@sisk.pl \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=ebiederm@xmission.com \
--cc=jbarnes@virtuousgeek.org \
--cc=jgarzik@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=netdev@vger.kernel.org \
--cc=simon@fire.lp0.eu \
--cc=yhlu.kernel@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).