Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752514AbYHLC5r (ORCPT ); Mon, 11 Aug 2008 22:57:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751376AbYHLC5g (ORCPT ); Mon, 11 Aug 2008 22:57:36 -0400 Received: from mail.vyatta.com ([216.93.170.194]:41771 "EHLO mail.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750911AbYHLC5f (ORCPT ); Mon, 11 Aug 2008 22:57:35 -0400 X-Spam-Flag: NO X-Spam-Score: -1.446 Date: Mon, 11 Aug 2008 19:57:33 -0700 From: Stephen Hemminger To: "Rafael J. Wysocki" Cc: netdev@vger.kernel.org, Jeff Garzik , Stephen Hemminger , Andrew Morton , LKML Subject: Re: [PATCH] sky2: Fix suspend/hibernation/shutdown regression with WOL enabled (rev. 2) Message-ID: <20080811195733.35e9de14@extreme> In-Reply-To: <200808101930.29574.rjw@sisk.pl> References: <200808092332.29596.rjw@sisk.pl> <20080809235711.12c2f331@extreme> <200808101414.35626.rjw@sisk.pl> <200808101930.29574.rjw@sisk.pl> Organization: Vyatta X-Mailer: Claws Mail 3.3.1 (GTK+ 2.12.9; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2324 Lines: 69 On Sun, 10 Aug 2008 19:30:28 +0200 "Rafael J. Wysocki" wrote: > On Sunday, 10 of August 2008, Rafael J. Wysocki wrote: > > On Sunday, 10 of August 2008, Stephen Hemminger wrote: > > > On Sat, 9 Aug 2008 23:32:28 +0200 > > > "Rafael J. Wysocki" wrote: > > > > [--snip--] > > > > > > The problem is not unique to your chip version, > > > > Well, that's the part I wasn't sure of. > > > > > so patching out the power down is not the correct solution. > > > > Sure. > > But, shouldn't we switch to page 2 before selecting PHY_MARV_PHY_CTRL? Things > work correctly if this is done (patch below). > > Thanks, > Rafael > > > --- > On my test box with the Asus M3A32-MVP main board there is a > regression from 2.6.26 related to suspend, hibernation and > shutdown. Namely, if Wake-on-LAN is enabled with > 'ethtool -s eth0 wol g', the box hangs solid during all of these > operations, while executing either sky2_suspend(), or > sky2_shutdown(). This patch fixes it for me. > > Signed-off-by: Rafael J. Wysocki > --- > drivers/net/sky2.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > Index: linux-2.6/drivers/net/sky2.c > =================================================================== > --- linux-2.6.orig/drivers/net/sky2.c > +++ linux-2.6/drivers/net/sky2.c > @@ -666,11 +666,16 @@ static void sky2_phy_power_down(struct s > > if (hw->chip_id != CHIP_ID_YUKON_EC) { > if (hw->chip_id == CHIP_ID_YUKON_EC_U) { > - ctrl = gm_phy_read(hw, port, PHY_MARV_PHY_CTRL); > + /* select page 2 to access MAC control register */ > + gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 2); > > + ctrl = gm_phy_read(hw, port, PHY_MARV_PHY_CTRL); > /* enable Power Down */ > ctrl |= PHY_M_PC_POW_D_ENA; > gm_phy_write(hw, port, PHY_MARV_PHY_CTRL, ctrl); > + > + /* set page register back to 0 */ > + gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 0); > } > > /* set IEEE compatible Power Down Mode (dev. #4.99) */ Yes, that's better. Acked-by: Stephen Hemminger -- 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/