From patchwork Sat May 19 08:29:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 916785 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MYGmb4V6"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40nyrt6Yg0z9s52 for ; Sat, 19 May 2018 18:29:50 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752026AbeESI3p (ORCPT ); Sat, 19 May 2018 04:29:45 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:54457 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751914AbeESI3m (ORCPT ); Sat, 19 May 2018 04:29:42 -0400 Received: by mail-wm0-f67.google.com with SMTP id f6-v6so17625892wmc.4 for ; Sat, 19 May 2018 01:29:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=TpkDxp6zfS5yBos6PLES2Trjxw/74Gl9jgXYuldO7/Q=; b=MYGmb4V6wqUz5oIdIY3aukdhDAeFGMoar2Xk3iT9nm3W91u2CETMN49Wf1uzv1Ydb9 ORLYKnx70YLdWOYg8wFhEszfgVL/TDa3yxPDsG6aN/1vlm+ZpQPCZsTirj4hQznvbyQo MgBWfftUrSxbLDi8LMDDGXCQilJgtZeOrGYbx6EysbKpDA87Y41OV4ngugxncZvSFO6Y hk8E8cSNv3Yfa8kCdXcj5UvyrTKF+o/ctEgaER/UPS+XlvFpbA/UF3bLsNtO5iWXamiI Q7CgPWUm5C7nNax89VR3NCWvFmYefqnHAtywYN3hy8rdw79Q/5F3EJr3iP48hGr94/id FWcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=TpkDxp6zfS5yBos6PLES2Trjxw/74Gl9jgXYuldO7/Q=; b=CIbfRYOUzxV4oJLyY3GjYs3DpRFa2m1uP8/7N4siQkV/JrbyRwcQWYbky0vmC/1Nu7 7BU5RQnt3b/YWe3Lus9aa2yeFcvJbuntyTtg7NU1anBgyHLTCoWgYdkpmTeo3D6A5dDP tbrEgXIVBrsoFmEeZH9x1mBaljGpnEW89xINNcEmb/J9/bp65qJSTDoa+kvRVFkSqoBx X4MjQEfoYHhkjg7U+k75Tjh+biLublMhzYQ9A9Y+GvX4iZIWSWW4UrxFz51faiz+bkyr zZ+fPA3iIJDJu1ww0yp1oRxEXDCEsK+/hvtI7zR95K0G2eB+h0A7di6Okv87DDCeDaIe 9UFQ== X-Gm-Message-State: ALKqPwc7+l21Pm0DI4m85oubXTAZ9Xso8ougSi5wvu2jYYwEzl7M6/rr kpr/hWzyK1JorHQhhOBoCy2G8Q== X-Google-Smtp-Source: AB8JxZoPQBdnUugDC0TkTaCvVL9wzYPlk4+u0ARCndjualtksmidCI3/BfEpxMyJiXf0ZxIhNUkCQg== X-Received: by 2002:a1c:1047:: with SMTP id 68-v6mr6327868wmq.132.1526718580838; Sat, 19 May 2018 01:29:40 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:d600:20fb:7e91:c3b5:1727? (p200300EA8BD4D60020FB7E91C3B51727.dip0.t-ipconnect.de. [2003:ea:8bd4:d600:20fb:7e91:c3b5:1727]) by smtp.googlemail.com with ESMTPSA id 69-v6sm15745927wmi.29.2018.05.19.01.29.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 May 2018 01:29:40 -0700 (PDT) To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" From: Heiner Kallweit Subject: [PATCH net-next] r8169: fix network error on resume from suspend Message-ID: Date: Sat, 19 May 2018 10:29:33 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This commit removed calls to rtl_set_rx_mode(). This is ok for the standard path if the link is brought up, however it breaks system resume from suspend. Link comes up but no network traffic. Meanwhile common code from rtl_hw_start_8169/8101/8168() was moved to rtl_hw_start(), therefore re-add the call to rtl_set_rx_mode() there. Due to adding this call we have to move definition of rtl_hw_start() after definition of rtl_set_rx_mode(). Signed-off-by: Heiner Kallweit Fixes: 82d3ff6dd199 ("r8169: remove calls to rtl_set_rx_mode") --- drivers/net/ethernet/realtek/r8169.c | 39 ++++++++++++++-------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 2c2f0c5b3..75dfac024 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -5064,25 +5064,6 @@ static void rtl_set_rx_tx_desc_registers(struct rtl8169_private *tp) RTL_W32(tp, RxDescAddrLow, ((u64) tp->RxPhyAddr) & DMA_BIT_MASK(32)); } -static void rtl_hw_start(struct rtl8169_private *tp) -{ - RTL_W8(tp, Cfg9346, Cfg9346_Unlock); - - tp->hw_start(tp); - - rtl_set_rx_max_size(tp); - rtl_set_rx_tx_desc_registers(tp); - rtl_set_rx_tx_config_registers(tp); - RTL_W8(tp, Cfg9346, Cfg9346_Lock); - - /* Initially a 10 us delay. Turned it into a PCI commit. - FR */ - RTL_R8(tp, IntrMask); - RTL_W8(tp, ChipCmd, CmdTxEnb | CmdRxEnb); - /* no early-rx interrupts */ - RTL_W16(tp, MultiIntr, RTL_R16(tp, MultiIntr) & 0xf000); - rtl_irq_enable_all(tp); -} - static void rtl8169_set_magic_reg(struct rtl8169_private *tp, unsigned mac_version) { static const struct rtl_cfg2_info { @@ -5160,6 +5141,26 @@ static void rtl_set_rx_mode(struct net_device *dev) RTL_W32(tp, RxConfig, tmp); } +static void rtl_hw_start(struct rtl8169_private *tp) +{ + RTL_W8(tp, Cfg9346, Cfg9346_Unlock); + + tp->hw_start(tp); + + rtl_set_rx_max_size(tp); + rtl_set_rx_tx_desc_registers(tp); + rtl_set_rx_tx_config_registers(tp); + RTL_W8(tp, Cfg9346, Cfg9346_Lock); + + /* Initially a 10 us delay. Turned it into a PCI commit. - FR */ + RTL_R8(tp, IntrMask); + RTL_W8(tp, ChipCmd, CmdTxEnb | CmdRxEnb); + rtl_set_rx_mode(tp->dev); + /* no early-rx interrupts */ + RTL_W16(tp, MultiIntr, RTL_R16(tp, MultiIntr) & 0xf000); + rtl_irq_enable_all(tp); +} + static void rtl_hw_start_8169(struct rtl8169_private *tp) { if (tp->mac_version == RTL_GIGA_MAC_VER_05)