[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <200903181614.08724.rjw@sisk.pl>
Date: Wed, 18 Mar 2009 16:14:08 +0100
From: "Rafael J. Wysocki" <rjw@...k.pl>
To: "Tomi Orava" <tomimo@...rcle.nullnet.fi>
Cc: "Andrew Morton" <akpm@...ux-foundation.org>,
bugme-daemon@...zilla.kernel.org, netdev@...r.kernel.org,
"Stephen Hemminger" <shemminger@...ux-foundation.org>
Subject: Re: [Bugme-new] [Bug 12886] New: skge wake on lan
On Wednesday 18 March 2009, Tomi Orava wrote:
> Hi again,
>
> >> The previously mentioned patch reverted the ethtool output is
> >> (ie. this is a working 2.6.28.7 system atm):
> >
> > I wonder what it shows if that commit is not reverted (in fact it is
> > necessary
> > on some other systems for things to work correctly).
>
> Ethtool eth0 shows on latest 2.6.28.8 kernel with your manually merged
> patch below:
Hm, are you sure the commit in question _is_ in 2.6.28.y? I can't see it in
there. It is in the current Linus' tree, but not in v2.6.28 and surely not in
-stable. Do you use a distro kernel?
> Settings for eth0:
> Supported ports: [ TP ]
> Supported link modes: 10baseT/Half 10baseT/Full
> 100baseT/Half 100baseT/Full
> 1000baseT/Half 1000baseT/Full
> Supports auto-negotiation: Yes
> Advertised link modes: 10baseT/Half 10baseT/Full
> 100baseT/Half 100baseT/Full
> 1000baseT/Half 1000baseT/Full
> Advertised auto-negotiation: Yes
> Speed: 1000Mb/s
> Duplex: Full
> Port: Twisted Pair
> PHYAD: 0
> Transceiver: internal
> Auto-negotiation: on
> Supports Wake-on: pg
> Wake-on: g
> Current message level: 0x00000037 (55)
> Link detected: yes
>
> Ie. looks like exactly the same as with the commit reverted.
OK
> >
> > Also, please check if the appended patch helps (of course, without
> > reverting
> > the commit).
> >
> > ---
> > drivers/net/skge.c | 5 +++--
> > 1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > Index: linux-2.6/drivers/net/skge.c
> > ===================================================================
> > --- linux-2.6.orig/drivers/net/skge.c
> > +++ linux-2.6/drivers/net/skge.c
> > @@ -3856,8 +3856,9 @@ static struct net_device *skge_devinit(s
> > skge->speed = -1;
> > skge->advertising = skge_supported_modes(hw);
> >
> > - if (device_may_wakeup(&hw->pdev->dev))
> > - skge->wol = wol_supported(hw) & WAKE_MAGIC;
> > + skge->wol = wol_supported(hw) & WAKE_MAGIC;
> > + if (skge->wol && device_can_wakeup(&hw->pdev->dev))
> > + device_set_wakeup_enable(&hw->pdev->dev, true);
> >
> > hw->dev[port] = dev;
>
> Hmm, looks like this patch is against a 2.6.28.8 tree with the commit
> reverted. I merged the couple lines as following.
>
> line 3859:
>
> // if (pci_wake_enabled(hw->pdev))
> // skge->wol = wol_supported(hw) & WAKE_MAGIC;
> skge->wol = wol_supported(hw) & WAKE_MAGIC;
> if (skge->wol && device_can_wakeup(&hw->pdev->dev))
> device_set_wakeup_enable(&hw->pdev->dev, true);
>
> and this really seems to fix the problem. The system is able to wake
> up via etherwake just fine.
Well, that's because commit 5177b3240a6608fc0c9c05cc32f4855c6540f8d5 changed
the default from "wake-up enabled by default" to "wake-up disabled by default".
The latter is safer IMO, but I'll prepare a (better) patch to change it back to
the old behavior.
You should be able to set up WoL by running 'ethtool -s eth0 wol g' from your
init scripts even without reverting the patch. Please verify if that works.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists