lkml.org 
[lkml]   [2008]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH] net: forcedeth use pci_choose_state instead of PCI_D3hot - v2
Date
On Tuesday, 19 of August 2008, Simon Arlott wrote:
> On 19/08/08 18:58, Rafael J. Wysocki wrote:
> > 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?
>
> linus-2.6 a7f5aaf36ded825477c4d7167cc6eb1bcdc63191
>
> I've reverted to 2b12a4c524812fb3f6ee590a02e65b95c8c32229 where standby/resume still
> works and applied the above patch plus the pci_enable_device patch. It still doesn't
> work after resume if MSI is enabled.

My patch only affects the shutdown code path and is not related to
suspend/standby etc.

Could you identify the commit that broke standby/resume for you between
2b12a4c524812fb3f6ee590a02e65b95c8c32229 and
a7f5aaf36ded825477c4d7167cc6eb1bcdc63191 ? It looks like that should be
bisectable.

Thanks,
Rafael


\
 
 \ /
  Last update: 2008-08-19 23:09    [W:0.046 / U:24.156 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site