Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759045AbYHSUkM (ORCPT ); Tue, 19 Aug 2008 16:40:12 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754300AbYHSUj4 (ORCPT ); Tue, 19 Aug 2008 16:39:56 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:53843 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753478AbYHSUjz (ORCPT ); Tue, 19 Aug 2008 16:39:55 -0400 Date: Tue, 19 Aug 2008 13:37:57 -0700 From: Andrew Morton To: "Rafael J. Wysocki" Cc: jgarzik@redhat.com, davem@davemloft.net, yhlu.kernel@gmail.com, mingo@elte.hu, ebiederm@xmission.com, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, jbarnes@virtuousgeek.org, simon@fire.lp0.eu Subject: Re: [PATCH] forcedeth: Fix kexec regression Message-Id: <20080819133757.ce60f364.akpm@linux-foundation.org> In-Reply-To: <200808192045.54779.rjw@sisk.pl> References: <1218954333-12819-1-git-send-email-yhlu.kernel@gmail.com> <200808190008.54743.rjw@sisk.pl> <86802c440808181536j2c214cc3k47e73fd147b4fee1@mail.gmail.com> <200808192045.54779.rjw@sisk.pl> X-Mailer: Sylpheed version 2.2.4 (GTK+ 2.8.20; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3409 Lines: 97 On Tue, 19 Aug 2008 20:45:53 +0200 "Rafael J. Wysocki" wrote: > From: Rafael J. Wysocki > > 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 > Tested-by: Yinghai Lu > --- > 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 hm, I wonder if this has any relation to forcedeth-add-pci_enable_device-to-nv_resume.patch: From: Simon Arlott My NIC stops working after resuming from standby, it's not receiving any interrupts. Commit 25d90810ff49d2a63475776f24c74c6bb49b045f ([netdrvr] forcedeth: reorder suspend/resume code) introduces pci_disable_device to nv_suspend, but there's no corresponding pci_enable_device in nv_resume - so I added one (copied from e1000). This results in interrupts being re-enabled after suspend. However, the NIC (10de:0373) still doesn't work after resume. Cc: Tobias Diedrich Cc: Jeff Garzik Cc: Ayaz Abdulla Signed-off-by: Andrew Morton --- drivers/net/forcedeth.c | 7 +++++++ 1 file changed, 7 insertions(+) diff -puN drivers/net/forcedeth.c~forcedeth-add-pci_enable_device-to-nv_resume drivers/net/forcedeth.c --- a/drivers/net/forcedeth.c~forcedeth-add-pci_enable_device-to-nv_resume +++ a/drivers/net/forcedeth.c @@ -5960,6 +5960,13 @@ static int nv_resume(struct pci_dev *pde pci_set_power_state(pdev, PCI_D0); pci_restore_state(pdev); + rc = pci_enable_device(pdev); + if (rc) { + printk(KERN_ERR "forcedeth: Cannot enable PCI device from suspend\n"); + return rc; + } + pci_set_master(pdev); + /* ack any pending wake events, disable PME */ pci_enable_wake(pdev, PCI_D0, 0); _ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/