Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755843AbYHRWnX (ORCPT ); Mon, 18 Aug 2008 18:43:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753310AbYHRWnL (ORCPT ); Mon, 18 Aug 2008 18:43:11 -0400 Received: from proxima.lp0.eu ([85.158.45.36]:60279 "EHLO proxima.lp0.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752599AbYHRWnJ (ORCPT ); Mon, 18 Aug 2008 18:43:09 -0400 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=exim; d=fire.lp0.eu; h=Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:References:In-Reply-To:Content-Type:Content-Transfer-Encoding; b=NxSuHjvuFmiTAt6iEDB5nSxWHebS0KTgB0y2X2Skt5/B7r1lqJACVAXwdE6rRLJvo5EJ2c9nbX/qekoGTTjOYaWM6nEjSppLlRzlR0Zsja/vQJGQ1huC45gjdSzN9hBx; Message-ID: <48A9FAD8.9000503@simon.arlott.org.uk> Date: Mon, 18 Aug 2008 23:42:32 +0100 From: Simon Arlott User-Agent: Thunderbird 2.0.0.16 (X11/20080726) MIME-Version: 1.0 To: "Rafael J. Wysocki" CC: Yinghai Lu , Jeff Garzik , Ingo Molnar , "Eric W. Biederman" , Andrew Morton , linux-kernel@vger.kernel.org, netdev , Jesse Barnes Subject: Re: [PATCH] net: forcedeth use pci_choose_state instead of PCI_D3hot - v2 References: <1218954333-12819-1-git-send-email-yhlu.kernel@gmail.com> <200808181222.49576.rjw@sisk.pl> <86802c440808181450y5e908b6eo3e6d54bfca6f2d8f@mail.gmail.com> <200808190008.54743.rjw@sisk.pl> In-Reply-To: <200808190008.54743.rjw@sisk.pl> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2185 Lines: 55 On 18/08/08 23:08, Rafael J. Wysocki wrote: > 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. I tried to test that patch but even without it standby/resume has stopped working: http://img89.imageshack.us/img89/1861/1005552wb5.jpg (standby, tainted) http://img89.imageshack.us/img89/5409/1005561ys2.jpg (resume) http://img503.imageshack.us/img503/8720/1005571bc0.jpg (resume) http://img135.imageshack.us/img135/5048/1005572be3.jpg (standby) -- Simon Arlott -- 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/