lkml.org 
[lkml]   [2008]   [Sep]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    SubjectRe: Regression in 2.6.27-rc7: Wake On LAN with sky2 broken
    Date
    On Thursday, 25 of September 2008, Tino Keitel wrote:
    > Hi,
    >
    > I just found a method how I can enable WOL again:
    >
    > echo enabled >
    > /sys/devices/pci0000:00/0000:00:1c.0/0000:01:00.0/power/wakeup
    >
    > This device is the NIC device, of cause.

    I guess the box didn't hang during suspend with this setting?

    If that's correct, please test the patch below.

    > I already had another case (EHCI) where I needed to do this to be able
    > to wake the computer up with the USB keyboard. It seems like 2.6.27
    > behaves different here compared to 2.6.26, and things that worked with
    > 2.6.26 need manual fixing to work again. Or did I make something wrong?

    No, you didn't.

    The behavior was changed by the PCI wake-up patches that fixed a couple of
    problems and I'd like to fix all of the cases when the new behavior causes
    issues like this to happen.

    I'll send you a patch for the EHCI case later today.

    Thanks,
    Rafael

    ---
    sky2: Fix WOL regression

    Since dev->power.should_wakeup bit is used by the PCI core to
    decide whether the device should wake up the system from sleep
    states, set/unset this bit whenever WOL is enabled/disabled using
    sky2_set_wol().

    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    ---

    drivers/net/sky2.c | 34 ++++++++++------------------------
    1 file changed, 10 insertions(+), 24 deletions(-)

    diff -puN drivers/net/sky2.c~skty2-adapt-to-the-reworked-pci-pm drivers/net/sky2.c
    --- a/drivers/net/sky2.c~skty2-adapt-to-the-reworked-pci-pm
    +++ a/drivers/net/sky2.c
    @@ -3034,7 +3034,8 @@ static int sky2_set_wol(struct net_devic
    struct sky2_port *sky2 = netdev_priv(dev);
    struct sky2_hw *hw = sky2->hw;

    - if (wol->wolopts & ~sky2_wol_supported(sky2->hw))
    + if ((wol->wolopts & ~sky2_wol_supported(sky2->hw))
    + || !device_can_wakeup(&hw->pdev->dev))
    return -EOPNOTSUPP;

    sky2->wol = wol->wolopts;
    @@ -3045,6 +3046,8 @@ static int sky2_set_wol(struct net_devic
    sky2_write32(hw, B0_CTST, sky2->wol
    ? Y2_HW_WOL_ON : Y2_HW_WOL_OFF);

    + device_set_wakeup_enable(&hw->pdev->dev, sky2->wol);
    +
    if (!netif_running(dev))
    sky2_wol_init(sky2);
    return 0;
    @@ -4314,7 +4305,7 @@ static int __devinit sky2_probe(struct p
    }
    }

    - wol_default = pci_wake_enabled(pdev) ? WAKE_MAGIC : 0;
    + wol_default = device_may_wakeup(&pdev->dev) ? WAKE_MAGIC : 0;

    err = -ENOMEM;
    hw = kzalloc(sizeof(*hw), GFP_KERNEL);


    \
     
     \ /
      Last update: 2008-09-25 22:35    [W:0.024 / U:31.760 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site