From patchwork Tue Aug 13 20:19:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Wu X-Patchwork-Id: 266915 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 CC4CD2C00F2 for ; Wed, 14 Aug 2013 06:19:16 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758959Ab3HMUTN (ORCPT ); Tue, 13 Aug 2013 16:19:13 -0400 Received: from mail-wi0-f182.google.com ([209.85.212.182]:59745 "EHLO mail-wi0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758679Ab3HMUTM (ORCPT ); Tue, 13 Aug 2013 16:19:12 -0400 Received: by mail-wi0-f182.google.com with SMTP id hi8so1126301wib.9 for ; Tue, 13 Aug 2013 13:19:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=+J9P5tX38wc4zTqqV1Cb/rrzMLd2xSYXyUoaa5YZ908=; b=HDAB131kj28HuJlnDj8YEpzoIDiWVyG3ejU4bo0/WYUtfdf15vuOHoWVOpKrwi8p6Y 03iTAtUuOn8aY0Le5MsHY/+dAfvNRzT/EUbKA8QsjirRBX0N8DY1T9CjNp2ycgQKroU7 f94nVIuowMTp5VMmQy+1unHvMLaIdP1v9teplHV9cFUPeHnyLGpdHVP/X4ZMpl+N18kk qi/LphByagydMMdFJUE50nEDSkCZz4UbFWEdfJjSZSTQtb4SC1D0irlfSTo1LNj9tTMt EaJG+8RUgcrSoiRUMbnOKOnpeqg/4d/4GrO15/4eOCVf7Pbv4LSng/Wug4UgyOmnrnrh URkw== X-Received: by 10.194.121.65 with SMTP id li1mr4354774wjb.24.1376425150933; Tue, 13 Aug 2013 13:19:10 -0700 (PDT) Received: from localhost.localdomain (ip4da018ae.direct-adsl.nl. [77.160.24.174]) by mx.google.com with ESMTPSA id gg10sm5514612wib.1.2013.08.13.13.19.08 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 13 Aug 2013 13:19:10 -0700 (PDT) From: Peter Wu To: Francois Romieu Cc: netdev@vger.kernel.org, nic_swsd@realtek.com, lekensteyn@gmail.com Subject: [PATCH] r8169: remember WOL preferences on driver load Date: Tue, 13 Aug 2013 22:19:05 +0200 Message-Id: <1376425145-30142-1-git-send-email-lekensteyn@gmail.com> X-Mailer: git-send-email 1.8.3.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Do not clear Broadcast/Multicast/Unicast Wake Flag or LanWake in Config5. This is necessary to preserve WOL state when the driver is loaded. The r8168 vendor driver used to write to both Config1 and Config5, but in recent versions, this is commented out. Here we keep writing PMEnable to Config1 because there may be older chips where PMEnable is not sticky. Signed-off-by: Peter Wu --- drivers/net/ethernet/realtek/r8169.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 28af01c..7bdf322 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -7093,7 +7093,6 @@ rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) RTL_W8(Cfg9346, Cfg9346_Unlock); RTL_W8(Config1, RTL_R8(Config1) | PMEnable); - RTL_W8(Config5, RTL_R8(Config5) & PMEStatus); if ((RTL_R8(Config3) & (LinkUp | MagicPacket)) != 0) tp->features |= RTL_FEATURE_WOL; if ((RTL_R8(Config5) & (UWF | BWF | MWF)) != 0)