Messages in this thread | | | From | "Rafael J. Wysocki" <> | Subject | Re: [PATCH] net: forcedeth use pci_choose_state instead of PCI_D3hot - v2 | Date | Sun, 17 Aug 2008 15:02:01 +0200 |
| |
On Sunday, 17 of August 2008, Yinghai Lu wrote: > after > > | commit f735a2a1a4f2a0f5cd823ce323e82675990469e2 > | Author: Tobias Diedrich <ranma+kernel@tdiedrich.de> > | Date: Sun May 18 15:02:37 2008 +0200 > | > | [netdrvr] forcedeth: setup wake-on-lan before shutting down > | > | When hibernating in 'shutdown' mode, after saving the image the suspend hook > | is not called again. > | However, if the device is in promiscous mode, wake-on-lan will not work. > | This adds a shutdown hook to setup wake-on-lan before the final shutdown. > | > | Signed-off-by: Tobias Diedrich <ranma+kernel@tdiedrich.de> > | Signed-off-by: Jeff Garzik <jgarzik@redhat.com> > > my servers with nvidia mcp55 nic doesn't work with msi in second kernel by kexec > > after remove pci_set_power_state(, PCI_D3hot) that nic/msi will work again. > > check with e1000 is using pci_choose_state in _shutdown. > > So change that pci_choose_state(pdev, ...), and it works.
Well, this doesn't look like a good solution to me, because you're putting PMSG_SUSPEND in there, which is not correct for shutdown. The right thing to do would be to avoid changing the device power state if nv_shutdown() is used for kexec or to rework the initialization of the adapter to handle the case when it's initially in D3.
Does it help if you just remove the pci_set_power_state(pdev, PCI_D3hot) altogether?
> Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> > > --- > drivers/net/forcedeth.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > Index: linux-2.6/drivers/net/forcedeth.c > =================================================================== > --- linux-2.6.orig/drivers/net/forcedeth.c > +++ linux-2.6/drivers/net/forcedeth.c > @@ -5988,7 +5988,7 @@ static void nv_shutdown(struct pci_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); > + pci_set_power_state(pdev, pci_choose_state(pdev, PMSG_SUSPEND)); > } > #else > #define nv_suspend NULL
Thanks, Rafael
| |