From patchwork Fri Mar 6 22:54: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: 222906 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=-8.3 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, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_SANE_1 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 E2FB9C10DCE for ; Fri, 6 Mar 2020 22:59:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AE864206CC for ; Fri, 6 Mar 2020 22:59:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="n+r1xzpY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726300AbgCFW7O (ORCPT ); Fri, 6 Mar 2020 17:59:14 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:42564 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726162AbgCFW7N (ORCPT ); Fri, 6 Mar 2020 17:59:13 -0500 Received: by mail-wr1-f68.google.com with SMTP id v11so4170385wrm.9 for ; Fri, 06 Mar 2020 14:59:12 -0800 (PST) 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=pvw0hXL8WaZ1fs8oj0rrpDhVpTtZCr7I8Chl+KEQDEk=; b=n+r1xzpYbo90uXjrWGJZkFUVTc0Uq66bSkKwHsD7uNPiPe2TM+FlU6EPP3YAuJW4sU fbnRTDvp4JawwRihATj6FmiNggdHt3Vw8zu5E0TmhRx0jH50nwc81Cc5lWOi+ZTYL7xQ UaZiTStvFM89yWv60oC31bbJ1Mmk+Y8mPk8u7u+rAE711Dssu4EXN86qqXXNcemP9PF6 KRQWxj11fLl+JVxfFqIjNnQ4tvB2ahft50WKted6UOJV9lu+QArjaKgpWGV1Fw9ho6Dw n5NADubailQmDDaxkAMudcX+xLg1U97GU3NxKhp4BMrlbkkpyg4NfUew4f98APCZM7W3 lORw== 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=pvw0hXL8WaZ1fs8oj0rrpDhVpTtZCr7I8Chl+KEQDEk=; b=PLjGTBRHiElsgx8aY7eApUtU87yuM6jXkplSakFr4SgUdvOHDT7Mzr4vrQXi4LLHf6 EybWosQR5EkTYZ9R0u/Z59d/H/eJR8Y4YzQTcijugBv7wo8+y2S53o9hQJ2pjR4NzkcK P7vgTrA84pM607n/GHugeXKsDfMdRNrYxvKmXn6rrjVMc1t90npwy4qHy9QfJnuIEGzz YcUm6SQ61SAe0LxZNyhn0p6ie4vtTECEdJ7OIX49dtA7hcQB4/ydxydMwiwYRAZIE4UY RqI4lDMlxOZiUsCSs7jCSgOup1SdVUlxsee+oaMlSW6gjsEdEkz7vBQGMwoI3ZwkAkos x5rg== X-Gm-Message-State: ANhLgQ1hDWaxBpMV0HwqqmxcZ6t8UoavOYjTpf25zv2z8S6g78hKOk6g tPrV8Lxg990iu+2oGQ4qbfTNBX5w X-Google-Smtp-Source: ADFU+vuYel+woegYY4mANgX9Pz/XlNnSMWYXmOdbFKNNerCFCWRfPSQOXags6J0Wdw5Ukk61PnIfPw== X-Received: by 2002:adf:fe89:: with SMTP id l9mr5934427wrr.373.1583535551866; Fri, 06 Mar 2020 14:59:11 -0800 (PST) Received: from ?IPv6:2003:ea:8f29:6000:1447:bded:797c:45a5? (p200300EA8F2960001447BDED797C45A5.dip0.t-ipconnect.de. [2003:ea:8f29:6000:1447:bded:797c:45a5]) by smtp.googlemail.com with ESMTPSA id n14sm6639412wrs.97.2020.03.06.14.59.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 06 Mar 2020 14:59:11 -0800 (PST) Subject: [PATCH net-next 1/4] r8169: convert while to for loop in rtl_tx From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller Cc: "netdev@vger.kernel.org" References: Message-ID: <9d9d812a-5d21-42de-04e8-adbae25ef194@gmail.com> Date: Fri, 6 Mar 2020 23:54:47 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.5.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 Slightly improve the code by converting this while to a for loop. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 4495a3cf9..c0999efa0 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4392,9 +4392,8 @@ static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp, dirty_tx = tp->dirty_tx; smp_rmb(); - tx_left = tp->cur_tx - dirty_tx; - while (tx_left > 0) { + for (tx_left = tp->cur_tx - dirty_tx; tx_left > 0; tx_left--) { unsigned int entry = dirty_tx % NUM_TX_DESC; struct ring_info *tx_skb = tp->tx_skb + entry; u32 status; @@ -4418,7 +4417,6 @@ static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp, tx_skb->skb = NULL; } dirty_tx++; - tx_left--; } if (tp->dirty_tx != dirty_tx) { From patchwork Fri Mar 6 22:56:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 222905 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=-8.3 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, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_SANE_1 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 DF482C10F25 for ; Fri, 6 Mar 2020 22:59:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B6A87206CC for ; Fri, 6 Mar 2020 22:59:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bBNu6u5V" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726769AbgCFW7R (ORCPT ); Fri, 6 Mar 2020 17:59:17 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:34978 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726162AbgCFW7P (ORCPT ); Fri, 6 Mar 2020 17:59:15 -0500 Received: by mail-wm1-f67.google.com with SMTP id m3so4052605wmi.0 for ; Fri, 06 Mar 2020 14:59:14 -0800 (PST) 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=RynB79HgR7sTc4vLsv876vhUdcIwfUiJRUs3uVF7U/U=; b=bBNu6u5Vj/WX2J4M9Bq1ETM5rOzg+KHbXQNIBrSEoG4iYmfoT8GMSjtU1lW6aL316g oaUXHAx+6aRByAeBgXg2PjqACgnXGEiy25CrpvSpA6kAaScIJUHc9JfaRbo696qdADd+ oaqMgqmGVQe1pvMLzR0tAYr9dSDva0wag3vfptk9vA0dhGYIEqHGOThCuO3whlrcPGIm BfDUPnWwhviOpxzXTaQugTkEi3J4UMMaKxETQ923PgMhM03lSi5nd5bXnQd3HoM40kCt +EiQCusK6A3f2g6NBIwbHYtuudW9a+nXCSsrCxBXwH1WbBHaZxKZN0g7z0tsOWyscb5j q9Eg== 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=RynB79HgR7sTc4vLsv876vhUdcIwfUiJRUs3uVF7U/U=; b=ndLB7p41PL8haTNDUwwquuuuxXtZ+F+XYAZiNgfZKOfzQrSBJYboS2aBquzETQ/Kni scau13lCzqpQYfuLjfxzXLeGJYcUJt6tt7MaRGdswqjGcnT8AruoyU6MdTywqgthhAOL p5FdPeDNt9fi4eSMwxdeQqSTqa4VyXsi/dnhfJtFhZinOhFlPNgdG3WbK+b171CLFonT ugh6LrENq2ha1aaPjBq9RSevPYZ88HLdSdZgBmXeNVaj4lvNv+CjszEQ8lgbdgC4uXw8 EBg/UGzisx3JV0JbAQmPdOrf1V4fjaioYQN3iZpq9sQYUCNqU9X/+/OnNtQF7oaIzY8i cdfQ== X-Gm-Message-State: ANhLgQ2GiOSdLvBub0M7gCNXOBZdfmjD58OfzMjXGiIj4WZZaZMklvie F11jgvX85b3Ytjfj8hYpiklDIk+F X-Google-Smtp-Source: ADFU+vusyw2Opi5BIhWCzwcKLSk1UFpoewS/k3XB+si03IFM/R4n2m7agvg+jlwKiEjp3DPxuh3phw== X-Received: by 2002:a1c:1b13:: with SMTP id b19mr6530718wmb.91.1583535553974; Fri, 06 Mar 2020 14:59:13 -0800 (PST) Received: from ?IPv6:2003:ea:8f29:6000:1447:bded:797c:45a5? (p200300EA8F2960001447BDED797C45A5.dip0.t-ipconnect.de. [2003:ea:8f29:6000:1447:bded:797c:45a5]) by smtp.googlemail.com with ESMTPSA id i67sm28499494wri.50.2020.03.06.14.59.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 06 Mar 2020 14:59:13 -0800 (PST) Subject: [PATCH net-next 3/4] r8169: simplify usage of rtl8169_unmap_tx_skb From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller Cc: "netdev@vger.kernel.org" References: Message-ID: Date: Fri, 6 Mar 2020 23:56:38 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.5.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 Simplify the parameters taken by rtl8169_unmap_tx_skb, this makes usage of this function easier to read and understand. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 359f029a7..8a707d67c 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -3970,12 +3970,13 @@ static int rtl8169_init_ring(struct rtl8169_private *tp) return rtl8169_rx_fill(tp); } -static void rtl8169_unmap_tx_skb(struct device *d, struct ring_info *tx_skb, - struct TxDesc *desc) +static void rtl8169_unmap_tx_skb(struct rtl8169_private *tp, unsigned int entry) { - unsigned int len = tx_skb->len; + struct ring_info *tx_skb = tp->tx_skb + entry; + struct TxDesc *desc = tp->TxDescArray + entry; - dma_unmap_single(d, le64_to_cpu(desc->addr), len, DMA_TO_DEVICE); + dma_unmap_single(tp_to_dev(tp), le64_to_cpu(desc->addr), tx_skb->len, + DMA_TO_DEVICE); memset(desc, 0, sizeof(*desc)); memset(tx_skb, 0, sizeof(*tx_skb)); } @@ -3993,8 +3994,7 @@ static void rtl8169_tx_clear_range(struct rtl8169_private *tp, u32 start, if (len) { struct sk_buff *skb = tx_skb->skb; - rtl8169_unmap_tx_skb(tp_to_dev(tp), tx_skb, - tp->TxDescArray + entry); + rtl8169_unmap_tx_skb(tp, entry); if (skb) dev_consume_skb_any(skb); } @@ -4303,7 +4303,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb, return NETDEV_TX_OK; err_dma_1: - rtl8169_unmap_tx_skb(d, tp->tx_skb + entry, txd); + rtl8169_unmap_tx_skb(tp, entry); err_dma_0: dev_kfree_skb_any(skb); dev->stats.tx_dropped++; @@ -4390,8 +4390,7 @@ static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp, for (tx_left = tp->cur_tx - dirty_tx; tx_left > 0; tx_left--) { unsigned int entry = dirty_tx % NUM_TX_DESC; - struct ring_info *tx_skb = tp->tx_skb + entry; - struct sk_buff *skb = tx_skb->skb; + struct sk_buff *skb = tp->tx_skb[entry].skb; u32 status; status = le32_to_cpu(tp->TxDescArray[entry].opts1); @@ -4404,8 +4403,8 @@ static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp, */ dma_rmb(); - rtl8169_unmap_tx_skb(tp_to_dev(tp), tx_skb, - tp->TxDescArray + entry); + rtl8169_unmap_tx_skb(tp, entry); + if (skb) { pkts_compl++; bytes_compl += skb->len;