Re: [PATCH] net: forcedeth use pci_choose_state instead of PCI_D3hot - v2

["Rafael J. Wysocki" <rjw@sisk.pl>]

On Tuesday, 19 of August 2008, Simon Arlott wrote:
> 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 <rjw@sisk.pl> 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:

Which kernel is this?

> 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)

Rafael