From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87421C169C4 for ; Tue, 29 Jan 2019 21:21:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4C00F2087E for ; Tue, 29 Jan 2019 21:21:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Os9i9Avg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729568AbfA2VU7 (ORCPT ); Tue, 29 Jan 2019 16:20:59 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:37730 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728624AbfA2VU6 (ORCPT ); Tue, 29 Jan 2019 16:20:58 -0500 Received: by mail-wm1-f65.google.com with SMTP id g67so19365241wmd.2 for ; Tue, 29 Jan 2019 13:20:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=EflYCpmYJJ/UU/CvTMU8BCM7gSBYiCI4NnFDSzdCYUA=; b=Os9i9AvgD8Kl3qwK/SxtVNsa6N21x8R5XoSewx3zX/LohsuBF7GNPJl3IpF5P2MLQZ XKwr4yT4Er8xU4zZZy6S/SZ3EEevZaPqHpgjdud2qZFBIEychpb4qvZe0t/jTq3rrkQc qcjfMT7V+w1H6Vga7pKk2jWfSUf7j3GqetDKKycuUxeB0HAvE7o1Ni+gcxA7wOJFykEE OxvCkEJHLRLcnx8R8/gLEasObesb/vQ+M/KTMvwaYVxcnDBVEx3DdsczEg44ejGULGcN Z7D0V/lmmh7M9Njvoo0+Ezzxg6Bcp+R8CCAkDSLnylLkAPHD9WX+TVEHYwCJ8dn2qTfG KNxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=EflYCpmYJJ/UU/CvTMU8BCM7gSBYiCI4NnFDSzdCYUA=; b=drOmpHjQraogXBXcdMzyq7dRa0532yJDE5kn1AhJ3lIHl81m593feg4b/SjAKo46ZJ NBNcB+2Pghh7bmqDJLoVMU3cbc2blj2KM/KfcpvqH9OzjVqGAppHh0XtGwitH1X46DEi 7cJrByKICt67ov+9AkB7TimghsWgKcCUg4OXlWt3EvP7ulCPoGVXuOswtnGc4kOSRImg 9/xWTFFX1KVKKYYMVbZ3ANdY8ehocAmLMjd1d2AGRiB/NAVAhdMmxzgXZok0S7BlTjGy 3BrtIJ3Y0coqS6QYHUVlJnZWRONR6biFJbR7CxbJrPvH/TyfCVR/t+Rtu3eL/5ulqEHm c1ug== X-Gm-Message-State: AJcUukfOYkirkslj0z1LSRIPE17YLBWrbj8uYc5vf7Qpg9+YXia8W8ED CXS83Gwiu6t9VxCvwkxfsSHyOsYH X-Google-Smtp-Source: ALg8bN6FsrlBhrCKjK2VMYodboDh3x1Xf7CUB+UujJfaxXDX08tLj+JRNzN+Pp1+GoAYsetjTEQJGg== X-Received: by 2002:a1c:96ce:: with SMTP id y197mr23552052wmd.36.1548796856203; Tue, 29 Jan 2019 13:20:56 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:ec14:5b59:80e3:7bca? (p200300EA8BF1E200EC145B5980E37BCA.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:ec14:5b59:80e3:7bca]) by smtp.googlemail.com with ESMTPSA id b12sm92353947wrt.17.2019.01.29.13.20.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Jan 2019 13:20:54 -0800 (PST) Subject: Re: WoL broken in r8169.c since kernel 4.19 To: Marc Haber Cc: "netdev@vger.kernel.org" References: <20190126135640.GD27062@torres.zugschlus.de> <1a17454a-3017-7283-89d6-206681ca4c47@gmail.com> <20190126170752.GE27062@torres.zugschlus.de> <6ecafe07-3278-a9c4-d76d-971c0df26ce8@gmail.com> <20190127205555.GF27062@torres.zugschlus.de> <64b22f62-ca8a-caee-5a39-f06ffe6598d1@gmail.com> <20190128073010.GG27062@torres.zugschlus.de> <20190128202235.GH27062@torres.zugschlus.de> <20190129073253.GJ27062@torres.zugschlus.de> <20190129153553.GL27062@torres.zugschlus.de> From: Heiner Kallweit Message-ID: <638767f7-5701-309b-97b1-a83f774afbab@gmail.com> Date: Tue, 29 Jan 2019 22:20:48 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <20190129153553.GL27062@torres.zugschlus.de> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi Marc, one more attempt, could you please test the following with 4.19 or 4.20 (w/o the other debug patches) ? Rgds, Heiner --- drivers/net/ethernet/realtek/r8169.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 3e650bd9e..2dab28115 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -1371,6 +1371,8 @@ static void rtl_link_chg_patch(struct rtl8169_private *tp) #define WAKE_ANY (WAKE_PHY | WAKE_MAGIC | WAKE_UCAST | WAKE_BCAST | WAKE_MCAST) +/* Don't delete it completely, in case we need to re-enable it */ +#if 0 static u32 __rtl8169_get_wol(struct rtl8169_private *tp) { u8 options; @@ -1405,6 +1407,7 @@ static u32 __rtl8169_get_wol(struct rtl8169_private *tp) return wolopts; } +#endif static void rtl8169_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol) { @@ -4284,7 +4287,7 @@ static void rtl_wol_suspend_quirk(struct rtl8169_private *tp) static bool rtl_wol_pll_power_down(struct rtl8169_private *tp) { - if (!__rtl8169_get_wol(tp)) + if (!device_may_wakeup(tp_to_dev(tp))) return false; phy_speed_down(tp->phydev, false); @@ -7441,8 +7444,6 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) return rc; } - tp->saved_wolopts = __rtl8169_get_wol(tp); - mutex_init(&tp->wk.mutex); INIT_WORK(&tp->wk.work, rtl_task); u64_stats_init(&tp->rx_stats.syncp); -- 2.20.1 On 29.01.2019 16:35, Marc Haber wrote: > Hi, > > after having a good night's sleep over that, it's obviously a merge > commit which cannot easily be reverted. How would I continue after > identifying a merge commit as the culprit? > > On Tue, Jan 29, 2019 at 08:32:53AM +0100, Marc Haber wrote: >> According to bisect, the first bad commit is >> 19725496da5602b401eae389736ab00d1817e264 >> >> commit 19725496da5602b401eae389736ab00d1817e264 >> Merge: aea5f654e6b7 9981b4fb8684 > > git diff aea5f654e6b7..19725496da5602b401eae389736ab00d1817e264, > filtered for r8169 looks manageable: > > --- a/drivers/net/ethernet/realtek/r8169.c > +++ b/drivers/net/ethernet/realtek/r8169.c > @@ -7396,8 +7396,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struc > return rc; > } > > - /* override BIOS settings, use userspace tools to enable WOL */ > - __rtl8169_set_wol(tp, 0); > + tp->saved_wolopts = __rtl8169_get_wol(tp); > > mutex_init(&tp->wk.mutex); > u64_stats_init(&tp->rx_stats.syncp); > > but the other one seems unmanageably big: > > [18/5009]mh@fan:~/linux/git/linux (master % u=) $ git diff 9981b4fb8684..19725496da5602b401eae389736ab00d1817e264 -- drivers/net/ethernet/realtek/r8169.c | diffstat > r8169.c | 815 ++++++++++++++++++---------------------------------------------- > 1 file changed, 234 insertions(+), 581 deletions(-) > [19/5009]mh@fan:~/linux/git/linux (master % u=) $ > > ------- > But, indeed, adding the call to __rtl8169_set_wol(tp, 0) fixes the issue > for me and the machine now wakes up from StR on a magic packet without > having to go through strange ethtool motions. > ------- > > Would that code change be suitable for the official kernel cod? > > Greetings > Marc >