Patchwork [Regression,in,2.6.29] forcedeth doesn't work after resume from hibernation (was: Re: Resume after hibernation regression in 2.6.29)

login
register
mail settings
Submitter Ed Swierk
Date April 6, 2009, 2:03 p.m.
Message ID <1239026612.23068.1.camel@localhost.localdomain>
Download mbox | patch
Permalink /patch/25636/
State Accepted
Delegated to: David Miller
Headers show

Comments

Ed Swierk - April 6, 2009, 2:03 p.m.
On Sat, 2009-04-04 at 16:54 -0700, David Miller wrote:
> Please send a version of this patch that actually applies to
> Linus's tree, the line numbers et al. are a lot different
> now.
> 
> I'll backport and submit that to -stable.
> 
> Thanks.

Reset phy state on resume, fixing a regression caused by powering down
the phy on hibernate.

Signed-off-by: Ed Swierk <eswierk@aristanetworks.com>
---


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - April 7, 2009, 12:49 a.m.
From: Ed Swierk <eswierk@aristanetworks.com>
Date: Mon, 06 Apr 2009 07:03:32 -0700

> Reset phy state on resume, fixing a regression caused by powering down
> the phy on hibernate.
> 
> Signed-off-by: Ed Swierk <eswierk@aristanetworks.com>

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index a858c6f..663a7b3 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -6117,6 +6117,9 @@  static int nv_resume(struct pci_dev *pdev)
 
 	pci_write_config_dword(pdev, NV_MSI_PRIV_OFFSET, NV_MSI_PRIV_VALUE);
 
+	/* restore phy state, including autoneg */
+	phy_init(dev);
+
 	netif_device_attach(dev);
 	if (netif_running(dev)) {
 		rc = nv_open(dev);