From patchwork Wed Jun 17 20:51:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1311512 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; 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.a=rsa-sha256 header.s=20161025 header.b=ZMqF0+zG; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49nHRy3znyz9sRW for ; Thu, 18 Jun 2020 06:56:46 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726864AbgFQU4p (ORCPT ); Wed, 17 Jun 2020 16:56:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726758AbgFQU4o (ORCPT ); Wed, 17 Jun 2020 16:56:44 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9AEC4C06174E for ; Wed, 17 Jun 2020 13:56:44 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id h5so3844916wrc.7 for ; Wed, 17 Jun 2020 13:56:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=7epNvZJMbG2ofu+cuewkLi+otfIKq13XkaDiuiTtJho=; b=ZMqF0+zGMrJQrrIRId4B1/LfWieRsQ0G8lXCfoJv0de3qZtiMDvqMTqdb5uW2QKYw8 xmMj+bQG6GNXvBxN2PC5xdDZsJlZinuree0eKuAVqvCqyJjvodyuIlMF95+oI2kzyppc faQAVRierwk23RQgQFXc6VgeN7kMarcWnUawnhIGsE3PdxAm5At9bx7jLuWiNh2bFw3j 3azLm8KF7ykL/DruPQgVQZZnwnZUe2zAuIFrFlmGIu0ipjIn61FzAD4gvwdh+VPguouH ncjNzxN93fzrrsAfk7fErSgn4aDBbYugKR6RQwxr10sdHWNYwGvel1JIkFWQ73c3XZO4 gl8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=7epNvZJMbG2ofu+cuewkLi+otfIKq13XkaDiuiTtJho=; b=Ox5BtTQftN2mZ/UEcm+Uk04wypAcQBVz5BSRT9Pr07D0NeVrs66Z198jDjdhQgyd93 PGjNXUT1BNpzS7lYRk3QFYLfMlLk6AderwFsG7vLvO8b6YWLZIGk9fv1A/kikY8SoGC4 4ivT0rE/gKoJ63294AVL8Hoo5yiHgY//g5L2RCFORQkYn9uIpHxIJQ9J8EivNB450A6G meFEWrwD3Kafc4kbgkfai59R3O3MLeS5pLQnZb9pd7OzXcox3BneLWN2bpYM+VRM2rjv ftflTdW2ZGZjJuNAssdjeh/1z7TZJ/n6GXzPM2H3ScYgQb2Pxp9ePzNwsuFqb+M1z/S4 dYIQ== X-Gm-Message-State: AOAM5326uk3WfVz12Rvcf75k8ECZe9AFxbRAt3BvdRnAahJ6BYijKaGW 4NLqEMp6hZ6BICURJohlKnr3JGDL X-Google-Smtp-Source: ABdhPJzGmUpo3hYxuzy+56b5Kl6pndfQGFQuppHbPiYQWK6BBf5p+MlSv24hlY0yg7BGUBUNBtyOlA== X-Received: by 2002:a05:6000:12c2:: with SMTP id l2mr1025372wrx.133.1592427403114; Wed, 17 Jun 2020 13:56:43 -0700 (PDT) Received: from ?IPv6:2003:ea:8f23:5700:c06e:b26:fa7c:aab? (p200300ea8f235700c06e0b26fa7c0aab.dip0.t-ipconnect.de. [2003:ea:8f23:5700:c06e:b26:fa7c:aab]) by smtp.googlemail.com with ESMTPSA id p7sm866303wro.26.2020.06.17.13.56.42 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 17 Jun 2020 13:56:42 -0700 (PDT) Subject: [PATCH net-next 1/8] r8169: add info for DASH being enabled From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller , Jakub Kicinski Cc: "netdev@vger.kernel.org" References: Message-ID: Date: Wed, 17 Jun 2020 22:51:10 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In case of problems it facilitates the bug analysis if we know whether DASH is active. Therefore emit a message in probe if this is the case. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index dad84ecf5..7bb26fb07 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -5432,8 +5432,10 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) jumbo_max, tp->mac_version <= RTL_GIGA_MAC_VER_06 ? "ok" : "ko"); - if (r8168_check_dash(tp)) + if (r8168_check_dash(tp)) { + netdev_info(dev, "DASH enabled\n"); rtl8168_driver_start(tp); + } if (pci_dev_run_wake(pdev)) pm_runtime_put_sync(&pdev->dev); From patchwork Wed Jun 17 20:51:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1311513 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; 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.a=rsa-sha256 header.s=20161025 header.b=hlHKcBqp; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49nHS002qjz9sRW for ; Thu, 18 Jun 2020 06:56:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727006AbgFQU4q (ORCPT ); Wed, 17 Jun 2020 16:56:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726758AbgFQU4q (ORCPT ); Wed, 17 Jun 2020 16:56:46 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AED94C06174E for ; Wed, 17 Jun 2020 13:56:45 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id b6so3815862wrs.11 for ; Wed, 17 Jun 2020 13:56:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=ODJBbeZcCQquLoXgh17IK5pd3cIH+B4P1lBpzq8f/YE=; b=hlHKcBqpJD1G3ikkD+HdvIXUTy1AYIIlbGP7QfACJ55ACoGIBuE1BWdlaWdxCHY8gk MmdBFCSPOTFn/TBHWNV4ghwSRAa3zRmP0weYMhypuZW7nZNwKwPrEJ57+3xjDGnOJXvm 0OXfOyWTQPDI87Qr4nLysay7WWuh90OwrOuvuImroJ93IrDOK3n9IaAH6dtAYIIAVg1v rCJNy8+YbeULzBpVEpEzfLbpesOY7UwE/eNct6BDT+PMnc93cM0G+LCPFaxLr3KtIF1K BGCPgJaJq2w6ylS1oC9m/lxTVpHgnfD5VyKpk7rFBoXiDIHElzzPUa+ej77n4xR5Ak9G daMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=ODJBbeZcCQquLoXgh17IK5pd3cIH+B4P1lBpzq8f/YE=; b=AnXBNDsKvuIxHhdz5pookwED9TliyZ+3UGJoW5mR1KTdmOaaT3KVSUK3SwndC6UCzZ tm5Tme1sOQdfqFoPdXFb79Id1b1U2x51w4bLTPjIooV2rTAajEc7hTMVdyB2QKuvrMML NpF10b9ta8dcuxdAL9h2jTGWUgufZff1AYRRP5oiLLACxh6MynqceXIyM34tY4XaOeal gI+Y81Bsg4GRCXFA8f1xyc+rUzkQKKii+QwNKoYZoyvVzwRouwQ7sikRhc7wcGMAu4lV CtpCDwMaht7ilIhLxC+mFp8RoEULiX2D+ePfONo4RSZMYSa5IiUB1LAqMrJhvlGA/l2Z ypRA== X-Gm-Message-State: AOAM532mtunEF0yr/ULxJW/vWF//mA+xePn4OD37bQlYE3vCOm3HOd20 7YBNYdua/wmENAH21HjuyfBNdE16 X-Google-Smtp-Source: ABdhPJz2q19hiHyYEv+kAKBmaAchJP8jYawWm1RKLV/8Jx5Pd/qsVHBkbfcgw8neFYnkb9Uhoe2Bbg== X-Received: by 2002:adf:f450:: with SMTP id f16mr1055648wrp.307.1592427404131; Wed, 17 Jun 2020 13:56:44 -0700 (PDT) Received: from ?IPv6:2003:ea:8f23:5700:c06e:b26:fa7c:aab? (p200300ea8f235700c06e0b26fa7c0aab.dip0.t-ipconnect.de. [2003:ea:8f23:5700:c06e:b26:fa7c:aab]) by smtp.googlemail.com with ESMTPSA id q128sm969776wma.38.2020.06.17.13.56.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 17 Jun 2020 13:56:43 -0700 (PDT) Subject: [PATCH net-next 2/8] r8169: remove unused constant RsvdMask From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller , Jakub Kicinski Cc: "netdev@vger.kernel.org" References: Message-ID: <64643297-cbef-e72e-5822-9c95fdc3aa9c@gmail.com> Date: Wed, 17 Jun 2020 22:51:46 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Since 9d3679fe0f30 ("r8169: inline rtl8169_make_unusable_by_asic") this constant isn't used any longer, so remove it. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 7bb26fb07..4bc6c5529 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -529,8 +529,6 @@ enum rtl_rx_desc_bit { RxVlanTag = (1 << 16), /* VLAN tag available */ }; -#define RsvdMask 0x3fffc000 - #define RTL_GSO_MAX_SIZE_V1 32000 #define RTL_GSO_MAX_SEGS_V1 24 #define RTL_GSO_MAX_SIZE_V2 64000 From patchwork Wed Jun 17 20:52:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1311514 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; 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.a=rsa-sha256 header.s=20161025 header.b=StKtprcA; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49nHS11Ysqz9sRW for ; Thu, 18 Jun 2020 06:56:49 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727038AbgFQU4s (ORCPT ); Wed, 17 Jun 2020 16:56:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726758AbgFQU4r (ORCPT ); Wed, 17 Jun 2020 16:56:47 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B7011C06174E for ; Wed, 17 Jun 2020 13:56:46 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id t194so3464305wmt.4 for ; Wed, 17 Jun 2020 13:56:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=4Oeovuqi32l3hxjPHw0Y0M/5WDKUegRwr7348TdN6HY=; b=StKtprcAjTKQtc2t16H3FruSITde86BVN3V+yRkhlGLyU2/UrPdma1AOL9fztcyFOr DH6i5twbVvGxuASXz5H8uRgoWtb+2omsOQ11dS3RUad4mhumVwy1hAlfJvRFRL8lS8ww Ocr51A2NkQVRd77em39bzU3y5Tn/nvGqk+2LVvZxIYa7oilkkyvMFlJXvi84fmMHU34g 2kOU4pkYVWvhLeAwV/CLHspJpaJBf7zG7E1hh9RUZgj7WhgaEsNNF1CatWVMf3uRhibw z4obkQ0vl4Koly3KZ/L27D/lnzmaKaxyqqr2yfg3zpJR+GR9nJoeshnkgrukt+J0SPJO gNdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=4Oeovuqi32l3hxjPHw0Y0M/5WDKUegRwr7348TdN6HY=; b=F1rR7ds5v4P7llhZhvhxlYEsGP9yBWC+XKF5l2lV2gI/yznfIoAdkTcfIi/5w1lzQv i4nh14S4mLjYymQJoMjprL+vihAcUD3GeyjK8n+kAwXY8Jn5gJTXKxBdUjQYQ4urU5PA 7DSQNKT34atzd03k3KOboUdwRCavBUfPgxIDLpdt8kPsS+Ig2oM2FRXcCtFD7LTN107W v7alMzMOWLG4cbG7RYVqmsHBFuzj6RMeo+KtmMMFT2e+zXsbXfdXrGARryfZ4vPCjZMX Li48Pc4+HRE4YIldrCbL2F3b4okrB71GKV8s85IVtNYXZEOOsERe/CLGP1L8T/1e00rE ttvQ== X-Gm-Message-State: AOAM531466AEN5P83lnSE85NDN0R8eXwJUPYqJjXY7HnSua+pOpD6e4G gXk35J/TCDCNtptZtSvUiDHP6VfG X-Google-Smtp-Source: ABdhPJw9NnSLq3o1Ny0wMxNSQMMWMwe53HYk4pR0XctItGlV4B+Jymhuv0m/crTUox7lpBBWMhl/8g== X-Received: by 2002:a1c:6a13:: with SMTP id f19mr588065wmc.142.1592427405179; Wed, 17 Jun 2020 13:56:45 -0700 (PDT) Received: from ?IPv6:2003:ea:8f23:5700:c06e:b26:fa7c:aab? (p200300ea8f235700c06e0b26fa7c0aab.dip0.t-ipconnect.de. [2003:ea:8f23:5700:c06e:b26:fa7c:aab]) by smtp.googlemail.com with ESMTPSA id c143sm8285107wmd.1.2020.06.17.13.56.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 17 Jun 2020 13:56:44 -0700 (PDT) Subject: [PATCH net-next 3/8] r8169: improve setting WoL on runtime-resume From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller , Jakub Kicinski Cc: "netdev@vger.kernel.org" References: Message-ID: <5130b4ec-9de8-3c1a-8ef7-99be9084c93b@gmail.com> Date: Wed, 17 Jun 2020 22:52:47 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In the following scenario WoL isn't configured properly: - Driver is loaded, interface isn't brought up within 10s, so driver runtime-suspends. - WoL is set. - Interface is brought up, stored WoL setting isn't applied. It has always been like that, but the scenario seems to be quite theoretical as I haven't seen any bug report yet. Therefore treat the change as an improvement. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 4bc6c5529..bd95c0ae6 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4887,14 +4887,12 @@ static int rtl8169_runtime_resume(struct device *device) rtl_rar_set(tp, tp->dev->dev_addr); - if (!tp->TxDescArray) - return 0; - rtl_lock_work(tp); __rtl8169_set_wol(tp, tp->saved_wolopts); rtl_unlock_work(tp); - __rtl8169_resume(tp); + if (tp->TxDescArray) + __rtl8169_resume(tp); return 0; } From patchwork Wed Jun 17 20:53:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1311516 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; 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.a=rsa-sha256 header.s=20161025 header.b=SasygcGZ; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49nHS64hrTz9sSJ for ; Thu, 18 Jun 2020 06:56:54 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727045AbgFQU4v (ORCPT ); Wed, 17 Jun 2020 16:56:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727033AbgFQU4s (ORCPT ); Wed, 17 Jun 2020 16:56:48 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ABDC8C06174E for ; Wed, 17 Jun 2020 13:56:47 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id d128so3478685wmc.1 for ; Wed, 17 Jun 2020 13:56:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=l1LC2Irfpc6BGnyAnq4AXVKzvohW3OyajQTmgEYFLIY=; b=SasygcGZV8rJpkGxZYVMIgyUlBRU3ierWc3nFP8BVbGjCyMJabXqhu9WMH3Wm2Nx8J jz1FCdzVWcEqRx+ITkCc16awPdvpo4Fr3N7bk6G71J8vOpd8aE35Smrd8+10qQiU34v7 uXxrZb8Qf0qr+pLVduXTjfrg5kkNDct7KIymodV1NuIRSrpEPYiElmhIG8vq8JStlPJp 9DQH7hCLGxo/tKVtRoJVnYEkrDNvDOC35exEQgWIunpV2tD9z91fVICeylc0jlPPriAp 9yCK0dgLakl6qVTaVhy4pxnp2Z49vR+G0e+cmackrpBLQDHcAtaj+Bd/yjYy841mwFVQ 8/GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=l1LC2Irfpc6BGnyAnq4AXVKzvohW3OyajQTmgEYFLIY=; b=pyN43BUc9tXqSxKDJGnPJQMkd2ozPEL5XH+xtLOw5C/ySID19rdBUCj4WMlvktRB5j hQk01JvYfqOSdz5u16RRTDqjJMJ2JBvKlHg2toYBPLzkbFX6TVTYooX7JzY8q+43dzND H6l/1+0g4h8IMnw8fId9Tdc/HYfkUVg7MvNTol7oa3kgdXwhOyHV+bpWSPokgM+7B1dG CufgzAOjJ/L1Rrg54T4YD2zBmvB/4BQhJOKYKcWW8L4G1NWCgZPyriNN6VGt0w6uIcdW ShL+oHfmxYQf7kSPXRetg0oCUsbhRIKfZQyy0IcJHYuSthVu7/JpCuldMi8I7x75w0SS vh6g== X-Gm-Message-State: AOAM533NdIAsD+i2giX9WWp2ZD/ClxU/05g/+iLTB6Fycy7MwDY6uN0R PgLU+P+y/iaD+DjvIDhnk9vgzgDX X-Google-Smtp-Source: ABdhPJwDv5Bcq++FPdpzpLcKZFpw1+myt3POfhcTIeAF5scYpsf59vmD/gQa+elcl0aLEF69cNRgJQ== X-Received: by 2002:a1c:4e17:: with SMTP id g23mr560822wmh.38.1592427406186; Wed, 17 Jun 2020 13:56:46 -0700 (PDT) Received: from ?IPv6:2003:ea:8f23:5700:c06e:b26:fa7c:aab? (p200300ea8f235700c06e0b26fa7c0aab.dip0.t-ipconnect.de. [2003:ea:8f23:5700:c06e:b26:fa7c:aab]) by smtp.googlemail.com with ESMTPSA id q13sm828776wrn.84.2020.06.17.13.56.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 17 Jun 2020 13:56:45 -0700 (PDT) Subject: [PATCH net-next 4/8] r8169: replace synchronize_rcu with synchronize_net From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller , Jakub Kicinski Cc: "netdev@vger.kernel.org" References: Message-ID: <8924ccae-fac3-aae5-dd9a-711a1ef861d1@gmail.com> Date: Wed, 17 Jun 2020 22:53:21 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org rtl8169_hw_reset() may be called under RTNL lock, therefore switch to synchronize_net(). Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index bd95c0ae6..0d3e58ae1 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -3929,7 +3929,7 @@ static void rtl8169_tx_clear(struct rtl8169_private *tp) static void rtl8169_hw_reset(struct rtl8169_private *tp, bool going_down) { /* Give a racing hard_start_xmit a few cycles to complete. */ - synchronize_rcu(); + synchronize_net(); /* Disable interrupts */ rtl8169_irq_mask_and_ack(tp); From patchwork Wed Jun 17 20:54:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1311515 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; 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.a=rsa-sha256 header.s=20161025 header.b=F1QrE7lM; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49nHS61dFhz9sRW for ; Thu, 18 Jun 2020 06:56:54 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727050AbgFQU4w (ORCPT ); Wed, 17 Jun 2020 16:56:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726758AbgFQU4u (ORCPT ); Wed, 17 Jun 2020 16:56:50 -0400 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3E9FC061755 for ; Wed, 17 Jun 2020 13:56:48 -0700 (PDT) Received: by mail-wr1-x444.google.com with SMTP id e1so3843299wrt.5 for ; Wed, 17 Jun 2020 13:56:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=vYmfE6PX4DJYsHGd18sDMKqYyAIabImqTJD+c5+0RT8=; b=F1QrE7lMGGfokEKBUV5MeuaBzuF9lySShD7jaYITJqUuP5M+IWb6wgDAfT8xMY4pEh YtkU8x3TAvX/NLc9ooJ7uotGjRrAsEsMUJ5238znXeFEv/LM1FZlnbP2jC7NCzoueYyK lgiaEKar0DdjaQvUzoWmYFV/huaowhHsa4LLnyeuI0as3Xl1z2tavaCmN45RQlL2zZ6t FHfxfpew659jy5pTLBxfMuNYLMYX5JlRkRp37Wh8mhUNoQ2i8KTOJNcGh9CPW4SjjRYE WmwREO51eJf9PrkVSdYk4aLhQm6b3Umsfzz5yEmBl+c5yCLSwsA0nDMYpOgJVmfave83 SfDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=vYmfE6PX4DJYsHGd18sDMKqYyAIabImqTJD+c5+0RT8=; b=ROTo0hnY1LcQKq2nieS1A9TfJq+L9UxgIqSh83fAD/vubmCrY4U3UqCGYE5Q0ZqOU6 FR2nqAzMyzTiNpH/S3Hgh70lVu4rtFkW+nlch25LgaoeG89chT3Fo8aPWcHVZk416/Ks igip1kXjJtd0IiOCSpS/RtkKXGJ2XbCuGhBAoNCcOuqxPmp7HziR9nSuAn1faHihhuVz N3lSdXwArOOWSMjr7C+kR1CLpTM/i7d/PO8LDLCv50Eb4SrkLPxIkGJn8jQPlpgevibD ++bYzafK7fYFrkwlNcjSSJQ75D7nS+m3GU7s9SPowCfMdYFj8UYiGU9Mf6UmY4VZmQpe 11MQ== X-Gm-Message-State: AOAM5303oMblE7mXheZwt8zVqpCkcLs9B/Wwuc3tra7HmBh0Y95tXuja rV9F6NIqyNPXK8EOPZS6LfC4TvrD X-Google-Smtp-Source: ABdhPJzeko5TovMMD2pWxwhCJFbdM3x4BVwF8gZFyeYqW4agPi/ZB0JNEvq6UjcwoI3/Fk0MiqXQeA== X-Received: by 2002:adf:97d3:: with SMTP id t19mr1177487wrb.116.1592427407226; Wed, 17 Jun 2020 13:56:47 -0700 (PDT) Received: from ?IPv6:2003:ea:8f23:5700:c06e:b26:fa7c:aab? (p200300ea8f235700c06e0b26fa7c0aab.dip0.t-ipconnect.de. [2003:ea:8f23:5700:c06e:b26:fa7c:aab]) by smtp.googlemail.com with ESMTPSA id o6sm899130wrp.3.2020.06.17.13.56.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 17 Jun 2020 13:56:46 -0700 (PDT) Subject: [PATCH net-next 5/8] r8169: move napi_disable call and rename rtl8169_hw_reset From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller , Jakub Kicinski Cc: "netdev@vger.kernel.org" References: Message-ID: Date: Wed, 17 Jun 2020 22:54:18 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org rtl8169_hw_reset() meanwhile does more than a hw reset, therefore rename it to rtl8169_cleanup(). In addition move calling napi_disable() to this function. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 0d3e58ae1..afcdaace2 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -3926,8 +3926,10 @@ static void rtl8169_tx_clear(struct rtl8169_private *tp) netdev_reset_queue(tp->dev); } -static void rtl8169_hw_reset(struct rtl8169_private *tp, bool going_down) +static void rtl8169_cleanup(struct rtl8169_private *tp, bool going_down) { + napi_disable(&tp->napi); + /* Give a racing hard_start_xmit a few cycles to complete. */ synchronize_net(); @@ -3970,10 +3972,9 @@ static void rtl_reset_work(struct rtl8169_private *tp) struct net_device *dev = tp->dev; int i; - napi_disable(&tp->napi); netif_stop_queue(dev); - rtl8169_hw_reset(tp, false); + rtl8169_cleanup(tp, false); for (i = 0; i < NUM_RX_DESC; i++) rtl8169_mark_to_asic(tp->RxDescArray + i); @@ -4636,9 +4637,8 @@ static void rtl8169_down(struct rtl8169_private *tp) bitmap_zero(tp->wk.flags, RTL_FLAG_MAX); phy_stop(tp->phydev); - napi_disable(&tp->napi); - rtl8169_hw_reset(tp, true); + rtl8169_cleanup(tp, true); rtl_pll_power_down(tp); From patchwork Wed Jun 17 20:54:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1311519 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; 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.a=rsa-sha256 header.s=20161025 header.b=XUaemYpP; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49nHSD1YxRz9sRW for ; Thu, 18 Jun 2020 06:57:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727062AbgFQU47 (ORCPT ); Wed, 17 Jun 2020 16:56:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727039AbgFQU4u (ORCPT ); Wed, 17 Jun 2020 16:56:50 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE32FC0613ED for ; Wed, 17 Jun 2020 13:56:49 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id c71so3185605wmd.5 for ; Wed, 17 Jun 2020 13:56:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=C5DNTnXnkRtABG/Bftdda+H+IOHqLzkfj0xWc+xS8FM=; b=XUaemYpP4vDF+pFcDgC2S5vbpFKszZvJWz4nZQYr1/9pc0i7ubq48MZX12babvEa1P 0sjV7C5ee+DB63nlNLOKjCHuVCdwO4z3LI3U/LDS7YNd8zQXRnrArxQHfwUx3RhCGbej kPdzOKU/lb/VOvJz/dQ9GkJOdYNxEnzUg/V2zZ4Qlkh0wz9B94KupVpdRYFLgPt4wDZ0 y+eTll49Pt2ddNIv38Y61wMD4CUxZFmJo+SBcIICjDym6w17nS32xN5G6jhRf5fAHoZR IDYeK+/dqAmypxidHDmOPIfZLABcdn8Sh8vfMNzqsmDT/7zT3LldgvUNRr84EGLGqExQ p4kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=C5DNTnXnkRtABG/Bftdda+H+IOHqLzkfj0xWc+xS8FM=; b=fTJCroJWMTYBpJuKRBL2k4lgenuPbRQR/ThRdXJfBUHfl9+DZ1HeveuQq+JgTYQRP5 HwsN1IvGbraj8m+tyv7KCCmlsMl4GjN6e3Urs3qYMz9TGlkAINFu7H0NWvrFIv/Erpav MPSbD0oFCFXY31fxLFiWXGcwZJVj9/FKHyxjuWbL/t5M9IMiGXXzxaRquhwwn+cQiyAs yXuqLGSCGSzbWuiHIpoYVaXkbl8ECFyTqa1tPoGFzp/KfmsW7fyeNNa2RyRc/kb6IPxq 2CTQITPRisI81BNczEm0sKRQEmYEp1Gmtafoc0bkagc9sFHdMmKd7ZOEHPuS41/4r55U a48w== X-Gm-Message-State: AOAM530vFhknq/WBlWYbsD6YKHgVYrpayMUqbXkMJDJg1/LQUYRQu4Y/ XM+pev7kHtI6eOwi5Of3vIxzP6UT X-Google-Smtp-Source: ABdhPJzt1GnogQcmbjMox2tGVGPyaSuCdELHp6ibSJmHtStqXwWwTXW2sxB2sfoyOlNMRWQWF+uriA== X-Received: by 2002:a1c:7505:: with SMTP id o5mr549806wmc.164.1592427408270; Wed, 17 Jun 2020 13:56:48 -0700 (PDT) Received: from ?IPv6:2003:ea:8f23:5700:c06e:b26:fa7c:aab? (p200300ea8f235700c06e0b26fa7c0aab.dip0.t-ipconnect.de. [2003:ea:8f23:5700:c06e:b26:fa7c:aab]) by smtp.googlemail.com with ESMTPSA id q13sm828851wrn.84.2020.06.17.13.56.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 17 Jun 2020 13:56:47 -0700 (PDT) Subject: [PATCH net-next 6/8] r8169: move updating counters to rtl8169_down From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller , Jakub Kicinski Cc: "netdev@vger.kernel.org" References: Message-ID: Date: Wed, 17 Jun 2020 22:54:54 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Counters are updated whenever we go down, therefore move the call to rtl8169_down(). Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index afcdaace2..9f99b3f07 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4638,6 +4638,8 @@ static void rtl8169_down(struct rtl8169_private *tp) phy_stop(tp->phydev); + rtl8169_update_counters(tp); + rtl8169_cleanup(tp, true); rtl_pll_power_down(tp); @@ -4652,9 +4654,6 @@ static int rtl8169_close(struct net_device *dev) pm_runtime_get_sync(&pdev->dev); - /* Update counters before going down */ - rtl8169_update_counters(tp); - netif_stop_queue(dev); rtl8169_down(tp); rtl8169_rx_clear(tp); @@ -4875,9 +4874,6 @@ static int rtl8169_runtime_suspend(struct device *device) rtl8169_net_suspend(tp); - /* Update counters before going runtime suspend */ - rtl8169_update_counters(tp); - return 0; } From patchwork Wed Jun 17 20:55:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1311518 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; 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.a=rsa-sha256 header.s=20161025 header.b=UrKo7aut; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49nHS92g8Bz9sRW for ; Thu, 18 Jun 2020 06:56:57 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727059AbgFQU4z (ORCPT ); Wed, 17 Jun 2020 16:56:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727048AbgFQU4w (ORCPT ); Wed, 17 Jun 2020 16:56:52 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C00A1C06174E for ; Wed, 17 Jun 2020 13:56:50 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id p5so3816495wrw.9 for ; Wed, 17 Jun 2020 13:56:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=DTk0I20UQ7yspLP05CLDNIqZpARjF4aIs6OK5NNTg94=; b=UrKo7autLuE6iYgpB0EbdCwD+dnX9LBuPOu4/gpPbn0xb/mshmx6cfRTJFLQB81PyD Ng1dSHQlGlyAhI0HqVz0PNTg7Q1FBphd3OXIq3Ju01tAJnUDtBgHZXzIsJxFce9vTRCf wabWVGjdG4tCEhQHvb1flo0GeiiIIX49D08f1kBXhwEJMPf8mJFHui1VCx3m3rHWa9Om bPxYyGJldqofobH5/MWhusBSK8ibqVZSa02AUDOON0umk+GGUkglqt6A6pKhM6Pk/lUI XEaBe2tMSINoQK3LNsc+ND7cetg6fEQKtSzOkESeQs+64ZgzGa/q++BKov6xczEUMHer gMog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=DTk0I20UQ7yspLP05CLDNIqZpARjF4aIs6OK5NNTg94=; b=pQ16O8JfEwYLy7Fc1KGHUzv57369Ghxiu956qCcSrn/rSM6MVoBqMZGrdAbJTknXcB YOeVoLeXbjZb2H4yX5oG78h4/W5N1rm+jyPCYMKbxIPoHZArtut1nEtVnjrrXcQj/BIJ 7J3qFphw7/GkwmM1sf76m3PaEDYVcZuqqt1QYLE7tmyylU6YkimWetxjQAutlSZDwRDO KnFpRNfOHiLbAITi18v4a4O4C7P5e0B+pqMmPVXrMrpqAcuAcrB8DWSxDMnkNISVM4NQ uXt8486TAmLjbcRLpkO7hEMoGDsVk01AUb0ufmRvDb6qKxOEu1GmuhDmM7fkuGDd3+JT /RcA== X-Gm-Message-State: AOAM532RM9Y56jwKci2B2E2hrC4m8FvmOfuIqbg8WJsxquo+4rYr4Ih6 2JfH1hWJ77Ib5/YvD6ghbk7ac3uq X-Google-Smtp-Source: ABdhPJz2CUPINsXvl0lCMAM3fLIEo6ykhsuu3kbZfUJ/FPE/MshI5nx9ZbDGmxA3ZGAhS6cxq/lLWw== X-Received: by 2002:adf:ed51:: with SMTP id u17mr973550wro.285.1592427409237; Wed, 17 Jun 2020 13:56:49 -0700 (PDT) Received: from ?IPv6:2003:ea:8f23:5700:c06e:b26:fa7c:aab? (p200300ea8f235700c06e0b26fa7c0aab.dip0.t-ipconnect.de. [2003:ea:8f23:5700:c06e:b26:fa7c:aab]) by smtp.googlemail.com with ESMTPSA id e15sm1044209wme.9.2020.06.17.13.56.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 17 Jun 2020 13:56:48 -0700 (PDT) Subject: [PATCH net-next 7/8] r8169: move switching optional clock on/off to pll power functions From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller , Jakub Kicinski Cc: "netdev@vger.kernel.org" References: Message-ID: <750b9207-bd03-52b1-b951-67b4ce9be345@gmail.com> Date: Wed, 17 Jun 2020 22:55:40 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Relevant chip clocks are disabled in rtl_pll_power_down(), therefore move calling clk_disable_unprepare() there. Similar for enabling the clock. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 9f99b3f07..d55bf2cd2 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -2292,10 +2292,14 @@ static void rtl_pll_power_down(struct rtl8169_private *tp) default: break; } + + clk_disable_unprepare(tp->clk); } static void rtl_pll_power_up(struct rtl8169_private *tp) { + clk_prepare_enable(tp->clk); + switch (tp->mac_version) { case RTL_GIGA_MAC_VER_25 ... RTL_GIGA_MAC_VER_33: case RTL_GIGA_MAC_VER_37: @@ -4826,7 +4830,6 @@ static int __maybe_unused rtl8169_suspend(struct device *device) struct rtl8169_private *tp = dev_get_drvdata(device); rtl8169_net_suspend(tp); - clk_disable_unprepare(tp->clk); return 0; } @@ -4853,8 +4856,6 @@ static int __maybe_unused rtl8169_resume(struct device *device) rtl_rar_set(tp, tp->dev->dev_addr); - clk_prepare_enable(tp->clk); - if (netif_running(tp->dev)) __rtl8169_resume(tp); From patchwork Wed Jun 17 20:56:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1311517 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; 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.a=rsa-sha256 header.s=20161025 header.b=jFtWTOen; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49nHS71VYQz9sRW for ; Thu, 18 Jun 2020 06:56:55 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726815AbgFQU4y (ORCPT ); Wed, 17 Jun 2020 16:56:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727051AbgFQU4x (ORCPT ); Wed, 17 Jun 2020 16:56:53 -0400 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C30D0C061755 for ; Wed, 17 Jun 2020 13:56:51 -0700 (PDT) Received: by mail-wr1-x441.google.com with SMTP id r7so3862942wro.1 for ; Wed, 17 Jun 2020 13:56:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=e2uEbfhiW8TczOATnDb4CRx8CnIR8PSnuYhqZA/V3hA=; b=jFtWTOent+BW8GEwNFKoJ+J1/hJos2l8WrYD4ikGwt/0sqHIwkjnvERUDs9U4ph3eC 0EZmvlj4sKS6sksPA/7DZs/p7IL6S2+pSlh2WrU6r/+6u1mhxXBMpWSZ/Dff5l6LKp9T vo1ZI6HEiNc99lWX+8+FkDSG2MD37wsAssc/Ang3deivzUtSn1Kz/eNgxm2+uoAoyA26 ic0+XorXdR33VjsjRHZgUxkbLvIRFLEtbRe6NgRZ+zBzkKBjFzwrnY5pRxNSZSwxiKHm CNivOwvDf5w+c5oJF2Ylcl7ZLc6Ebuqy6zB0vdOdDyc/rRp1s663KaPf+MY73v1d2X+K jjbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=e2uEbfhiW8TczOATnDb4CRx8CnIR8PSnuYhqZA/V3hA=; b=AAP0Xurvn5mZXyYiu6uVssQIKtvnPm+LxXbTzZbkgsTW8Vd9SZ4CVDw/m4cBDjF0OS L1wv0BlyahYCwJ2hfdZhOXkXKGcnXX7ZGAkbAHSpmF20lfPCvfVsdFMf50jphSxe8UvK RMUngA0pEpCYw2n7aXyt/155v321yFruRH5OS6VYqohoAA3swuMxGeb44jzp6W549eN4 R4kYrDtZTGOirCaTw2tH9BvkT76ysVcqxisES7a1hO6KIoiE8HyFC6ciQbv7rWEz+R9J lvL5/JHLj/CjwjyZ2vM7JwM/uqTSn9zgaekzbgP50sGgsvTFkCbHEAHN1RVlWTls0waK KFlw== X-Gm-Message-State: AOAM5329AeYxACVFBygSlbSIO8Ul4msY7Xw+x1U/x4lBbYsQ9vwtTsBr KzBi8kPGl+rVdRsPUHiwtCM09YHe X-Google-Smtp-Source: ABdhPJwFoBCF8lclBsSqptikOdFDHIcm4KRmmy3lvi+Dt9Zo1TVhs8GbKdv3fMmRy6H7sYoEkKIOMA== X-Received: by 2002:a5d:40d2:: with SMTP id b18mr1045860wrq.131.1592427410237; Wed, 17 Jun 2020 13:56:50 -0700 (PDT) Received: from ?IPv6:2003:ea:8f23:5700:c06e:b26:fa7c:aab? (p200300ea8f235700c06e0b26fa7c0aab.dip0.t-ipconnect.de. [2003:ea:8f23:5700:c06e:b26:fa7c:aab]) by smtp.googlemail.com with ESMTPSA id v66sm1065833wme.13.2020.06.17.13.56.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 17 Jun 2020 13:56:49 -0700 (PDT) Subject: [PATCH net-next 8/8] r8169: allow setting irq coalescing if link is down From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller , Jakub Kicinski Cc: "netdev@vger.kernel.org" References: Message-ID: Date: Wed, 17 Jun 2020 22:56:27 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org So far we can not configure irq coalescing when link is down. Allow the user to do this, and assume that he wants to configure irq coalescing for highest speed. Otherwise the irq rate is low enough anyway. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index d55bf2cd2..a3c4187d9 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -1731,16 +1731,16 @@ struct rtl_coalesce_info { #define COALESCE_DELAY(d) { (d), 8 * (d), 16 * (d), 32 * (d) } static const struct rtl_coalesce_info rtl_coalesce_info_8169[] = { - { SPEED_10, COALESCE_DELAY(40960) }, - { SPEED_100, COALESCE_DELAY(2560) }, { SPEED_1000, COALESCE_DELAY(320) }, + { SPEED_100, COALESCE_DELAY(2560) }, + { SPEED_10, COALESCE_DELAY(40960) }, { 0 }, }; static const struct rtl_coalesce_info rtl_coalesce_info_8168_8136[] = { - { SPEED_10, COALESCE_DELAY(40960) }, - { SPEED_100, COALESCE_DELAY(2560) }, { SPEED_1000, COALESCE_DELAY(5000) }, + { SPEED_100, COALESCE_DELAY(2560) }, + { SPEED_10, COALESCE_DELAY(40960) }, { 0 }, }; #undef COALESCE_DELAY @@ -1756,6 +1756,10 @@ rtl_coalesce_info(struct rtl8169_private *tp) else ci = rtl_coalesce_info_8168_8136; + /* if speed is unknown assume highest one */ + if (tp->phydev->speed == SPEED_UNKNOWN) + return ci; + for (; ci->speed; ci++) { if (tp->phydev->speed == ci->speed) return ci;