From patchwork Wed Dec 9 10:08:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corinna Vinschen X-Patchwork-Id: 554442 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 842911401CD for ; Wed, 9 Dec 2015 21:28:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754347AbbLIK2I (ORCPT ); Wed, 9 Dec 2015 05:28:08 -0500 Received: from mail-n.franken.de ([193.175.24.27]:47113 "EHLO mail-n.franken.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754266AbbLIK2F (ORCPT ); Wed, 9 Dec 2015 05:28:05 -0500 X-Greylist: delayed 1151 seconds by postgrey-1.27 at vger.kernel.org; Wed, 09 Dec 2015 05:28:05 EST Received: from aqua.hirmke.de (ipbcc02fe8.dynamic.kabel-deutschland.de [188.192.47.232]) (Authenticated sender: aquarius) by mail-n.franken.de (Postfix) with ESMTP id F294A1C0B3FDE; Wed, 9 Dec 2015 11:08:50 +0100 (CET) Received: from calimero.vinschen.de (calimero.vinschen.de [192.168.129.6]) by aqua.hirmke.de (Postfix) with ESMTP id 79EFF5E01D5; Wed, 9 Dec 2015 11:08:50 +0100 (CET) Received: by calimero.vinschen.de (Postfix, from userid 500) id 6E3C5A80605; Wed, 9 Dec 2015 11:08:50 +0100 (CET) From: Corinna Vinschen To: netdev@vger.kernel.org Cc: Francois Romieu , Realtek linux nic maintainers Subject: [PATCH] r8169: Don't claim WoL works if LanWake flag is not set Date: Wed, 9 Dec 2015 11:08:50 +0100 Message-Id: <1449655730-3328-1-git-send-email-vinschen@redhat.com> X-Mailer: git-send-email 2.1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The __rtl8169_get_wol function returns the state of the various WoL method bits (MagicPaket, Unicast, etc.). While the PMEnable bit is tested at entry, the function doesn't check the LanWake flag. Even if any one of the WoL bits is set, WoL is deactivated as a whole if LanWake isn't set. The return value from __rtl8169_get_wol doesn't reflect that. Unfortunately BIOS exist (HP T620) which set the MagicPaket bit to 1 but the LanWake flag to 0 when switching on WoL in the BIOS. On those machines, ethtool wrongly claims that WoL via MagicPaket is activated while in fact it isn't, unless you explicitely called This patch is supposed to fix this behaviour. If LanWake is 0, the function now returns 0. Thus ethtool correctly reports "Wake-on: d". The patch is against Dave's net-next tree. Signed-off-by: Corinna Vinschen --- drivers/net/ethernet/realtek/r8169.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 79ef799..813ad2b 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -1705,6 +1705,10 @@ static u32 __rtl8169_get_wol(struct rtl8169_private *tp) if (!(options & PMEnable)) return 0; + options = RTL_R8(Config5); + if (!(options & LanWake)) + return 0; + options = RTL_R8(Config3); if (options & LinkUp) wolopts |= WAKE_PHY;