From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758257AbYHRWFz (ORCPT ); Mon, 18 Aug 2008 18:05:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754312AbYHRWFn (ORCPT ); Mon, 18 Aug 2008 18:05:43 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:47814 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754867AbYHRWFm (ORCPT ); Mon, 18 Aug 2008 18:05:42 -0400 From: "Rafael J. Wysocki" To: "Yinghai Lu" Subject: Re: [PATCH] net: forcedeth use pci_choose_state instead of PCI_D3hot - v2 Date: Tue, 19 Aug 2008 00:08:53 +0200 User-Agent: KMail/1.9.6 (enterprise 20070904.708012) Cc: "Jeff Garzik" , "Ingo Molnar" , "Eric W. Biederman" , "Andrew Morton" , linux-kernel@vger.kernel.org, netdev , "Jesse Barnes" , Simon Arlott References: <1218954333-12819-1-git-send-email-yhlu.kernel@gmail.com> <200808181222.49576.rjw@sisk.pl> <86802c440808181450y5e908b6eo3e6d54bfca6f2d8f@mail.gmail.com> In-Reply-To: <86802c440808181450y5e908b6eo3e6d54bfca6f2d8f@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200808190008.54743.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Monday, 18 of August 2008, Yinghai Lu wrote: > On Mon, Aug 18, 2008 at 3:22 AM, Rafael J. Wysocki wrote: > > >> > > 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 > >> > > > >> > > > > Does the last patch work for you BTW? > > > > it works. OK, thanks for testing. I think we can use it as a quick fix for 2.6.27. Do you agree? Still, it would be helpful to verify if this is the same MSI issue reported by Simon. Thanks, Rafael