Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756043AbZDDNHr (ORCPT ); Sat, 4 Apr 2009 09:07:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753302AbZDDNHf (ORCPT ); Sat, 4 Apr 2009 09:07:35 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:37430 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751550AbZDDNHe (ORCPT ); Sat, 4 Apr 2009 09:07:34 -0400 From: "Rafael J. Wysocki" To: "Tvrtko A. Ursulin" Subject: Re: [Regression in 2.6.29] forcedeth doesn't work after resume from hibernation (was: Re: Resume after hibernation regression in 2.6.29) Date: Sat, 4 Apr 2009 15:07:41 +0200 User-Agent: KMail/1.11.2 (Linux/2.6.29-rjw; KDE/4.2.2; x86_64; ; ) Cc: Ed Swierk , Pavel Machek , "linux-pm" , kernel list , Tobias Diedrich , Ayaz Abdulla , netdev , Arthur Jones , Andrew Morton , "David S. Miller" , stable@kernel.org References: <200903261920.32173.tvrtko@ursulin.net> <1238780473.19305.3.camel@localhost.localdomain> <200904041404.24616.tvrtko@ursulin.net> In-Reply-To: <200904041404.24616.tvrtko@ursulin.net> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200904041507.42927.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2840 Lines: 70 On Saturday 04 April 2009, Tvrtko A. Ursulin wrote: > On Friday 03 April 2009 18:41:12 Ed Swierk wrote: > > On Fri, 2009-04-03 at 08:24 -0700, Ed Swierk wrote: > > > On Fri, Mar 27, 2009 at 1:09 PM, Rafael J. Wysocki wrote: > > > > I was able to reproduce the problem and identify the commit that broke > > > > the resume of forcedeth, which turned out to be: > > > > > > > > commit cb52deba12f27af90a46d2f8667a64888118a888 > > > > Author: Ed Swierk > > > > Date: Mon Dec 1 12:24:43 2008 +0000 > > > > > > > > forcedeth: power down phy when interface is down > > > > > > > > Signed-off-by: Ed Swierk > > > > Tested-by: Arthur Jones > > > > Signed-off-by: Andrew Morton > > > > Signed-off-by: David S. Miller > > > > > > > > Since I have no slightest idea of what this commit is supposed to > > > > achieve, I can only ask for reverting it. It reverts cleanly, BTW. > > > > > > The change causes forcedeth to bring down the physical link when an > > > interface goes down; leaving it up causes the switch at the other end > > > to think the port is still active, with potentially random speed and > > > duplex parameters. > > > > > > It's possible that the forcedeth driver needs to reset autonegotiation > > > after bringing it up the link again. > > > > > > Can you please try this on a 2.6.29 kernel that's exhibiting the > > > symptoms you describe, after resuming the machine from hibernation: > > > > > > ethtool -s eth1 autoneg off speed 100 duplex full > > > ethtool -s eth1 autoneg on > > > > > > This should reset autonegotiation manually and bring the link. Let me > > > know how it goes. > > > > Also please try this patch; it fixes the problem on my test system (a > > DFI board with an nVidia MCP55). > > > > Signed-off-by: Ed Swierk > > -- > > --- linux-2.6.29.x86_64/drivers/net/forcedeth.c.orig 2009-03-23 > > 16:12:14.000000000 -0700 +++ > > linux-2.6.29.x86_64/drivers/net/forcedeth.c 2009-04-03 10:11:26.839614710 > > -0700 @@ -5995,6 +5995,9 @@ > > for (i = 0;i <= np->register_size/sizeof(u32); i++) > > writel(np->saved_config_space[i], base+i*sizeof(u32)); > > > > + /* restore phy state, including autoneg */ > > + phy_init(dev); > > + > > netif_device_attach(dev); > > if (netif_running(dev)) { > > rc = nv_open(dev); > > Works for me on MCP73 as well. Great, thanks for testing. I think the patch should go to Linus ASAP and to -stable as a regression fix. Thanks, Rafael -- 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/