From patchwork Tue Apr 17 21:17:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 899716 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="ms9xf+kL"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40QdqV5GScz9s1d for ; Wed, 18 Apr 2018 07:36:38 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752633AbeDQVge (ORCPT ); Tue, 17 Apr 2018 17:36:34 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:39687 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752320AbeDQVgd (ORCPT ); Tue, 17 Apr 2018 17:36:33 -0400 Received: by mail-wr0-f193.google.com with SMTP id q6so27279685wrd.6 for ; Tue, 17 Apr 2018 14:36:33 -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-transfer-encoding; bh=ZT2sanu4H4MCQDl1zs4GbcLXlnWCZauPeX3K+ZLL5tM=; b=ms9xf+kLsEZ90gVSGv6Hbs41tlYGqRLecksc3egLPB0g3EaIKVgiMjJ4ZxITLCBMNm FrbGcQRYlIGR+NlKPwum2D8OEdkwVy5KCzZMkqBIG1uFTlQ/N/iH+kXoLUTP0l6nAWQa yq6HJhmlpHQ4a4Z4te9fUEaIwSpycscipJ49/owrUhFU/CJzgacC5UJKh6CxiWHY51xF bQwZwplJIGd+OJZGHP05F+Y8Rc9Fu1RASe+Wg9+ejEhlt4IPsiE+2lkHa/7h5y0oVXKK EFTCv0Um2cWCShtAi1Jxm/6PrqsuAcRfwSCL1JFDDnb1fZr+b7S3czxpNjr15ZLjCdu2 mdpw== 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-transfer-encoding; bh=ZT2sanu4H4MCQDl1zs4GbcLXlnWCZauPeX3K+ZLL5tM=; b=dNqbiCoQRvm/WBQ5a8uCr4tX3eVXiQ9E0BGm1TEMvPNNunOqbTOcit999y7Sieug5M phADsR3jlj48TNUTt9qWGfscAkrIavMoKjhVHcbcZTOGSmJkjgBv+VFjxHcr7Jt+oYGM HjwKJtjqsu+IC2G6GAWEBfkHP6+aKlbtLGQvjXrBKtl7RtHIge1cE3FNCKqk9T6h0bft PedufaSGePkKIks4z2fOvwTiqlLU0OcJ54EJC/wleOcY6ym5zY6Y8Z7Uc2+P5XPW4kIy 1xou2yvA/HXfiHcEAiH7NWtrVjw8+XYLlGYRnaEXeYlRyEnij60ApPsv9v2a4OPIwJtD /3qg== X-Gm-Message-State: ALQs6tBB2plmNBxK7sxKALUEmcEFAWmAKEgXi09kh+KvZP0uaXq0dSHz sc0QD+tJBJ1dwVRSxULhhHeXzg== X-Google-Smtp-Source: AIpwx4/iseB8K/wu+03PRsu7qvq4fALnOtpQqZSy5PSOLAq4VnU9sTRGGU9qxaVrA0G/a5qm72vebg== X-Received: by 10.223.158.6 with SMTP id u6mr2893260wre.142.1524000992304; Tue, 17 Apr 2018 14:36:32 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a? (p200300EA8BD43D00F08F8EDB1BD10A1A.dip0.t-ipconnect.de. [2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a]) by smtp.googlemail.com with ESMTPSA id p128sm19379276wmd.45.2018.04.17.14.36.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 14:36:31 -0700 (PDT) Subject: [PATCH net-next 01/19] r8169: remove unused member features from struct From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Message-ID: <7fb25fc7-ef24-7e70-3d9a-1383a530ee52@gmail.com> Date: Tue, 17 Apr 2018 23:17:13 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Member features of struct rtl8169_private isn't used any longer since commit 6c6aa15fdea5 "r8169: improve interrupt handling", so remove it. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 7d4e6890..5cd10ee6 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -832,8 +832,6 @@ struct rtl8169_private { struct work_struct work; } wk; - unsigned features; - struct mii_if_info mii; dma_addr_t counters_phys_addr; struct rtl8169_counters *counters; From patchwork Tue Apr 17 21:18:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 899717 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="dEyYG7Me"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40QdqX6dPWz9s1d for ; Wed, 18 Apr 2018 07:36:40 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752320AbeDQVgh (ORCPT ); Tue, 17 Apr 2018 17:36:37 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:32989 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752511AbeDQVge (ORCPT ); Tue, 17 Apr 2018 17:36:34 -0400 Received: by mail-wr0-f193.google.com with SMTP id z73so39360332wrb.0 for ; Tue, 17 Apr 2018 14:36:34 -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-transfer-encoding; bh=gm1ZABWSIYEdPKkkQ4r7oWEUyeLD2cLQEzaVRytDblA=; b=dEyYG7MensyKeAs1nqNlOWaGhwlcRMTXEpVpCcZZv1KoIEktt47x09Out/a+SR7Mqr FyjGRkLxDK7HEdfdHl2xbFt030UqxIMERa5vIATKl2yaEi972U4yeAc8o7Oka/OcvAaT IJ61oHf+qCiMkIWkQtpb7OK1Y92jtD96UMWMUIy3UeIgcMmcpAUpIBj0c7o5z69kxS9W mvNcM2WE2TiK/mR2UM8xHBel/2xCpBswdfZo+XapIOIdz7fbDhhCkcS/sz3Knyy8rNDx LpwmGGprupUl7dlfbV69SfTIURRzvtHkOXYK78zMukpfM+m982jdQRAyOPosxzH9Pk2N 7byQ== 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-transfer-encoding; bh=gm1ZABWSIYEdPKkkQ4r7oWEUyeLD2cLQEzaVRytDblA=; b=BkS4fZQAYtxdin8ZfK3+3HDvCps33CnNyb0MC4iIlQT8R/BldBgCct5kWp6NvzWSzk Yw3IsDM+chTNtaQPIdvX/SrI8J7MQ+714bOE+WfK/FDZPndmwBeiNMZq+zj+FceaxoPN NcMMFaNrDRT1RVMMMWKUWm5a5qdkcU3xuqWh5mCgiqeUs4BLNVl4hvJ1A9YywzPpXnIw E6FS4esVe+OxtPlETVzc60uDOgyfzd6+sR1TMTpMyYFplkuzvHUi5HEZru0sj8WDaoDQ mLOYVT+NgHDsCDzO7XPpGL8sD9y3vld4tnha3fQaeMQZRLNi0EF29siVKPaknMmxZDSZ jO9w== X-Gm-Message-State: ALQs6tDfbEf6lw+4A8ecETO6ohI1gNOS/3Kb6Rgd5XdAQLZInil8WlS6 gheKKNe3ZqTTGJ5SMTIDN/CVfA== X-Google-Smtp-Source: AIpwx4813PxoThWswE731X9HiHPb6ACePYqk/2vEVwvkN5Ru/wsPD3ig8b9mNzWrSsfIuczmnQJQfw== X-Received: by 10.28.148.129 with SMTP id w123mr2137856wmd.116.1524000993603; Tue, 17 Apr 2018 14:36:33 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a? (p200300EA8BD43D00F08F8EDB1BD10A1A.dip0.t-ipconnect.de. [2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a]) by smtp.googlemail.com with ESMTPSA id e11sm14015803wma.4.2018.04.17.14.36.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 14:36:33 -0700 (PDT) Subject: [PATCH net-next 02/19] r8169: remove member align from struct rtl_cfg_info From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Message-ID: <5269a4bc-760a-fc74-b2d6-060860875139@gmail.com> Date: Tue, 17 Apr 2018 23:18:05 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Since commit 6f0333b8fde4 "r8169: use 50% less ram for RX ring" member align isn't used any longer, so remove it. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 5cd10ee6..14f494a9 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -8016,7 +8016,6 @@ static const struct net_device_ops rtl_netdev_ops = { static const struct rtl_cfg_info { void (*hw_start)(struct net_device *); unsigned int region; - unsigned int align; u16 event_slow; unsigned int has_gmii:1; const struct rtl_coalesce_info *coalesce_info; @@ -8025,7 +8024,6 @@ static const struct rtl_cfg_info { [RTL_CFG_0] = { .hw_start = rtl_hw_start_8169, .region = 1, - .align = 0, .event_slow = SYSErr | LinkChg | RxOverflow | RxFIFOOver, .has_gmii = 1, .coalesce_info = rtl_coalesce_info_8169, @@ -8034,7 +8032,6 @@ static const struct rtl_cfg_info { [RTL_CFG_1] = { .hw_start = rtl_hw_start_8168, .region = 2, - .align = 8, .event_slow = SYSErr | LinkChg | RxOverflow, .has_gmii = 1, .coalesce_info = rtl_coalesce_info_8168_8136, @@ -8043,7 +8040,6 @@ static const struct rtl_cfg_info { [RTL_CFG_2] = { .hw_start = rtl_hw_start_8101, .region = 2, - .align = 8, .event_slow = SYSErr | LinkChg | RxOverflow | RxFIFOOver | PCSTimeout, .coalesce_info = rtl_coalesce_info_8168_8136, From patchwork Tue Apr 17 21:19:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 899740 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="pXb6/L3Y"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40QdsK50dQz9s1d for ; Wed, 18 Apr 2018 07:38:13 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753399AbeDQViK (ORCPT ); Tue, 17 Apr 2018 17:38:10 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:42261 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752655AbeDQVgg (ORCPT ); Tue, 17 Apr 2018 17:36:36 -0400 Received: by mail-wr0-f194.google.com with SMTP id s18so39359463wrg.9 for ; Tue, 17 Apr 2018 14:36:35 -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-transfer-encoding; bh=Q6gARWwjeQ+Paackza9mAMCuDMI+khnmzqstT5F/BHc=; b=pXb6/L3Y1PFfxwrGLfJNjt54032i07WhqYLUv7Irxu0Yp9wHnj905ANwKlQ/du+Wj4 gUs8ZqYbBTI6t+eh3/ABUWVP6Mzi5VG5yaihKZqsqdusAR3SJBiXoGvEpy2H2PcF8ju5 Oc5vmOWhmgUEgi1NxVEvCmPqrIggbl205SdVw+GU3GsOZNJJ/PV1Rw/pAwPYgaWgp0yP 6tNgYysk4PINgTco3aRXeFX4lv87dQCAqYahYk/G1aISjPbCZsM5a/RlZX7dRs8IOCMM XB2CDzF5AIZQCVFe4/yRfSwV2JJEon2ev4oUuowm9H3ZrK+Zo9L6Fwlx5ZWlMxO6Ptbm 0jHQ== 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-transfer-encoding; bh=Q6gARWwjeQ+Paackza9mAMCuDMI+khnmzqstT5F/BHc=; b=RGE6ODvkhcX99CHGhi6tfNjHQ9vdaptusg6hXWK3mUl0cakcd2+2VYBWVLKnmoI7Nf Uvh4AzGgVIU7I/aNPQ6+0YrNXLy9CcuwowerZW9tGMMAHqyjM2WnF5f2Zd+mMcJtor0X 8sddNy3yVB+XHpH9WBknroipzMstOQo5pbduhfKLoaRbEaRSXOlBczKwJefT5l9c2tGp 4GXUYEr/x/uYC+qXmrkbdk5/PbId3X/+rYlR2qzsvzLCkoWJLkk/hqYeDR21oilvP+eo kaRY76JaqMYZpdvl2Yjm16QglgPjSATCo/2iPmwqUTOcCXGnuXVfm8qEPER+ewjiffLs +IWQ== X-Gm-Message-State: ALQs6tDTmTcyiDfaCiQ6H3zXcyh0NF37iUjVseD+xtWh19eMEp9fc1XT KwKQ9U+fbnhy90/VUtvZBbYYcw== X-Google-Smtp-Source: AIpwx48JsO8gmjq0J9uvp1G9hgEc4pz0JiUsCw4DF7QTq4VTTkZCKqxPf83uAjgD203qQqa7YIoy1g== X-Received: by 10.223.146.166 with SMTP id 35mr2566712wrn.132.1524000994935; Tue, 17 Apr 2018 14:36:34 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a? (p200300EA8BD43D00F08F8EDB1BD10A1A.dip0.t-ipconnect.de. [2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a]) by smtp.googlemail.com with ESMTPSA id a205sm11331742wmf.18.2018.04.17.14.36.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 14:36:34 -0700 (PDT) Subject: [PATCH net-next 03/19] r8169: use skb_copy_to_linear_data in rtl8169_try_rx_copy From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Message-ID: <0dc76b70-b578-e698-1b3b-8b0d6cacca06@gmail.com> Date: Tue, 17 Apr 2018 23:19:07 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Not a giant leap for mankind, but let's avoid the open-coded memcpy and use standard helper skb_copy_to_linear_data instead. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 14f494a9..8c303617 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -7359,7 +7359,7 @@ static struct sk_buff *rtl8169_try_rx_copy(void *data, prefetch(data); skb = napi_alloc_skb(&tp->napi, pkt_size); if (skb) - memcpy(skb->data, data, pkt_size); + skb_copy_to_linear_data(skb, data, pkt_size); dma_sync_single_for_device(d, addr, pkt_size, DMA_FROM_DEVICE); return skb; From patchwork Tue Apr 17 21:20:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 899718 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="Dk0Xucjo"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40QdqZ3jdtz9s1d for ; Wed, 18 Apr 2018 07:36:42 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752800AbeDQVgk (ORCPT ); Tue, 17 Apr 2018 17:36:40 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:40584 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752703AbeDQVgh (ORCPT ); Tue, 17 Apr 2018 17:36:37 -0400 Received: by mail-wr0-f195.google.com with SMTP id v60so35491605wrc.7 for ; Tue, 17 Apr 2018 14:36:37 -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-transfer-encoding; bh=jDR0LmI5M993CZip9o0EeaFbMZucssK0okmYYrAFERo=; b=Dk0XucjoAgZiQSA8+un9jytxnUPkzHZI2LuE6vUFtItmYRBwAhbVb9XK/N5cdq4b2i KBoGGQfR/mvOYOaS//ezgolCIpb1ivZXSEc8xj2u6RuF2f9hNFhyHRlSt1ynlJO05nFK YTHYcm/FdmJPk57Wn1/36LHwxnUX4izd2zhp2/xgxoqc+mgDm7XiqjTWvTEOGlLN01JT rb5LOAwYk/OYJEPT+1GrUMCm1vCYYzh56fpcHr9VUMoP8s7yezNrgRSZrQBmWF6flsjm EArggBZ4T9ZFFLWF6zwbZ1bBZviHc0FTD2OLBrMnK3d8XNmBdYaKYH6gYX/itR+PocFe 9/Ww== 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-transfer-encoding; bh=jDR0LmI5M993CZip9o0EeaFbMZucssK0okmYYrAFERo=; b=h6Z5isjglUSdPV461lCzdKFTH3rA1wX1r5PdSP6rmA6O+qRAm5HZMrWMWzTeukMfKf QDC4/31xKDbwT9ot42G/fd6s2KD5mzSjdf7I6ErRQQqOMFH+mIFK/HeU8HpMcDpT4I0P lnsTUB8vG+Nw6wpeUAavDt3NaSMnBNlNB//2iSArnLCjaqxDgTDhRJ0jLNG9uCf+qsnE QzVFzt6UT1VcHwwJJplYBThiwmschozosOg+q40p5kFtH7uYSOHPzCrQENuVISSThQpy DnMK/bKn6LFKd04nhFLDxjgtEITrnGZFWXEovzTsfLlqk20VvLJ1UTPVN8TdagGwbkEP rG+Q== X-Gm-Message-State: ALQs6tDAgU5AhWaJ7Ga0nl7tFIjsacR7eMZU5/VusavUGkgT1yQEwH3Y JQWFL7r0XtCxDnMfEAtU1PzOrA== X-Google-Smtp-Source: AIpwx48Dbm81Temt9ikZ684gs4Ez5jR2vLDaMfgdu6aVYZGUbqP2d5fq4jKAVWCm7shxLMiSq0JL0A== X-Received: by 10.223.151.69 with SMTP id r63mr2840380wrb.57.1524000996248; Tue, 17 Apr 2018 14:36:36 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a? (p200300EA8BD43D00F08F8EDB1BD10A1A.dip0.t-ipconnect.de. [2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a]) by smtp.googlemail.com with ESMTPSA id l41sm28781223wrl.2.2018.04.17.14.36.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 14:36:35 -0700 (PDT) Subject: [PATCH net-next 04/19] r8169: use constant NAPI_POLL_WAIT From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Message-ID: Date: Tue, 17 Apr 2018 23:20:03 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We can use generic constant NAPI_POLL_WAIT instead of defining an own constant for the same value. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 8c303617..cc88e8ee 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -88,7 +88,6 @@ static const int multicast_filter_limit = 32; #define InterFrameGap 0x03 /* 3 means InterFrameGap = the shortest one */ #define R8169_REGS_SIZE 256 -#define R8169_NAPI_WEIGHT 64 #define NUM_TX_DESC 64 /* Number of Tx descriptor registers */ #define NUM_RX_DESC 256U /* Number of Rx descriptor registers */ #define R8169_TX_RING_BYTES (NUM_TX_DESC * sizeof(struct TxDesc)) @@ -8316,7 +8315,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) dev->ethtool_ops = &rtl8169_ethtool_ops; dev->watchdog_timeo = RTL8169_TX_TIMEOUT; - netif_napi_add(dev, &tp->napi, rtl8169_poll, R8169_NAPI_WEIGHT); + netif_napi_add(dev, &tp->napi, rtl8169_poll, NAPI_POLL_WEIGHT); /* don't enable SG, IP_CSUM and TSO by default - it might not work * properly for all devices */ From patchwork Tue Apr 17 21:21:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 899739 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="ldSeFJDs"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Qds82jn5z9s1d for ; Wed, 18 Apr 2018 07:38:04 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753124AbeDQViB (ORCPT ); Tue, 17 Apr 2018 17:38:01 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:38329 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752511AbeDQVgj (ORCPT ); Tue, 17 Apr 2018 17:36:39 -0400 Received: by mail-wr0-f193.google.com with SMTP id h3so26739003wrh.5 for ; Tue, 17 Apr 2018 14:36:38 -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-transfer-encoding; bh=p/ZV+mbLKviOXkD4UKr6oFLreKn55U/vs9haVGroWxs=; b=ldSeFJDsh8SYuiJbKfwiQD2yBt2OZpDdPGBqdcr9UA5rTv+DhaawRwWSAp3XThcsYk m3y9SxtbfwRfqoISgS/PZrfBIDxD5I1lQRUGJnY2/kcBIwuMYK9YIaJJHNW9qz9t0D8h AOVq5e0PvxdQazlS5o2BroZA8ImkWH83JIMIUqogKCpI0MJZdnnG8Op/sOhfdq0XHGfK KWMSNWT/cnH+7Td39x0Gw1kcagQu+/tjgb9iKlpOlzxsOAN9u5JT35pkt0ZbGQrolVWo rnoF3P095llFGIRXx+tEfh6oxBAgEttcxMbld/2cXb0NbNODWUHRTf1X5Vxh6xnd9Qf0 2STg== 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-transfer-encoding; bh=p/ZV+mbLKviOXkD4UKr6oFLreKn55U/vs9haVGroWxs=; b=pUF8GC5GYMXmSYmymFKx5Lj8kqtSSWz859vO0P9/VJz05FnO3jZ3qCv3jPg+CspW31 PIKDe6sRHm0h8zvEIw4SQOyMyEhYvj41K4vG4rYxMJbJPngh2KvqjEe2RNsqPpT9/S1d Lrp4kM2QK47BW3L1SKTzoFMT3xRO37uhU4ehr/wWdaMHF0rKkxCeVeJcr/sNAk3o0W+u lb9F+dTVWKrhnqVdnMNU8lc3cTa1kjyDFzNO7jeTli25wsvs+96EVriYQXQGTn3aL9Vq vII4lsH9/292J15OlvaBGCR5/d/jetqVsGyfuW3JEQPuVE5IiKkNITi1Z1qtzXEJTjjX 4DBg== X-Gm-Message-State: ALQs6tDJIA/hQns5iuMzpdGBKxtDCsN64Wsj5q8mfl4XCWAV7J/Ijvy5 R0pp9yYPSvZzVtV1f/X9o0lhQw== X-Google-Smtp-Source: AIpwx49k/Dfp7HfwTkAC6V1VA/83VSwAJoj4+JZbeT88xnVmepQ4yVpvwur1Bz4/SRkB7WOM91DSRg== X-Received: by 10.28.234.26 with SMTP id i26mr2177820wmh.104.1524000997702; Tue, 17 Apr 2018 14:36:37 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a? (p200300EA8BD43D00F08F8EDB1BD10A1A.dip0.t-ipconnect.de. [2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a]) by smtp.googlemail.com with ESMTPSA id q138sm12646976wmd.1.2018.04.17.14.36.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 14:36:37 -0700 (PDT) Subject: [PATCH net-next 05/19] r8169: switch to napi_schedule_irqoff From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Message-ID: <4d5d9752-fd65-f77b-480b-d511f6df66a8@gmail.com> Date: Tue, 17 Apr 2018 23:21:01 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org napi_schedule() is called from hard irq context, so we can switch to napi_schedule_irqoff() and avoid some overhead. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index cc88e8ee..34447a2e 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -7473,7 +7473,7 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance) handled = 1; rtl_irq_disable(tp); - napi_schedule(&tp->napi); + napi_schedule_irqoff(&tp->napi); } } return IRQ_RETVAL(handled); From patchwork Tue Apr 17 21:22:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 899719 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="FQWsMgE/"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Qdqb70LGz9s1d for ; Wed, 18 Apr 2018 07:36:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752888AbeDQVgl (ORCPT ); Tue, 17 Apr 2018 17:36:41 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:36931 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752658AbeDQVgk (ORCPT ); Tue, 17 Apr 2018 17:36:40 -0400 Received: by mail-wr0-f194.google.com with SMTP id f14so1799071wre.4 for ; Tue, 17 Apr 2018 14:36:39 -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-transfer-encoding; bh=DtqfKd8rapuGXzBGdKQSYeiJwLnzdE0XvxyuVRbtkzs=; b=FQWsMgE/fZIf0XR3lw9+HLmpTkgK2+Fy4/Xz4yYjkm1mPlLGQ8PqLkv04/ZzBzbmvN D9IpcxF2joHZjLcayJAPnEuRiIdKivPhxjkeTccAO42vHlJsYFxNZRyx8lr6Bzn4vk7L XNkMYTh/3O0PLZKulFAwsKXvyyjucjycgXZajsE+XSh66D2bEAqPzcBCFoQOh74sUVM+ KAfkkUanP2PIVKO+PerVERuRZHe06pz5oSJ8eEiIRgoBWx88+oFsh9w0kOF2mJHvnZ83 9hiV9e93eerqtmEdUNvvm1+ZvsPa7VNBFwkjo0wvcvI62DUIyZaZo1oMMe1XmnIbOkSV wJJw== 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-transfer-encoding; bh=DtqfKd8rapuGXzBGdKQSYeiJwLnzdE0XvxyuVRbtkzs=; b=Z8RlF+0Jym41+Y6ySLOdNJzuCIfo+icJlWli4JPr06yX630z+sOEjHPQSBddsoqlb+ LhDntS99VYRV/QJlywHtwXzdSiTfToDs5GIXBdmx1V1yH/kDt/3VYZCmCk7bFPpJbQu+ i7r7HMGa1oLBp6AbDO/fTxy8lnDmvD+XNwY9uFjVnyN9xWjTxE1owQRBwDDfyPAIRYs8 vEJ6bHLG/BBcyqYYy8G1EPpHYmnlub+9qxFO5TP4tnkii5lZ42Poe/Hz6GgJlzYPMh02 Zkg+orw7g1oTc5Z9hAppWkuefgjlxPWx5v4T2J4FG0WNtbW0n/E3gOMjgmX4MsiiBv3O kuGw== X-Gm-Message-State: ALQs6tCgsdibm94SHqily26Vy2in7Yj5xMQVlp2JkEeNhynnt0h7lSAE g35sSEPM/DjZOC6vzKXYj4mKxg== X-Google-Smtp-Source: AIpwx49UPKYkX4zSn0c/M4vjCg0SBq8zEnnW4+fsHDr76LetlOlI5m7pipjGmVbr5Ovbax26UAedYA== X-Received: by 10.223.159.1 with SMTP id l1mr2771975wrf.207.1524000998939; Tue, 17 Apr 2018 14:36:38 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a? (p200300EA8BD43D00F08F8EDB1BD10A1A.dip0.t-ipconnect.de. [2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a]) by smtp.googlemail.com with ESMTPSA id n143sm14374809wmd.29.2018.04.17.14.36.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 14:36:38 -0700 (PDT) Subject: [PATCH net-next 06/19] r8169: simplify rtl8169_alloc_rx_data From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Message-ID: Date: Tue, 17 Apr 2018 23:22:14 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org dev->dev.parent has the same value as tp_to_dev(tp) (set by SET_NETDEV_DEV() in rtl_init_one()) and we know it can't be NULL. This allows us to simplify the code. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 34447a2e..0216ca71 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -6731,8 +6731,7 @@ static struct sk_buff *rtl8169_alloc_rx_data(struct rtl8169_private *tp, void *data; dma_addr_t mapping; struct device *d = tp_to_dev(tp); - struct net_device *dev = tp->dev; - int node = dev->dev.parent ? dev_to_node(dev->dev.parent) : -1; + int node = dev_to_node(d); data = kmalloc_node(rx_buf_sz, GFP_KERNEL, node); if (!data) From patchwork Tue Apr 17 21:23:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 899720 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="FiMfSBNV"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Qdqf3fwwz9s1d for ; Wed, 18 Apr 2018 07:36:46 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752963AbeDQVgo (ORCPT ); Tue, 17 Apr 2018 17:36:44 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:38337 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752805AbeDQVgl (ORCPT ); Tue, 17 Apr 2018 17:36:41 -0400 Received: by mail-wr0-f194.google.com with SMTP id h3so26739223wrh.5 for ; Tue, 17 Apr 2018 14:36:41 -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-transfer-encoding; bh=YJ7xjbgOvwujWBOFOT30deTSPmTiwCRH34Zv41XADik=; b=FiMfSBNVEOYBnjVV8oLBM8S85mV9lVJ/rCua2yscsrjLIGBOL1T8jvmaZtTjFBZmdN dzoefJ0BfGhCtDtJuvcQqFERfbN051TkCPBdhBQovsaSGFmoFzsz3zNRD9lUagOtPp7v jk3XD+0WH3ZYAsKMbvS+doldGk+W8RUNvLMsaxNZULQx8PhvB4ZnEks+uwBsNzo6WFxa qewlEDUV9DKj6abLcZlNUyH5axc3Qgw7KJYMnTBJwPAQYKQg+qhnek+xjMviBmrA3MPW JoebQEx3m6Gp+cEdO2YfWcn3F9M5K55snuORM4jOwLuJALrZSQ7TRI0S2Lk5G4mGPmoG Kn6w== 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-transfer-encoding; bh=YJ7xjbgOvwujWBOFOT30deTSPmTiwCRH34Zv41XADik=; b=g0YUryz6D7GdlcRf4/Z2omMaIqji2WtvrTvs0sR6u5P5b2U16USMgsgAwwuoqCkAa2 NbgxquaO8Q/JbkUreEf6KAvV3ZxyTYAsEyFpRZp7EmpmUZH1jw7JMlg30awVHmed1n4N fRwqaQqpTQAaMzG0HnFaln7vI26cZEzSrxfh5csLWgDkb26ee1bG8B7D1AEgdHs71gFY 4vcj4Jm/mvfk+z3+tt4rdjZQCmb+oWLYzTF/AW0XU7CRI3X7BDDpSl8kcI4LpnD4JRt1 f8xqjd8A3xRCbnjt7KNNmrh0mjlse2fWBGbW7yxzL1BhVLxrFkaXoLpQAxFaZ8nzWGRw 3N9g== X-Gm-Message-State: ALQs6tDfbbjLMkIcJBrFvKWuoJqFBl7DyyJ8zOBKV52hJHMccEhUX48e ++AbmQuAz1yAnUpMujTvQDezmg== X-Google-Smtp-Source: AIpwx4+bekNoty1qkVIFhoO5i9dUy3W5rorNABAuP5AzMKNPvI8s6J7nJ4vSd9ihKkJQIWVapl9HUg== X-Received: by 10.223.185.121 with SMTP id b54mr1830159wrg.265.1524001000423; Tue, 17 Apr 2018 14:36:40 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a? (p200300EA8BD43D00F08F8EDB1BD10A1A.dip0.t-ipconnect.de. [2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a]) by smtp.googlemail.com with ESMTPSA id b47sm14660790wrg.13.2018.04.17.14.36.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 14:36:39 -0700 (PDT) Subject: [PATCH net-next 07/19] r8169: improve rtl8169_init_ring From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Message-ID: <96c01331-cfaf-5a6d-3818-ea125dc87a6d@gmail.com> Date: Tue, 17 Apr 2018 23:23:35 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This function doesn't use the net_device, therefore change the parameter to type struct rtl8169_private * to simplify the code. In addition we don't need the calculations in the memset statements, we can use the size of the arrays directly. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 0216ca71..3971d089 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -6803,14 +6803,12 @@ static int rtl8169_rx_fill(struct rtl8169_private *tp) return -ENOMEM; } -static int rtl8169_init_ring(struct net_device *dev) +static int rtl8169_init_ring(struct rtl8169_private *tp) { - struct rtl8169_private *tp = netdev_priv(dev); - rtl8169_init_ring_indexes(tp); - memset(tp->tx_skb, 0x0, NUM_TX_DESC * sizeof(struct ring_info)); - memset(tp->Rx_databuff, 0x0, NUM_RX_DESC * sizeof(void *)); + memset(tp->tx_skb, 0, sizeof(tp->tx_skb)); + memset(tp->Rx_databuff, 0, sizeof(tp->Rx_databuff)); return rtl8169_rx_fill(tp); } @@ -7678,7 +7676,7 @@ static int rtl_open(struct net_device *dev) if (!tp->RxDescArray) goto err_free_tx_0; - retval = rtl8169_init_ring(dev); + retval = rtl8169_init_ring(tp); if (retval < 0) goto err_free_rx_1; From patchwork Tue Apr 17 21:24:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 899722 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="YbOOtc/5"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Qdqm5PRLz9s1d for ; Wed, 18 Apr 2018 07:36:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753128AbeDQVgt (ORCPT ); Tue, 17 Apr 2018 17:36:49 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:41200 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752658AbeDQVgn (ORCPT ); Tue, 17 Apr 2018 17:36:43 -0400 Received: by mail-wr0-f195.google.com with SMTP id v24so22324468wra.8 for ; Tue, 17 Apr 2018 14:36:42 -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-transfer-encoding; bh=SbnNzcvr3WYMbUVEsAKU27U04l8iVJjKhUZAEVm1EgQ=; b=YbOOtc/5clo5n7JweKL2IWcU6A1LnzkS3g4LtuWa8xPuE+LLu70ATtO49arxJEHjEI KtW9KQLYe/AAcmf5FGVHSyC0rinml9YnB1ml9Q06DK/rdYjSF85y8oXxqIpu20ZMvEV9 D4nmzauGlDHEK3fbux/eb8yBgWvZgcVF0bcnCIPH3dbxDMJlvV8lICDB+sxEBJnLBStI QtCJErvdWsoD9gmN9RhNtpGTvx5inzIyhiSdRe/1yBPj3tFFu/CAhaWwZ1s8sJ4CaVra mrYKlvV7jwFt0ajzmJhI09fNsTZZx46A7GEeeUlQJue9NNgWDt6+wYzz42Mff3hVhj0s upDg== 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-transfer-encoding; bh=SbnNzcvr3WYMbUVEsAKU27U04l8iVJjKhUZAEVm1EgQ=; b=RKQ2KZE057ny4Csevf9xOPMf6pEelESAaGE0PGwP9gWIvSF5h96rc4I6Rx4nU5uCq4 rt367aokt+b1u8iOQV1N3s9A3Vp1nJh7I0niggU3pHnYgQs0gTlS36c+7kKKA11G2A6c Hr9EKKLUW5AKxO7uyDRUjRWHALOxETEN5ppBn/nE40PQ3BcWJtvruFo62anqG7kMlLgW cQetn0z/H0PMj6EmG98IXuLe0XyzeCKGJLUzL4keK35p565CwUbyzlfbyQb2/dZhCuWC Fou1+IU8KUTw1ZWLRB0dA2s6oIVUuGFyjjdbqzqQL4Cs8VFM2VCwfT13Rrp7FeoLhcqO NoTw== X-Gm-Message-State: ALQs6tD0vRbnBLK+LkMXvyrXF67nN/IIoR8mFA7mjRc/Oq2i9gaYtmA/ YaZbU5q8ss29RfUCBsrqUMNM7A== X-Google-Smtp-Source: AIpwx4/onAPpenxqARzmJtHbE5Pd94F9ufz5MGMllOUCbsdsJjLSEnr1neXPUg2DQ46TIuoeXbKzew== X-Received: by 10.28.92.211 with SMTP id q202mr2099237wmb.131.1524001001670; Tue, 17 Apr 2018 14:36:41 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a? (p200300EA8BD43D00F08F8EDB1BD10A1A.dip0.t-ipconnect.de. [2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a]) by smtp.googlemail.com with ESMTPSA id 14sm14948599wmo.27.2018.04.17.14.36.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 14:36:41 -0700 (PDT) Subject: [PATCH net-next 08/19] r8169: remove unneeded check in rtl8169_rx_fill From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Message-ID: <3b45d118-4272-cf1c-143c-7e1e06fdc5ac@gmail.com> Date: Tue, 17 Apr 2018 23:24:43 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org rtl8169_rx_fill() is called only once and directly before the call array tp->Rx_databuff[] is filled with zero's. Therefore we don't need this check. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 3971d089..d2d0940e 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -6784,9 +6784,6 @@ static int rtl8169_rx_fill(struct rtl8169_private *tp) for (i = 0; i < NUM_RX_DESC; i++) { void *data; - if (tp->Rx_databuff[i]) - continue; - data = rtl8169_alloc_rx_data(tp, tp->RxDescArray + i); if (!data) { rtl8169_make_unusable_by_asic(tp->RxDescArray + i); From patchwork Tue Apr 17 21:25:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 899721 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="cOJbr+qI"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Qdql0xhkz9s1d for ; Wed, 18 Apr 2018 07:36:51 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753084AbeDQVgs (ORCPT ); Tue, 17 Apr 2018 17:36:48 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:46924 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752941AbeDQVgo (ORCPT ); Tue, 17 Apr 2018 17:36:44 -0400 Received: by mail-wr0-f195.google.com with SMTP id d1so39359453wrj.13 for ; Tue, 17 Apr 2018 14:36: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-transfer-encoding; bh=tQDlk05wwOFv7L1KYiMl5YEHab022ODUDiyTJM91pQw=; b=cOJbr+qI1X226c39cdbKP3cXZ+wIlEJAc/v41az1SJUzHiRvIHPWeV8uwf+xHhqmgv doXiTeN7Rnwakmtwvzc6WpT/n/fCMFJ6J7JShJHv2Ro06woOJFMwCv2mevY5EtZnRelc dUOUYlmwhnfQcflkXRrztn6UVuMmC1TNR58OVi3UXAp2fqE9id3U97f0XQBuChl6WMTR cHQpFt02GBpE+ZoldI22QFnB6mJ/lFFFBNshn8nZIQzPZ4vhOzOfByTOD5DGBSJOCvjQ 6BTP6j7LZY53Jhm84lH1ijnulWCZqoHdpzou5Chy4IVRBeJRLA0yMr756N/QUMPajWR4 G0cg== 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-transfer-encoding; bh=tQDlk05wwOFv7L1KYiMl5YEHab022ODUDiyTJM91pQw=; b=rB65sXOQQtfYzNsdY+CcnEZFkawdkfkqLbabazs6YD5EFdkVBFF9fw55HHY1W/lyzI EJqOjoSIkKTnI+CeCa9zKZ+rJDdWvGonOCOxePkCpo+YPZIvwbiteyPWOJc3KNVJ+yqb e4+qzBPTXB2zrdMitJWwyqx9LHhgJftwmofUExLUPxRB4MOWJn/jZTjzKO50h/GAc9oh SAaRpA6f23QMk8aj8QthoRWVQ6fFpS79yl9z4Av/d0Wc2gqqtOQhHpLPYwvmuxgN8rV7 WC+t9xoLcbZZtWAy6GQlPvZzw+2I52cudEMRLfbEPz7lEhI0O9DrSxdXMlipZ+gbFfIJ 3kjg== X-Gm-Message-State: ALQs6tCRCZhYWdUbhndr8HR3qhDv47KnHzL47gdRwRNGI7jIRa+tYKhk g+ZlM5IWnmDPklfas9oSryml8A== X-Google-Smtp-Source: AIpwx4/8alTWEtkxFLkQAr+jEZgkypuQTJRAqN7uCnQCyGwXAp9Si02upTUGlaN8s95CmO/oivkaHg== X-Received: by 10.28.93.1 with SMTP id r1mr2238692wmb.2.1524001002951; Tue, 17 Apr 2018 14:36:42 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a? (p200300EA8BD43D00F08F8EDB1BD10A1A.dip0.t-ipconnect.de. [2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a]) by smtp.googlemail.com with ESMTPSA id 19sm16986001wmn.40.2018.04.17.14.36.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 14:36:42 -0700 (PDT) Subject: [PATCH net-next 09/19] r8169: replace rx_buf_sz with a constant From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Message-ID: <1c8223d6-02e9-2ed4-ff19-c22e3d0111ec@gmail.com> Date: Tue, 17 Apr 2018 23:25:46 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org rx_buf_sz is constant, so we don't have to pass it as parameter and in general can replace it with a constant. When working on this I noticed that also before in rtl_set_rx_max_size() a value of 0x4000 is set, what is not in line with the chip spec. According to the spec only bits 0..13 are used and we set an effective value of zero therefore. However, the driver still seems to work and due to potential side effects I'm reluctant to make a change. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 37 ++++++++++++++-------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index d2d0940e..c68771d0 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -88,6 +88,7 @@ static const int multicast_filter_limit = 32; #define InterFrameGap 0x03 /* 3 means InterFrameGap = the shortest one */ #define R8169_REGS_SIZE 256 +#define R8169_RX_BUF_SIZE (SZ_16K - 1) #define NUM_TX_DESC 64 /* Number of Tx descriptor registers */ #define NUM_RX_DESC 256U /* Number of Rx descriptor registers */ #define R8169_TX_RING_BYTES (NUM_TX_DESC * sizeof(struct TxDesc)) @@ -343,7 +344,6 @@ static const struct pci_device_id rtl8169_pci_tbl[] = { MODULE_DEVICE_TABLE(pci, rtl8169_pci_tbl); -static int rx_buf_sz = 16383; static int use_dac = -1; static struct { u32 msg_enable; @@ -5385,10 +5385,10 @@ static u16 rtl_rw_cpluscmd(struct rtl8169_private *tp) return cmd; } -static void rtl_set_rx_max_size(struct rtl8169_private *tp, unsigned int rx_buf_sz) +static void rtl_set_rx_max_size(struct rtl8169_private *tp) { /* Low hurts. Let's disable the filtering. */ - RTL_W16(tp, RxMaxSize, rx_buf_sz + 1); + RTL_W16(tp, RxMaxSize, R8169_RX_BUF_SIZE + 1); } static void rtl8169_set_magic_reg(struct rtl8169_private *tp, unsigned mac_version) @@ -5489,7 +5489,7 @@ static void rtl_hw_start_8169(struct net_device *dev) RTL_W8(tp, EarlyTxThres, NoEarlyTx); - rtl_set_rx_max_size(tp, rx_buf_sz); + rtl_set_rx_max_size(tp); if (tp->mac_version == RTL_GIGA_MAC_VER_01 || tp->mac_version == RTL_GIGA_MAC_VER_02 || @@ -6329,7 +6329,7 @@ static void rtl_hw_start_8168(struct net_device *dev) RTL_W8(tp, MaxTxPacketSize, TxPacketMax); - rtl_set_rx_max_size(tp, rx_buf_sz); + rtl_set_rx_max_size(tp); tp->cp_cmd |= RTL_R16(tp, CPlusCmd) | PktCntrDisable | INTT_1; @@ -6613,7 +6613,7 @@ static void rtl_hw_start_8101(struct net_device *dev) RTL_W8(tp, MaxTxPacketSize, TxPacketMax); - rtl_set_rx_max_size(tp, rx_buf_sz); + rtl_set_rx_max_size(tp); tp->cp_cmd &= ~R810X_CPCMD_QUIRK_MASK; RTL_W16(tp, CPlusCmd, tp->cp_cmd); @@ -6695,29 +6695,28 @@ static inline void rtl8169_make_unusable_by_asic(struct RxDesc *desc) static void rtl8169_free_rx_databuff(struct rtl8169_private *tp, void **data_buff, struct RxDesc *desc) { - dma_unmap_single(tp_to_dev(tp), le64_to_cpu(desc->addr), rx_buf_sz, - DMA_FROM_DEVICE); + dma_unmap_single(tp_to_dev(tp), le64_to_cpu(desc->addr), + R8169_RX_BUF_SIZE, DMA_FROM_DEVICE); kfree(*data_buff); *data_buff = NULL; rtl8169_make_unusable_by_asic(desc); } -static inline void rtl8169_mark_to_asic(struct RxDesc *desc, u32 rx_buf_sz) +static inline void rtl8169_mark_to_asic(struct RxDesc *desc) { u32 eor = le32_to_cpu(desc->opts1) & RingEnd; /* Force memory writes to complete before releasing descriptor */ dma_wmb(); - desc->opts1 = cpu_to_le32(DescOwn | eor | rx_buf_sz); + desc->opts1 = cpu_to_le32(DescOwn | eor | R8169_RX_BUF_SIZE); } -static inline void rtl8169_map_to_asic(struct RxDesc *desc, dma_addr_t mapping, - u32 rx_buf_sz) +static inline void rtl8169_map_to_asic(struct RxDesc *desc, dma_addr_t mapping) { desc->addr = cpu_to_le64(mapping); - rtl8169_mark_to_asic(desc, rx_buf_sz); + rtl8169_mark_to_asic(desc); } static inline void *rtl8169_align(void *data) @@ -6733,18 +6732,18 @@ static struct sk_buff *rtl8169_alloc_rx_data(struct rtl8169_private *tp, struct device *d = tp_to_dev(tp); int node = dev_to_node(d); - data = kmalloc_node(rx_buf_sz, GFP_KERNEL, node); + data = kmalloc_node(R8169_RX_BUF_SIZE, GFP_KERNEL, node); if (!data) return NULL; if (rtl8169_align(data) != data) { kfree(data); - data = kmalloc_node(rx_buf_sz + 15, GFP_KERNEL, node); + data = kmalloc_node(R8169_RX_BUF_SIZE + 15, GFP_KERNEL, node); if (!data) return NULL; } - mapping = dma_map_single(d, rtl8169_align(data), rx_buf_sz, + mapping = dma_map_single(d, rtl8169_align(data), R8169_RX_BUF_SIZE, DMA_FROM_DEVICE); if (unlikely(dma_mapping_error(d, mapping))) { if (net_ratelimit()) @@ -6752,7 +6751,7 @@ static struct sk_buff *rtl8169_alloc_rx_data(struct rtl8169_private *tp, goto err_out; } - rtl8169_map_to_asic(desc, mapping, rx_buf_sz); + rtl8169_map_to_asic(desc, mapping); return data; err_out: @@ -6864,7 +6863,7 @@ static void rtl_reset_work(struct rtl8169_private *tp) rtl8169_hw_reset(tp); for (i = 0; i < NUM_RX_DESC; i++) - rtl8169_mark_to_asic(tp->RxDescArray + i, rx_buf_sz); + rtl8169_mark_to_asic(tp->RxDescArray + i); rtl8169_tx_clear(tp); rtl8169_init_ring_indexes(tp); @@ -7444,7 +7443,7 @@ static int rtl_rx(struct net_device *dev, struct rtl8169_private *tp, u32 budget } release_descriptor: desc->opts2 = 0; - rtl8169_mark_to_asic(desc, rx_buf_sz); + rtl8169_mark_to_asic(desc); } count = cur_rx - tp->cur_rx; From patchwork Tue Apr 17 21:26:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 899736 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="kWNAc40J"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40QdrT2nvPz9s1d for ; Wed, 18 Apr 2018 07:37:29 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753038AbeDQVgr (ORCPT ); Tue, 17 Apr 2018 17:36:47 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:46928 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752840AbeDQVgp (ORCPT ); Tue, 17 Apr 2018 17:36:45 -0400 Received: by mail-wr0-f195.google.com with SMTP id d1so39359536wrj.13 for ; Tue, 17 Apr 2018 14:36: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-transfer-encoding; bh=QVEWxnpDs7PtelWPvOXq8MrGPhCgMSoDRNGHpcJRiYs=; b=kWNAc40JocMN+//cPGuW5P9zQjTQALRuN5c0sraSY7IK+rjxLkOWQmwNBNOD2XCs4F sVE0psvxUO2hJxmZM/HAyy7weO5fI445vhB9VV8BAJ/ZEPY4xGKrNKN6U3SZwDu6N6ZS M0hav1920wNEtBM+vgwrvUEazZFywMTO+FtQ+5FQdMRig/sVD+blcOnspTioH+raEYMG PxFtc9S2AlAQB4wKGj7zejJV1+Z04PFt7uUYoaop2g0JkZzmlIOv3PTQiMKRmoDXpTdx znszNfTA5POjGGwY09tum+4IzPGGoKx5iVXNb5bPIzGk5QIuEVx5pFDnccnR6Btn6suF EorQ== 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-transfer-encoding; bh=QVEWxnpDs7PtelWPvOXq8MrGPhCgMSoDRNGHpcJRiYs=; b=HVIgB17evv8ruRMVl8tMmOI8Jra2LVhTogggkcGFKmv6k4bQZR9Dt3wMutpTmJcCeQ iWB2yBIg7CdL53hFvysJ7cL4UAHNeJZxJwhpGC2Ck/Ejjmi55wX8X+LWpEK24ibEfuvj CK5A2wKhtulxi6vePmg2lAPnYSSZUDjcr7PjjO6aNsInYX9IDxhRCGp0GE/HPEpOMM/5 W+J6ssyErpfVEltfIT6cMICSK05OdF79KJzICm0ks6HZmY2+mHeXeIK6Nu/WkmY/ARgq oz1HissomZcDUWucuSBImJc11EwspQI1RxGvhYzyzIbp+CR5ytmjzev9vaamYebcCnOE HbKQ== X-Gm-Message-State: ALQs6tAfgO1DaQ7cIl795TtP5t7RpH1E8JuxGWWcsLGRkwEJRsLSJs6N 18qMPITzmPdlloHEum0EJUO8NQ== X-Google-Smtp-Source: AIpwx4/g4z+vtpKd5BCWQnIWijkiKj+X/8K9m4hkAmFNXvlxdgy5T9+Y2/gY/xdDOB1skSwmL2l+Tg== X-Received: by 10.28.74.91 with SMTP id x88mr2228654wma.53.1524001004184; Tue, 17 Apr 2018 14:36:44 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a? (p200300EA8BD43D00F08F8EDB1BD10A1A.dip0.t-ipconnect.de. [2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a]) by smtp.googlemail.com with ESMTPSA id 19sm11827330wmv.18.2018.04.17.14.36.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 14:36:43 -0700 (PDT) Subject: [PATCH net-next 10/19] r8169: remove rtl8169_map_to_asic From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Message-ID: <9fc01e59-0907-f7e1-6c48-74520f697a3f@gmail.com> Date: Tue, 17 Apr 2018 23:26:41 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This function is very simple and used only once, so we can inline the two statements. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index c68771d0..347c6152 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -6713,12 +6713,6 @@ static inline void rtl8169_mark_to_asic(struct RxDesc *desc) desc->opts1 = cpu_to_le32(DescOwn | eor | R8169_RX_BUF_SIZE); } -static inline void rtl8169_map_to_asic(struct RxDesc *desc, dma_addr_t mapping) -{ - desc->addr = cpu_to_le64(mapping); - rtl8169_mark_to_asic(desc); -} - static inline void *rtl8169_align(void *data) { return (void *)ALIGN((long)data, 16); @@ -6751,7 +6745,8 @@ static struct sk_buff *rtl8169_alloc_rx_data(struct rtl8169_private *tp, goto err_out; } - rtl8169_map_to_asic(desc, mapping); + desc->addr = cpu_to_le64(mapping); + rtl8169_mark_to_asic(desc); return data; err_out: From patchwork Tue Apr 17 21:27:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 899738 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="nZNivff5"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Qdrf0VjTz9s1d for ; Wed, 18 Apr 2018 07:37:38 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753138AbeDQVhg (ORCPT ); Tue, 17 Apr 2018 17:37:36 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:40612 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752985AbeDQVgq (ORCPT ); Tue, 17 Apr 2018 17:36:46 -0400 Received: by mail-wr0-f193.google.com with SMTP id v60so35492397wrc.7 for ; Tue, 17 Apr 2018 14:36: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-transfer-encoding; bh=BKPg18PYzdTQ8jq7UTr1Kq4IUuvt02nvWFz15iYuAlo=; b=nZNivff5qXhOKY/x/pHP6quTF0TflHacvYbdegsW0Lk6npPb/VDCVVs+WMxR+q44Ee ql1gYdq8gRw8ahqBLWbbZ44CK2ZMq+CG5hsGnalZrffQznCyL5GKOt/goCuOX0Qr6QwJ bQ1pBix5tOkCVzulaBTghgh9XdC3be+wI1HUshgQRM/z2iXlbgIGcdQ9n0HMVop8obya RjJsuVM+VP10rcPlykzEc8hT9rrE8l8TZU6j+5IHEwDHJklWb2AklXoAAa68hMrb2SNe BSOq/br7r4Ne7P5kO9NdJtgsyjvgyh28lmDtewYlSyKtX4EE7YqGPfG5CTojOtBoEptn cYew== 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-transfer-encoding; bh=BKPg18PYzdTQ8jq7UTr1Kq4IUuvt02nvWFz15iYuAlo=; b=AbqeUMdrFt5HAX9sZWwnE+cKpXUjNSFRc+nH30Xq8hFwKttU6dXVutVSuvHrggcDaA 0DXmdn8OJbZtzv1Q6SUyJDCZ/Eqa72T4z8z8t887bVdIJQsrjf4x7qFndA4XzsJFuefG I8lOfhmPbXA/29UbTqpa1wxbI1PH+wcSowBHGtC6E+PtezoT2QHVz9Jpt0c7MONzdWpW Zdc1UTaGFJbsOTweXX/tt7dLc6xLVSX98/Tl6kWOWiTi1ti5Xu08he5n2hZOBKzT1UtL qC41P7sGOWX9gPXn1lj/d8POt539clho8upYmjklpvfibeZrwgCulQFkVtJ+G5t5TpR6 W8mw== X-Gm-Message-State: ALQs6tCnLyXPqTkexBmlBG3ebfaYw2Jgc5LMhZD8WbIWsiju5BMOoiOe PpkdwNMGF3FSZDdy5zTARXl0Uw== X-Google-Smtp-Source: AIpwx49Ycl3FujFw0zdDYUrotciwbSxO4wljKL87khJE5FTZ7KUroY5n51E9mEHJ6NEI77+g6XVUIA== X-Received: by 10.28.139.18 with SMTP id n18mr2089314wmd.26.1524001005442; Tue, 17 Apr 2018 14:36:45 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a? (p200300EA8BD43D00F08F8EDB1BD10A1A.dip0.t-ipconnect.de. [2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a]) by smtp.googlemail.com with ESMTPSA id j21sm19724196wrb.49.2018.04.17.14.36.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 14:36:45 -0700 (PDT) Subject: [PATCH net-next 11/19] r8169: change hw_start argument type From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Message-ID: Date: Tue, 17 Apr 2018 23:27:38 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Code can be simplified by changing the argument type of hw_start callbacks from struct net_device * to struct rtl8169_private *. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 41 ++++++++++------------------ 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 347c6152..7a513b97 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -819,7 +819,7 @@ struct rtl8169_private { int (*get_link_ksettings)(struct net_device *, struct ethtool_link_ksettings *); void (*phy_reset_enable)(struct rtl8169_private *tp); - void (*hw_start)(struct net_device *); + void (*hw_start)(struct rtl8169_private *tp); unsigned int (*phy_reset_pending)(struct rtl8169_private *tp); unsigned int (*link_ok)(struct rtl8169_private *tp); int (*do_ioctl)(struct rtl8169_private *tp, struct mii_ioctl_data *data, int cmd); @@ -5354,12 +5354,9 @@ static void rtl_set_rx_tx_config_registers(struct rtl8169_private *tp) (InterFrameGap << TxInterFrameGapShift)); } -static void rtl_hw_start(struct net_device *dev) +static void rtl_hw_start(struct rtl8169_private *tp) { - struct rtl8169_private *tp = netdev_priv(dev); - - tp->hw_start(dev); - + tp->hw_start(tp); rtl_irq_enable_all(tp); } @@ -5468,14 +5465,11 @@ static void rtl_set_rx_mode(struct net_device *dev) RTL_W32(tp, RxConfig, tmp); } -static void rtl_hw_start_8169(struct net_device *dev) +static void rtl_hw_start_8169(struct rtl8169_private *tp) { - struct rtl8169_private *tp = netdev_priv(dev); - struct pci_dev *pdev = tp->pci_dev; - if (tp->mac_version == RTL_GIGA_MAC_VER_05) { RTL_W16(tp, CPlusCmd, RTL_R16(tp, CPlusCmd) | PCIMulRW); - pci_write_config_byte(pdev, PCI_CACHE_LINE_SIZE, 0x08); + pci_write_config_byte(tp->pci_dev, PCI_CACHE_LINE_SIZE, 0x08); } RTL_W8(tp, Cfg9346, Cfg9346_Unlock); @@ -5533,7 +5527,7 @@ static void rtl_hw_start_8169(struct net_device *dev) RTL_W32(tp, RxMissed, 0); - rtl_set_rx_mode(dev); + rtl_set_rx_mode(tp->dev); /* no early-rx interrupts */ RTL_W16(tp, MultiIntr, RTL_R16(tp, MultiIntr) & 0xf000); @@ -6321,10 +6315,8 @@ static void rtl_hw_start_8168ep_3(struct rtl8169_private *tp) r8168_mac_ocp_write(tp, 0xe860, data); } -static void rtl_hw_start_8168(struct net_device *dev) +static void rtl_hw_start_8168(struct rtl8169_private *tp) { - struct rtl8169_private *tp = netdev_priv(dev); - RTL_W8(tp, Cfg9346, Cfg9346_Unlock); RTL_W8(tp, MaxTxPacketSize, TxPacketMax); @@ -6449,7 +6441,7 @@ static void rtl_hw_start_8168(struct net_device *dev) default: printk(KERN_ERR PFX "%s: unknown chipset (mac_version = %d).\n", - dev->name, tp->mac_version); + tp->dev->name, tp->mac_version); break; } @@ -6457,7 +6449,7 @@ static void rtl_hw_start_8168(struct net_device *dev) RTL_W8(tp, ChipCmd, CmdTxEnb | CmdRxEnb); - rtl_set_rx_mode(dev); + rtl_set_rx_mode(tp->dev); RTL_W16(tp, MultiIntr, RTL_R16(tp, MultiIntr) & 0xf000); } @@ -6596,17 +6588,14 @@ static void rtl_hw_start_8106(struct rtl8169_private *tp) rtl_pcie_state_l2l3_enable(tp, false); } -static void rtl_hw_start_8101(struct net_device *dev) +static void rtl_hw_start_8101(struct rtl8169_private *tp) { - struct rtl8169_private *tp = netdev_priv(dev); - struct pci_dev *pdev = tp->pci_dev; - if (tp->mac_version >= RTL_GIGA_MAC_VER_30) tp->event_slow &= ~RxFIFOOver; if (tp->mac_version == RTL_GIGA_MAC_VER_13 || tp->mac_version == RTL_GIGA_MAC_VER_16) - pcie_capability_set_word(pdev, PCI_EXP_DEVCTL, + pcie_capability_set_word(tp->pci_dev, PCI_EXP_DEVCTL, PCI_EXP_DEVCTL_NOSNOOP_EN); RTL_W8(tp, Cfg9346, Cfg9346_Unlock); @@ -6664,7 +6653,7 @@ static void rtl_hw_start_8101(struct net_device *dev) RTL_W8(tp, ChipCmd, CmdTxEnb | CmdRxEnb); - rtl_set_rx_mode(dev); + rtl_set_rx_mode(tp->dev); RTL_R8(tp, IntrMask); @@ -6864,7 +6853,7 @@ static void rtl_reset_work(struct rtl8169_private *tp) rtl8169_init_ring_indexes(tp); napi_enable(&tp->napi); - rtl_hw_start(dev); + rtl_hw_start(tp); netif_wake_queue(dev); rtl8169_check_link_status(dev, tp); } @@ -7694,7 +7683,7 @@ static int rtl_open(struct net_device *dev) rtl_pll_power_up(tp); - rtl_hw_start(dev); + rtl_hw_start(tp); if (!rtl8169_init_counter_offsets(dev)) netif_warn(tp, hw, dev, "counter reset/update failed\n"); @@ -8001,7 +7990,7 @@ static const struct net_device_ops rtl_netdev_ops = { }; static const struct rtl_cfg_info { - void (*hw_start)(struct net_device *); + void (*hw_start)(struct rtl8169_private *tp); unsigned int region; u16 event_slow; unsigned int has_gmii:1; From patchwork Tue Apr 17 21:28:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 899737 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="f5coph0G"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40QdrV5WVpz9s1d for ; Wed, 18 Apr 2018 07:37:30 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753320AbeDQVh2 (ORCPT ); Tue, 17 Apr 2018 17:37:28 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:33031 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752840AbeDQVgs (ORCPT ); Tue, 17 Apr 2018 17:36:48 -0400 Received: by mail-wr0-f193.google.com with SMTP id z73so39361449wrb.0 for ; Tue, 17 Apr 2018 14:36: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-transfer-encoding; bh=uakxEZSQA7RUiU/MLt9m2On6MdsKQVqEsTo2dmzif/U=; b=f5coph0G+iW7OiUebUaeVoeCRaVuwID54CSXT8UbvVOMBBbNGUaNerTmdvxlr7KUAV 31WmwrJ2w4TNcRARntn+ecHUB3vDObcK6nSjPHll9XXGw0pPr5S2H+198vWC1S087pTc Z5dFqtJe1TV4Gve4EVQZO6zLiFGvf9eMLYf3i8HaU3T93Ppggm+yEM2XmuT0ZEXPKRDc AmKtkv9HtSlreGT4jzexvqmPqZiClVhx0pQntziikbteliE6VwYTHpvUqbjV+A2TEdGD kzfIHv2J3+nb/5Bu4TN1J7wfTq/bL+0WICMqLG5FHL1ggMgw2AsDNc6vplIQMhfe1q/c 1Igg== 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-transfer-encoding; bh=uakxEZSQA7RUiU/MLt9m2On6MdsKQVqEsTo2dmzif/U=; b=pRnK9Wq6zadLY4iiB/iHj3AhwqN1U6okoO91IJutxlrS4lnunHwnsA1mM8+MCiETzO quuXiyvm08bkWLe2cINRYMZuENrLobO8yJLtjXdGu11aN7zifzg6gi667Pf2u5I6olFE CICF/5U1BV1DZ02duoFLR04HLLRPuZSbCi6TcI7pv8P9t3yCyL7dMXR19o6C0TapmKRP mwWlqWDXFAwy5jlNd35ghqlQFDopOHzHQZ23ycIUSja5JDsDMZxd5EA8yRgUqH+pD/Lw et2DJLsYQUeZ/ZnqonR+3FGYNqmXm72qkcMz4RRM8uJqwjRpbBgUCsocXtuWzMqi9v9S QqBg== X-Gm-Message-State: ALQs6tAixDKvmAbx4Pi9fzbrEK83zZ+NC5qWAY3Xu4f0u6YHmY8ZA23y gdiI8zufKBAc6aGMgm2XbvGdFg== X-Google-Smtp-Source: AIpwx49Nu/xUKCutQ8UkcZCzoLehheBd6aAeaBqyywrmAly/EjP6Z43WajtZXhqBpSxkkJW9qS7zQA== X-Received: by 10.28.17.142 with SMTP id 136mr2000116wmr.38.1524001006704; Tue, 17 Apr 2018 14:36:46 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a? (p200300EA8BD43D00F08F8EDB1BD10A1A.dip0.t-ipconnect.de. [2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a]) by smtp.googlemail.com with ESMTPSA id m16sm15283445wmb.42.2018.04.17.14.36.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 14:36:46 -0700 (PDT) Subject: [PATCH net-next 12/19] r8169: change argument type of counters handling functions From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Message-ID: <82b1baf1-6656-a6b0-114a-57168611bb29@gmail.com> Date: Tue, 17 Apr 2018 23:28:28 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The counter handling functions don't deal with the net_device, so code can be simplified by changing the argument type to struct rtl8169_private *. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 32 +++++++++++----------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 7a513b97..7ee7b67b 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -2151,9 +2151,8 @@ DECLARE_RTL_COND(rtl_counters_cond) return RTL_R32(tp, CounterAddrLow) & (CounterReset | CounterDump); } -static bool rtl8169_do_counters(struct net_device *dev, u32 counter_cmd) +static bool rtl8169_do_counters(struct rtl8169_private *tp, u32 counter_cmd) { - struct rtl8169_private *tp = netdev_priv(dev); dma_addr_t paddr = tp->counters_phys_addr; u32 cmd; @@ -2166,10 +2165,8 @@ static bool rtl8169_do_counters(struct net_device *dev, u32 counter_cmd) return rtl_udelay_loop_wait_low(tp, &rtl_counters_cond, 10, 1000); } -static bool rtl8169_reset_counters(struct net_device *dev) +static bool rtl8169_reset_counters(struct rtl8169_private *tp) { - struct rtl8169_private *tp = netdev_priv(dev); - /* * Versions prior to RTL_GIGA_MAC_VER_19 don't support resetting the * tally counters. @@ -2177,13 +2174,11 @@ static bool rtl8169_reset_counters(struct net_device *dev) if (tp->mac_version < RTL_GIGA_MAC_VER_19) return true; - return rtl8169_do_counters(dev, CounterReset); + return rtl8169_do_counters(tp, CounterReset); } -static bool rtl8169_update_counters(struct net_device *dev) +static bool rtl8169_update_counters(struct rtl8169_private *tp) { - struct rtl8169_private *tp = netdev_priv(dev); - /* * Some chips are unable to dump tally counters when the receiver * is disabled. @@ -2191,12 +2186,11 @@ static bool rtl8169_update_counters(struct net_device *dev) if ((RTL_R8(tp, ChipCmd) & CmdRxEnb) == 0) return true; - return rtl8169_do_counters(dev, CounterDump); + return rtl8169_do_counters(tp, CounterDump); } -static bool rtl8169_init_counter_offsets(struct net_device *dev) +static bool rtl8169_init_counter_offsets(struct rtl8169_private *tp) { - struct rtl8169_private *tp = netdev_priv(dev); struct rtl8169_counters *counters = tp->counters; bool ret = false; @@ -2219,10 +2213,10 @@ static bool rtl8169_init_counter_offsets(struct net_device *dev) return true; /* If both, reset and update fail, propagate to caller. */ - if (rtl8169_reset_counters(dev)) + if (rtl8169_reset_counters(tp)) ret = true; - if (rtl8169_update_counters(dev)) + if (rtl8169_update_counters(tp)) ret = true; tp->tc_offset.tx_errors = counters->tx_errors; @@ -2245,7 +2239,7 @@ static void rtl8169_get_ethtool_stats(struct net_device *dev, pm_runtime_get_noresume(d); if (pm_runtime_active(d)) - rtl8169_update_counters(dev); + rtl8169_update_counters(tp); pm_runtime_put_noidle(d); @@ -7601,7 +7595,7 @@ static int rtl8169_close(struct net_device *dev) pm_runtime_get_sync(&pdev->dev); /* Update counters before going down */ - rtl8169_update_counters(dev); + rtl8169_update_counters(tp); rtl_lock_work(tp); clear_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags); @@ -7685,7 +7679,7 @@ static int rtl_open(struct net_device *dev) rtl_hw_start(tp); - if (!rtl8169_init_counter_offsets(dev)) + if (!rtl8169_init_counter_offsets(tp)) netif_warn(tp, hw, dev, "counter reset/update failed\n"); netif_start_queue(dev); @@ -7754,7 +7748,7 @@ rtl8169_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats) * from tally counters. */ if (pm_runtime_active(&pdev->dev)) - rtl8169_update_counters(dev); + rtl8169_update_counters(tp); /* * Subtract values fetched during initalization. @@ -7850,7 +7844,7 @@ static int rtl8169_runtime_suspend(struct device *device) /* Update counters before going runtime suspend */ rtl8169_rx_missed(dev); - rtl8169_update_counters(dev); + rtl8169_update_counters(tp); return 0; } From patchwork Tue Apr 17 21:29:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 899735 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="OvfOMCm6"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40QdrL5hPnz9s1d for ; Wed, 18 Apr 2018 07:37:22 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753275AbeDQVhU (ORCPT ); Tue, 17 Apr 2018 17:37:20 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:38361 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752941AbeDQVgt (ORCPT ); Tue, 17 Apr 2018 17:36:49 -0400 Received: by mail-wr0-f193.google.com with SMTP id h3so26739837wrh.5 for ; Tue, 17 Apr 2018 14:36: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-transfer-encoding; bh=OtnM0wPJIXnV3KTsl6xlePbG2vcPACwoIdO9ruVoXxc=; b=OvfOMCm63VVRMa3w/4MDv4xMDzCy4OjsWjRJy7Gywhf3IqlxjYvT93BfAyljjbdCA2 yDfYz7VPslv4UYXQ9DStbx/7w9dElkdp5epLd/qi59sOVTkBhwqRajKKkmQIkCFggeXj Cx3TVcxup0C9DM61vAUJtkDdEbkh+OBBOXc4onb59EQB56+W8I318srcn3BRzmMwk8Bm hEk+5RXZ0sEGRNOWOkc5UQVcI6v5hItzhbZYlL+vP7rM7VYaujMHyGz1uwNyMz/45fkk 6WCru38DZrkYrnTvAygn9dt6H1Q81ny1FJY8Vq3eIbd8KGGg01Viy7KAlIJrHtsAZTEF Gg6g== 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-transfer-encoding; bh=OtnM0wPJIXnV3KTsl6xlePbG2vcPACwoIdO9ruVoXxc=; b=gp0OqNmixx+CE8oNJhKjPEyKIX+c4wynDrN4Ulwh8GqbxPEJrHAVr+nC5JWYWiWR+D Z5kP9GLp5cRvfthNazft+eSxc4EabNgSX9WssiKfBZ66Vo4xstcuuDRpFZZ8e9jIkUJe 7VM/3367BGPyrZNxKRPXGdGFLNEmGniVEjglBwHnyMFqNP0c/r0rP8bBxEtNgK7Oh+cS U2+OMsTCd0gSe/qvARNmDubkUnsTz8UqOc+7BwD3Qxxc5XeWL8lZc9Zv6xBIRWylrliy Od73BHBt2G8u8gshtweOR7JHR8ygDUIOuUO/rX2tHeBASKMa+N4SBXLJALx9bn48YSsh NiXQ== X-Gm-Message-State: ALQs6tAr3EP9OFsnq+xsI0X6/em+n9VqkGlAmT8Em1I/To9Jlgk0vMHG TjJvfzjREQnrZy3YZ3qBj+IF8g== X-Google-Smtp-Source: AIpwx49pb01JhLm6PqY8h2UEpAsBM0UX22ojPVTGVlsRNjp4u8//7wVfAz/DCpqFjlUk7+7BOpmWlg== X-Received: by 10.28.206.7 with SMTP id e7mr2174974wmg.77.1524001007928; Tue, 17 Apr 2018 14:36:47 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a? (p200300EA8BD43D00F08F8EDB1BD10A1A.dip0.t-ipconnect.de. [2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a]) by smtp.googlemail.com with ESMTPSA id 64sm15584999wmb.2.2018.04.17.14.36.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 14:36:47 -0700 (PDT) Subject: [PATCH net-next 13/19] r8169: change interrupt handler argument type From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Message-ID: Date: Tue, 17 Apr 2018 23:29:20 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Code can be a little simplified by switching the interrupt handler argument type to struct rtl8169_private *. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 7ee7b67b..ead853ac 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -7432,8 +7432,7 @@ static int rtl_rx(struct net_device *dev, struct rtl8169_private *tp, u32 budget static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance) { - struct net_device *dev = dev_instance; - struct rtl8169_private *tp = netdev_priv(dev); + struct rtl8169_private *tp = dev_instance; int handled = 0; u16 status; @@ -7605,7 +7604,7 @@ static int rtl8169_close(struct net_device *dev) cancel_work_sync(&tp->wk.work); - pci_free_irq(pdev, 0, dev); + pci_free_irq(pdev, 0, tp); dma_free_coherent(&pdev->dev, R8169_RX_RING_BYTES, tp->RxDescArray, tp->RxPhyAddr); @@ -7660,7 +7659,7 @@ static int rtl_open(struct net_device *dev) rtl_request_firmware(tp); - retval = pci_request_irq(pdev, 0, rtl8169_interrupt, NULL, dev, + retval = pci_request_irq(pdev, 0, rtl8169_interrupt, NULL, tp, dev->name); if (retval < 0) goto err_release_fw_2; From patchwork Tue Apr 17 21:30:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 899723 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="uRJndPDS"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Qdqp2V32z9s1d for ; Wed, 18 Apr 2018 07:36:54 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753165AbeDQVgw (ORCPT ); Tue, 17 Apr 2018 17:36:52 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:39742 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752658AbeDQVgu (ORCPT ); Tue, 17 Apr 2018 17:36:50 -0400 Received: by mail-wr0-f195.google.com with SMTP id q6so27281083wrd.6 for ; Tue, 17 Apr 2018 14:36: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-transfer-encoding; bh=mu3xVYT9Qe05I+MDYNpzseAKmVf/fnZKoWscCwamabI=; b=uRJndPDSbuUJUEdtTJG4iE0Kgema4tI6Y9OX2into9ko4dtKlvGHtqWa1Bqct6WHsX HXydrBoYFeSMv0gYj/RP/aCn32ySo6G6dRYF8mmaOj+XJpE/BeiITlChPKmfK/wjqIK8 vJCT0dreD24qwVJpDPh8HGhmFADOSKNrXrMC4W47N+1uL4+/ZfsOULryTckpzVeBdgxs fy8kUoTZeWmXhC6stPGRM8G3ViDuETnFFHTrqmX3vTol8ZA8D3rCHNpeRIzrfFGYD5Q6 jU2fQyWV0I2CUHxpnsV4iLuQA807iYufJ/BwACxF9Yb7UtMULHL3tWNbTkOGLE7ZkdTB XSQw== 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-transfer-encoding; bh=mu3xVYT9Qe05I+MDYNpzseAKmVf/fnZKoWscCwamabI=; b=SFJSCpLaLVQ/N5QTcdET03Xqw4QG0qB61Q07w/TbiF6anzEGRJBNHwKb5lGCKH5NVq yd/RKowoXqK5JUQ2Kfdwhr7Rkjnh+njMRVRSE5zx80a3e7vjIsyBJhBNx6QYa0HDl3nP plnbyjG9yFN5YX4UEEtnUa6GHrc0y73zK+ORjmyXBIybylMzV4lR0xnhLyKr/2eMwHI5 wK6H68fMSg/EfP43B9yiIqdGPx9F7KhvGnfYVEukdvV9uNi6u51Kyl+794L6eVz18dRL NRmdVsmit5BOEC9zbDPRqFCLSorje1yHz5Yy9yE75azDgXISQbIDqnbQ2ZpknhcmeRSu rdeA== X-Gm-Message-State: ALQs6tAntPQb4lZrP/1mVSUzNyDSPrMxcEZuGIwi1DXEK5UEFcLKVIud sKQlujyed2znE1Z+kohIZfwYLg== X-Google-Smtp-Source: AIpwx49QkkaVjeBXbtyO18X8mHnwIzJyOH/LrNfWtlBwfcH3lTrAprtE1OMjFq2ehsbk/auUFzSIbQ== X-Received: by 10.28.71.12 with SMTP id u12mr2104466wma.145.1524001009161; Tue, 17 Apr 2018 14:36:49 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a? (p200300EA8BD43D00F08F8EDB1BD10A1A.dip0.t-ipconnect.de. [2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a]) by smtp.googlemail.com with ESMTPSA id l10sm3736657wre.6.2018.04.17.14.36.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 14:36:48 -0700 (PDT) Subject: [PATCH net-next 14/19] r8169: drop member opts1_mask from struct rtl8169_private From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Message-ID: Date: Tue, 17 Apr 2018 23:30:29 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We can get rid of member opts1_mask and in addition save a few cpu cycles in the hot path of rtl_rx(). Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index ead853ac..fe838112 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -836,7 +836,6 @@ struct rtl8169_private { struct rtl8169_counters *counters; struct rtl8169_tc_offsets tc_offset; u32 saved_wolopts; - u32 opts1_mask; struct rtl_fw { const struct firmware *fw; @@ -7347,7 +7346,7 @@ static int rtl_rx(struct net_device *dev, struct rtl8169_private *tp, u32 budget struct RxDesc *desc = tp->RxDescArray + entry; u32 status; - status = le32_to_cpu(desc->opts1) & tp->opts1_mask; + status = le32_to_cpu(desc->opts1); if (status & DescOwn) break; @@ -7365,14 +7364,16 @@ static int rtl_rx(struct net_device *dev, struct rtl8169_private *tp, u32 budget dev->stats.rx_length_errors++; if (status & RxCRC) dev->stats.rx_crc_errors++; - if (status & RxFOVF) { + /* RxFOVF is a reserved bit on later chip versions */ + if (tp->mac_version == RTL_GIGA_MAC_VER_01 && + status & RxFOVF) { rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_PENDING); dev->stats.rx_fifo_errors++; - } - if ((status & (RxRUNT | RxCRC)) && - !(status & (RxRWT | RxFOVF)) && - (dev->features & NETIF_F_RXALL)) + } else if (status & (RxRUNT | RxCRC) && + !(status & RxRWT) && + dev->features & NETIF_F_RXALL) { goto process_pkt; + } } else { struct sk_buff *skb; dma_addr_t addr; @@ -8327,9 +8328,6 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) tp->event_slow = cfg->event_slow; tp->coalesce_info = cfg->coalesce_info; - tp->opts1_mask = (tp->mac_version != RTL_GIGA_MAC_VER_01) ? - ~(RxBOVF | RxFOVF) : ~0; - timer_setup(&tp->timer, rtl8169_phy_timer, 0); tp->rtl_fw = RTL_FIRMWARE_UNKNOWN; From patchwork Tue Apr 17 21:31:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 899734 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="uiiSlnKe"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40QdrF4dgGz9s1d for ; Wed, 18 Apr 2018 07:37:17 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753251AbeDQVhO (ORCPT ); Tue, 17 Apr 2018 17:37:14 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:46949 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752944AbeDQVgv (ORCPT ); Tue, 17 Apr 2018 17:36:51 -0400 Received: by mail-wr0-f195.google.com with SMTP id d1so39360083wrj.13 for ; Tue, 17 Apr 2018 14:36: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-transfer-encoding; bh=T09nBs2mQddi1iYDceyA0ReYNfxRPXTXVyvWkLulreQ=; b=uiiSlnKeIo6cIqnp6M9vWTfzkKaIjxHXu/KeUM7sXDenmbVB9vRmvbxni7tmvu6hzQ ZNg0POnvP7XNMQt4FOQaoJSOcRu7gJ3Ux48pHVMBcMjoaq306hqRPp0dQeUVz0Xnyofj YtITPlKWtMbttWOPx5cFKOjfq6PoViDIDj3Jjl5Ie3fOae7Jr3MXkrGhThYEbVxQz8V1 dQRglYedfCya6eU+lmj7klPbsA9u4tTs9/AUcsQpAeryiTmg2FFQRP45FdUqK+socnyk gnysivDIuvIsTJhfPTnShed7oLZxShLsoV6Nrc3sqv7aZW+qOAl1ddMxdZhvuIOdk6bW PnGA== 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-transfer-encoding; bh=T09nBs2mQddi1iYDceyA0ReYNfxRPXTXVyvWkLulreQ=; b=je8aBq2sx8eqv5ABZYSv5YkvO/bnwUZaJwB6mt8JVceL7LUffwRAVc27KlHyK0lb1A yxycgeCzhU1kDdd4fqmlGEKxE2qm6nu2bEYln4azcXipXgjfKizOr3fXc1OF5NwZGNPM kzhB3iJYWAlfGoIeGIuc+WyLmOLP4jsBw9KSpfbimCK/6y/QSlZfkr/FsBi90WzrJPm1 XHCm1YVeQtBWRDbgUNMTMj66VJODjn3bKeo41GVmJyx6r0FT0UEjrJm/+17SDjQ709gM d+UM2toIIrWAYaxCy9Mja1aN/5vM6h28RxiKR5Be86J95KLXntLCMyFLjqTXf5oKAmda sA1Q== X-Gm-Message-State: ALQs6tAp++fb3ADLFmodR2AcpPZAuuT5Pq3FTeTondSqQBM+aU857GX4 6ysOIfTNd2JoexSmdbcUN6mAZQ== X-Google-Smtp-Source: AIpwx48s1K/S1faV2vvKL3cu3qnzG/yuwy/N84WSEKV5ACQKQPR4vYb7MjaxcL9joPE768jwquejRQ== X-Received: by 10.28.173.4 with SMTP id w4mr2190650wme.54.1524001010450; Tue, 17 Apr 2018 14:36:50 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a? (p200300EA8BD43D00F08F8EDB1BD10A1A.dip0.t-ipconnect.de. [2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a]) by smtp.googlemail.com with ESMTPSA id y42sm480237wry.21.2018.04.17.14.36.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 14:36:49 -0700 (PDT) Subject: [PATCH net-next 15/19] r8169: don't display tp->mmio_addr address From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Message-ID: <01162a61-212c-9eac-38cf-d7ca81b4819c@gmail.com> Date: Tue, 17 Apr 2018 23:31:21 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org For security reasons since commit ad67b74d2469 "printk: hash addresses printed with %p" %p doesn't display the full address any longer. We could switch to %px, but I think the pointer address doesn't provide a real benefit, so remove printing the hashed address. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index fe838112..f81abbe2 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -8344,8 +8344,8 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) if (rc < 0) return rc; - netif_info(tp, probe, dev, "%s at 0x%p, %pM, XID %08x IRQ %d\n", - rtl_chip_infos[chipset].name, tp->mmio_addr, dev->dev_addr, + netif_info(tp, probe, dev, "%s, %pM, XID %08x, IRQ %d\n", + rtl_chip_infos[chipset].name, dev->dev_addr, (u32)(RTL_R32(tp, TxConfig) & 0x9cf0f8ff), pci_irq_vector(pdev, 0)); if (rtl_chip_infos[chipset].jumbo_max != JUMBO_1K) { From patchwork Tue Apr 17 21:32:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 899724 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="ZmD8BdIR"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Qdqs3zLzz9s1d for ; Wed, 18 Apr 2018 07:36:57 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753180AbeDQVgz (ORCPT ); Tue, 17 Apr 2018 17:36:55 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:45156 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753156AbeDQVgx (ORCPT ); Tue, 17 Apr 2018 17:36:53 -0400 Received: by mail-wr0-f194.google.com with SMTP id u11so39347601wri.12 for ; Tue, 17 Apr 2018 14:36:52 -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-transfer-encoding; bh=vrOxVkXZKBghleOu4y4Q0URSh5RVgVHxq6RqL5LJ1P8=; b=ZmD8BdIRRVY8mC6AUdiOphdAcyjIVy1JY7yokoyREXcYszW2TcL2PmxnxWQNNcr4WM Pf5LCCELkYqYOIDgjtdHXkPalI196DKgg82j3p1TFASgAHN7NK/ySKU2h0YjXZrt2F5H QNpI0Q4xZExuFqe41KMG3FZtiBWtb8DNsmLtHoR/9Ht37hY2q3VRM3M7ad6icCktGnUS QQEqJIpaPWfmvkcGDrlYEtbweOvzyne+n8mPb+fpKm+6cK9HS8doQVMrNcrx64L5h/Wq nN1xoJTZxZYUppu1BwBasQH8HDHBvsRVQRMLS+vlMJSFnoKlmLfWVGSXVxNWzgL6dB/q dz7g== 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-transfer-encoding; bh=vrOxVkXZKBghleOu4y4Q0URSh5RVgVHxq6RqL5LJ1P8=; b=uXai7EJitXDs/b1/F11xcn/z5uW1oKFrLjevoCWp6IeXQKPCyV7Mo4avft0RzAw4RA HMDTjlSB5IqlvXTA4fbY5sW/E1uAiCblonj+8GyMjzwRIoQgRrK510YsqKy0zUB16myg gzP6jJhD+yZ+S6SRH9RR6d6D1qRdbLFp1taiuzaNN6/z5NZ0+tjbEEglwb01vcH0/hjI YdOPDihwdow9x9xlz2xxAQ8pugbMWKaobQpmTV3HXgsw3J4Yje2uqCgGZRGv7u0MmZGD nTGKm49k1M5OupqnpFZFAp41I+E+PQ7vB9S/C9jT4lWr47jqkXIaWvzVBt75PvzfiP4+ /cBw== X-Gm-Message-State: ALQs6tAhmT3CtFb/qntnhT/GW50PjJA3opqoIQKX2/lLxZLalyDayUyc AtHNmFhGBjmi+uT9XK7pgStaCQ== X-Google-Smtp-Source: AIpwx48CeXIWqL6Urufsqbj1biOB+0ST3nrJNDc36bxdc+xIy4Oyb9G5InRCgxqsMUOBKk6vFTm29g== X-Received: by 10.28.174.79 with SMTP id x76mr2241528wme.41.1524001011696; Tue, 17 Apr 2018 14:36:51 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a? (p200300EA8BD43D00F08F8EDB1BD10A1A.dip0.t-ipconnect.de. [2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a]) by smtp.googlemail.com with ESMTPSA id y42sm480366wry.21.2018.04.17.14.36.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 14:36:51 -0700 (PDT) Subject: [PATCH net-next 16/19] r8169: improve rtl8169_get_mac_version From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Message-ID: <766812b4-9501-9114-45b2-3ccc1ab0f2b7@gmail.com> Date: Tue, 17 Apr 2018 23:32:15 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Certain entries in array mac_info[] are redundant, so remove them: 0x7cf, 0x2c200000 (VER 33): matched by entry 0x7c8, 0x2c000000 0x7cf, 0x28300000 (VER 26): matched by entry 0x7c8, 0x28000000 0x7cf, 0x3cb00000 (VER 24): matched by entry 0x7c8, 0x3c800000 0x7cf, 0x3c400000 (VER 22): matched by entry 0x7c8, 0x3c000000 0x7cf, 0x38500000 (VER 17): matched by entry 0x7c8, 0x38000000 0x7cf, 0x44900000 (VER 39): matched by entry 0x7c8, 0x44800000 0x7cf, 0x40b00000 (VER 30): matched by entry 0x7c8, 0x40800000 0x7cf, 0x40a00000 (VER 30): matched by entry 0x7c8, 0x40800000 0x7cf, 0x34a00000 (VER 09): matched by entry 0x7c8, 0x34800000 0x7cf, 0x24a00000 (VER 09): matched by entry 0x7c8, 0x24800000 In addition don't mask out bits 30 and 29 when printing the XID. Most likely this is a relict from the times when the driver covered RTL8169 chip version only. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index f81abbe2..dbb7ba2c 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -2549,12 +2549,10 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp, /* 8168E family. */ { 0x7c800000, 0x2c800000, RTL_GIGA_MAC_VER_34 }, - { 0x7cf00000, 0x2c200000, RTL_GIGA_MAC_VER_33 }, { 0x7cf00000, 0x2c100000, RTL_GIGA_MAC_VER_32 }, { 0x7c800000, 0x2c000000, RTL_GIGA_MAC_VER_33 }, /* 8168D family. */ - { 0x7cf00000, 0x28300000, RTL_GIGA_MAC_VER_26 }, { 0x7cf00000, 0x28100000, RTL_GIGA_MAC_VER_25 }, { 0x7c800000, 0x28000000, RTL_GIGA_MAC_VER_26 }, @@ -2564,32 +2562,24 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp, { 0x7cf00000, 0x28b00000, RTL_GIGA_MAC_VER_31 }, /* 8168C family. */ - { 0x7cf00000, 0x3cb00000, RTL_GIGA_MAC_VER_24 }, { 0x7cf00000, 0x3c900000, RTL_GIGA_MAC_VER_23 }, { 0x7cf00000, 0x3c800000, RTL_GIGA_MAC_VER_18 }, { 0x7c800000, 0x3c800000, RTL_GIGA_MAC_VER_24 }, { 0x7cf00000, 0x3c000000, RTL_GIGA_MAC_VER_19 }, { 0x7cf00000, 0x3c200000, RTL_GIGA_MAC_VER_20 }, { 0x7cf00000, 0x3c300000, RTL_GIGA_MAC_VER_21 }, - { 0x7cf00000, 0x3c400000, RTL_GIGA_MAC_VER_22 }, { 0x7c800000, 0x3c000000, RTL_GIGA_MAC_VER_22 }, /* 8168B family. */ { 0x7cf00000, 0x38000000, RTL_GIGA_MAC_VER_12 }, - { 0x7cf00000, 0x38500000, RTL_GIGA_MAC_VER_17 }, { 0x7c800000, 0x38000000, RTL_GIGA_MAC_VER_17 }, { 0x7c800000, 0x30000000, RTL_GIGA_MAC_VER_11 }, /* 8101 family. */ - { 0x7cf00000, 0x44900000, RTL_GIGA_MAC_VER_39 }, { 0x7c800000, 0x44800000, RTL_GIGA_MAC_VER_39 }, { 0x7c800000, 0x44000000, RTL_GIGA_MAC_VER_37 }, - { 0x7cf00000, 0x40b00000, RTL_GIGA_MAC_VER_30 }, - { 0x7cf00000, 0x40a00000, RTL_GIGA_MAC_VER_30 }, { 0x7cf00000, 0x40900000, RTL_GIGA_MAC_VER_29 }, { 0x7c800000, 0x40800000, RTL_GIGA_MAC_VER_30 }, - { 0x7cf00000, 0x34a00000, RTL_GIGA_MAC_VER_09 }, - { 0x7cf00000, 0x24a00000, RTL_GIGA_MAC_VER_09 }, { 0x7cf00000, 0x34900000, RTL_GIGA_MAC_VER_08 }, { 0x7cf00000, 0x24900000, RTL_GIGA_MAC_VER_08 }, { 0x7cf00000, 0x34800000, RTL_GIGA_MAC_VER_07 }, @@ -8346,7 +8336,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) netif_info(tp, probe, dev, "%s, %pM, XID %08x, IRQ %d\n", rtl_chip_infos[chipset].name, dev->dev_addr, - (u32)(RTL_R32(tp, TxConfig) & 0x9cf0f8ff), + (u32)(RTL_R32(tp, TxConfig) & 0xfcf0f8ff), pci_irq_vector(pdev, 0)); if (rtl_chip_infos[chipset].jumbo_max != JUMBO_1K) { netif_info(tp, probe, dev, "jumbo features [frames: %d bytes, " From patchwork Tue Apr 17 21:33:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 899733 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="bVFD5C5a"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Qdr70kRwz9s1d for ; Wed, 18 Apr 2018 07:37:11 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753220AbeDQVhJ (ORCPT ); Tue, 17 Apr 2018 17:37:09 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:42334 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752658AbeDQVgy (ORCPT ); Tue, 17 Apr 2018 17:36:54 -0400 Received: by mail-wr0-f196.google.com with SMTP id s18so39360981wrg.9 for ; Tue, 17 Apr 2018 14:36:53 -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-transfer-encoding; bh=Jyu+cYTN9QKep68BDAQaFBt+Pqe46gT9kRE4/VK9Y7o=; b=bVFD5C5anYODO2OahW8gvHo7ogVInX4W+mKQh7go6DV92In0xMLS+kmhXVI4jURxqO V3Zrt3Su8A8tCD38lxPUNHc4K/ipNjGcPY7X2DnaRjlANZygotVBYiz8UOBcOIRxIOTv u3HcJdiWebyt/sJzzZYPPc5coGfyU9wBNdsGkGNwCRGGDCH4v1dCYWfVWWVmnRCJ4nDU wBiDPv7N6JIo9RnOK1nfTlnj6v4IBpZQck5BmTJjawcNeA/V/GXItY8ILmDAZxRc0OkW /zsKLVsYsz569Z9WmE6cnpIGqg87bNU4jsbXea9m2X+QkiY5YVpmPuZjCLn3opRqxx6j Y9yQ== 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-transfer-encoding; bh=Jyu+cYTN9QKep68BDAQaFBt+Pqe46gT9kRE4/VK9Y7o=; b=ff7cSMzW03NeStof3xLR/3E89RtS4+p79CvV8BQLT/oycqdBZNEwbJiZiupU4GGMOE V/S7T87mI2LRoxFZay/94E7mzqFqC+TqaxCjCmuLwYZQrYQ/tO/kL9VUFehI0sZ+wMsy I/qZHwnnrsEh+Em88y4CwFp7HZmZucYOJPLGUcm9pSJO6Fpq//YbqkeqJU9XuQtjyzTx UuAFYhY/a6Xie5XEia5g+6SwEbY1aVMEUzp0kMdUEslDX9vEx6LCT7hweHeIyCzDNRFH 49M1FhFPyOwiSAlYMzHgwWa7OGRo/TFizV8UuVlonr50O8y4LA0kiOHqPYCl8+6dgKQ4 jW/A== X-Gm-Message-State: ALQs6tApxeuDdfx0V26pYUtAT+I140yBJS4ONyPkyimMBOuZivIqapnO sdb43lKf7MGrvN2kX6Pimjc9Xg== X-Google-Smtp-Source: AIpwx4/bzPlLtrDX1Ao7cvwpPs3BUxJzrUu0DfZHS/Gq8huQLB2PW3drS8gvnbW8XcaPxE7UY2iK7w== X-Received: by 10.223.136.182 with SMTP id f51mr2602451wrf.55.1524001012933; Tue, 17 Apr 2018 14:36:52 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a? (p200300EA8BD43D00F08F8EDB1BD10A1A.dip0.t-ipconnect.de. [2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a]) by smtp.googlemail.com with ESMTPSA id v13sm14244281wrf.90.2018.04.17.14.36.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 14:36:52 -0700 (PDT) Subject: [PATCH net-next 17/19] r8169: drop member txd_version from struct rtl8169_private From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Message-ID: <53722553-eb6e-0cdc-d4ec-874d1f59574b@gmail.com> Date: Tue, 17 Apr 2018 23:33:03 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org txd_version is used in rtl_init_one() only, so we can drop member txd_version from struct rtl8169_private. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index dbb7ba2c..ccc57683 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -776,7 +776,6 @@ struct rtl8169_private { struct net_device *dev; struct napi_struct napi; u32 msg_enable; - u16 txd_version; u16 mac_version; u32 cur_rx; /* Index into the Rx descriptor buffer of next Rx pkt. */ u32 cur_tx; /* Index into the Tx descriptor buffer of next Rx pkt. */ @@ -8214,7 +8213,6 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) rtl8169_print_mac_version(tp); chipset = tp->mac_version; - tp->txd_version = rtl_chip_infos[chipset].txd_version; rc = rtl_alloc_irq(tp); if (rc < 0) { @@ -8299,13 +8297,17 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) /* Disallow toggling */ dev->hw_features &= ~NETIF_F_HW_VLAN_CTAG_RX; - if (tp->txd_version == RTL_TD_0) + switch (rtl_chip_infos[chipset].txd_version) { + case RTL_TD_0: tp->tso_csum = rtl8169_tso_csum_v1; - else if (tp->txd_version == RTL_TD_1) { + break; + case RTL_TD_1: tp->tso_csum = rtl8169_tso_csum_v2; dev->hw_features |= NETIF_F_IPV6_CSUM | NETIF_F_TSO6; - } else + break; + default: WARN_ON_ONCE(1); + } dev->hw_features |= NETIF_F_RXALL; dev->hw_features |= NETIF_F_RXFCS; From patchwork Tue Apr 17 21:34:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 899732 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="uZqHQjIB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Qdr11by5z9s1d for ; Wed, 18 Apr 2018 07:37:05 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753190AbeDQVg6 (ORCPT ); Tue, 17 Apr 2018 17:36:58 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:41240 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753124AbeDQVgz (ORCPT ); Tue, 17 Apr 2018 17:36:55 -0400 Received: by mail-wr0-f195.google.com with SMTP id v24so22325571wra.8 for ; Tue, 17 Apr 2018 14:36:55 -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-transfer-encoding; bh=1NDXKJvrDvXcc/X7nKerJ9iLZuGQlxaUHKNXYvENHnU=; b=uZqHQjIBHjSpYp2w8yJ93SA682Og2l6F2fjq/3//X8A03EMb5dv2xgH6p7eundtwoG mv5eMR1NVvOfJClvkHIpg8AGIzSHSH9XHPaiUhhCvcrjz7Z7TxN2oJ/koqT/U5xt9drN dkzaMKqqPSDRhLGeTNxkbdz9BCTeiCja6fXUI8CXW4Wxu9lNf9QeW/7kVvDgCyc1qQMa 273hZy2pWcVkV3/hLlcz3gWUfWJERHXGD3d9/hsmQL5bDrAZuSZwIfjurOT2/XANUCGB tQD+ec2dmHkQ8Fjl3QVu5kBYDo1BUOOM5TrBNwHSiJcSZzVAMD1bYMWgHzN93L9hkbzG q3Zg== 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-transfer-encoding; bh=1NDXKJvrDvXcc/X7nKerJ9iLZuGQlxaUHKNXYvENHnU=; b=seoKRcjC0snIfyHVEOqaa0QmC5kjE/5F8VmmS7Fa81hhwoT2+a86r1hppc6aDy5272 Icy6Xjb27vr8d13D1LODiPizsLgn/vrXygAA/S9Z2XSzg2YC48PVApU90oeDP14K74nb EiieTPSolFZyCLwyaPDggBbM5Zo27EkSFFxejbCO2l7WTXCru67PVsrLQ50kMjMTFdjb lVmmV7sVUowMnHUTlTgkbsVizzpV7/7ZwEfvRBbZfH8p7PDINDssiBDGyvyZLnVL849M 6wDyknSZiX6N6WwkpgqN00SfAcfiSL/vV/Rz090m7RY46ip944fTTcRmd9MJOx6z3rH3 0YGQ== X-Gm-Message-State: ALQs6tCI7r4HZNsa/KQd8/DZ5M68daWgkSaBKa8b8bZPMwDTaBcPWmMP mBivXXZmfaWXxEC/SOCKLBmKEg== X-Google-Smtp-Source: AIpwx4+xBwRCcbsljmfjCVMevlp1ZjnWbiAdz0zh/8X+0AWFTc2c436GlE9jQjH7abLvgHBtQN5fWA== X-Received: by 10.223.134.178 with SMTP id 47mr2859447wrx.256.1524001014180; Tue, 17 Apr 2018 14:36:54 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a? (p200300EA8BD43D00F08F8EDB1BD10A1A.dip0.t-ipconnect.de. [2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a]) by smtp.googlemail.com with ESMTPSA id 14sm14949634wmo.27.2018.04.17.14.36.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 14:36:53 -0700 (PDT) Subject: [PATCH net-next 18/19] r8169: improve pci region handling From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Message-ID: <903294b6-8b02-03a9-3a21-45767ce6251a@gmail.com> Date: Tue, 17 Apr 2018 23:34:22 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The region to be used is always the first of type IORESOURCE_MEM. We can implement this rule directly w/o having to specify which region is the first one per configuration entry. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index ccc57683..94e91d3c 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -7974,7 +7974,6 @@ static const struct net_device_ops rtl_netdev_ops = { static const struct rtl_cfg_info { void (*hw_start)(struct rtl8169_private *tp); - unsigned int region; u16 event_slow; unsigned int has_gmii:1; const struct rtl_coalesce_info *coalesce_info; @@ -7982,7 +7981,6 @@ static const struct rtl_cfg_info { } rtl_cfg_infos [] = { [RTL_CFG_0] = { .hw_start = rtl_hw_start_8169, - .region = 1, .event_slow = SYSErr | LinkChg | RxOverflow | RxFIFOOver, .has_gmii = 1, .coalesce_info = rtl_coalesce_info_8169, @@ -7990,7 +7988,6 @@ static const struct rtl_cfg_info { }, [RTL_CFG_1] = { .hw_start = rtl_hw_start_8168, - .region = 2, .event_slow = SYSErr | LinkChg | RxOverflow, .has_gmii = 1, .coalesce_info = rtl_coalesce_info_8168_8136, @@ -7998,7 +7995,6 @@ static const struct rtl_cfg_info { }, [RTL_CFG_2] = { .hw_start = rtl_hw_start_8101, - .region = 2, .event_slow = SYSErr | LinkChg | RxOverflow | RxFIFOOver | PCSTimeout, .coalesce_info = rtl_coalesce_info_8168_8136, @@ -8098,11 +8094,10 @@ static void rtl_hw_initialize(struct rtl8169_private *tp) static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) { const struct rtl_cfg_info *cfg = rtl_cfg_infos + ent->driver_data; - const unsigned int region = cfg->region; struct rtl8169_private *tp; struct mii_if_info *mii; struct net_device *dev; - int chipset, i; + int chipset, region, i; int rc; if (netif_msg_drv(&debug)) { @@ -8144,11 +8139,10 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) if (pcim_set_mwi(pdev) < 0) netif_info(tp, probe, dev, "Mem-Wr-Inval unavailable\n"); - /* make sure PCI base addr 1 is MMIO */ - if (!(pci_resource_flags(pdev, region) & IORESOURCE_MEM)) { - netif_err(tp, probe, dev, - "region #%d not an MMIO resource, aborting\n", - region); + /* use first MMIO region */ + region = ffs(pci_select_bars(pdev, IORESOURCE_MEM)) - 1; + if (region < 0) { + netif_err(tp, probe, dev, "no MMIO resource found\n"); return -ENODEV; } From patchwork Tue Apr 17 21:36:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 899727 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="I4r7Qfv0"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Qdqx4tLpz9s1d for ; Wed, 18 Apr 2018 07:37:01 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753213AbeDQVhA (ORCPT ); Tue, 17 Apr 2018 17:37:00 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:39763 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753156AbeDQVg5 (ORCPT ); Tue, 17 Apr 2018 17:36:57 -0400 Received: by mail-wr0-f195.google.com with SMTP id q6so27281659wrd.6 for ; Tue, 17 Apr 2018 14:36:56 -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-transfer-encoding; bh=B2bcBO4JXsRp0PqfbABH5Zi1dm26K3eoOR6nTx6ULT0=; b=I4r7Qfv0Xg4nUQr3qWTlDwjgeOqd1NpH0JLNPHZMhZsr3DjKn1PFrr7MMoH3LP19XV JiIE3N4aXh/2NAhLGvvziXISJJjBrIZA+B4+x5JVoX58yL4W3kLikWg+x+y2fx5MJQWq 3tNhfC4f5bqX143/4jeRxWNMITKkd2zls/R9QgrRbhXimNWyap7/u9DnIj/DzxWMyG5N aVP0rYEKkWidDHQczcn8QH8cMbhZPJFm7TRsmTW4m/ytwZSSdKkEHHArJLJrX/DdSjl6 rwcvmRlTkr3srYx0cAdX6bM/YyEQOzxhKmvEgR5njS2GdSk1L9wxDvCIGW9NI+mCz1IJ 0LKg== 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-transfer-encoding; bh=B2bcBO4JXsRp0PqfbABH5Zi1dm26K3eoOR6nTx6ULT0=; b=XBO/WYqMaYSbm+wtoaV6Fx1uytFs93qAESmIpUZH8CZZgoIn1A6sN46Y1Bna5fUO7T wuwdXlC1jpnXlxo/ejre+ETqRDzkeov0MnuxkQLUfnOdYxJxusmEMSRbUOjZruM0Xs4l n7lrzwkbDMy7+dBN+9TN9c+xljNY9qlxGpZbZQrhhUHmt8IP+HdW1xAGhgwsK7zD2O7z cLHf/5c5SaKpaFs0SE3ET1VbD+HcPAmTJsnlOKauI+PfZF93TgbhBqlhwGeT8vCF9bdl gFoADdS1OOqtFMNz9qTzeNMxeXXJ8wQBQClC/arddDDlVlm7745UoulKTqTtDzx1P8tU 3U1A== X-Gm-Message-State: ALQs6tAFN7LNF108erOhWn4rDVEvdpmCiN9Q8DhNivz6uyVdD0p+egss 6Jy39KneFEc/blfBQ1sP+F/bgg== X-Google-Smtp-Source: AIpwx483quaLo24jo04oHbfcqByYO7zZevNGO+3g3RuTrZ22SOpPH3FwfAJSTWW8Cd0hrnHdMT1bXg== X-Received: by 10.223.145.162 with SMTP id 31mr2886755wri.124.1524001015531; Tue, 17 Apr 2018 14:36:55 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a? (p200300EA8BD43D00F08F8EDB1BD10A1A.dip0.t-ipconnect.de. [2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a]) by smtp.googlemail.com with ESMTPSA id r75sm10031722wmf.34.2018.04.17.14.36.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 14:36:55 -0700 (PDT) Subject: [PATCH net-next 19/19] r8169: remove jumbo_tx_csum from chip config struct From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Message-ID: <383cfa0c-c29d-bd17-cd86-934d94d3b4c9@gmail.com> Date: Tue, 17 Apr 2018 23:36:12 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org According to the chip configuration entries only RTL8169 (ver <= 06) supports tx checksumming for jumbo packets. By the way: constant JUMBO_1K is a little misleading because it refers to the standard packet size and not to a jumbo packet size. By implementing this rule we can get rid of configuring tx checksumming support per chip type. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 133 +++++++++++---------------- 1 file changed, 54 insertions(+), 79 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 94e91d3c..fcd42d03 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -171,12 +171,11 @@ enum rtl_tx_desc_version { #define JUMBO_7K (7*1024 - ETH_HLEN - 2) #define JUMBO_9K (9*1024 - ETH_HLEN - 2) -#define _R(NAME,TD,FW,SZ,B) { \ +#define _R(NAME,TD,FW,SZ) { \ .name = NAME, \ .txd_version = TD, \ .fw_name = FW, \ .jumbo_max = SZ, \ - .jumbo_tx_csum = B \ } static const struct { @@ -184,135 +183,111 @@ static const struct { enum rtl_tx_desc_version txd_version; const char *fw_name; u16 jumbo_max; - bool jumbo_tx_csum; } rtl_chip_infos[] = { /* PCI devices. */ [RTL_GIGA_MAC_VER_01] = - _R("RTL8169", RTL_TD_0, NULL, JUMBO_7K, true), + _R("RTL8169", RTL_TD_0, NULL, JUMBO_7K), [RTL_GIGA_MAC_VER_02] = - _R("RTL8169s", RTL_TD_0, NULL, JUMBO_7K, true), + _R("RTL8169s", RTL_TD_0, NULL, JUMBO_7K), [RTL_GIGA_MAC_VER_03] = - _R("RTL8110s", RTL_TD_0, NULL, JUMBO_7K, true), + _R("RTL8110s", RTL_TD_0, NULL, JUMBO_7K), [RTL_GIGA_MAC_VER_04] = - _R("RTL8169sb/8110sb", RTL_TD_0, NULL, JUMBO_7K, true), + _R("RTL8169sb/8110sb", RTL_TD_0, NULL, JUMBO_7K), [RTL_GIGA_MAC_VER_05] = - _R("RTL8169sc/8110sc", RTL_TD_0, NULL, JUMBO_7K, true), + _R("RTL8169sc/8110sc", RTL_TD_0, NULL, JUMBO_7K), [RTL_GIGA_MAC_VER_06] = - _R("RTL8169sc/8110sc", RTL_TD_0, NULL, JUMBO_7K, true), + _R("RTL8169sc/8110sc", RTL_TD_0, NULL, JUMBO_7K), /* PCI-E devices. */ [RTL_GIGA_MAC_VER_07] = - _R("RTL8102e", RTL_TD_1, NULL, JUMBO_1K, true), + _R("RTL8102e", RTL_TD_1, NULL, JUMBO_1K), [RTL_GIGA_MAC_VER_08] = - _R("RTL8102e", RTL_TD_1, NULL, JUMBO_1K, true), + _R("RTL8102e", RTL_TD_1, NULL, JUMBO_1K), [RTL_GIGA_MAC_VER_09] = - _R("RTL8102e", RTL_TD_1, NULL, JUMBO_1K, true), + _R("RTL8102e", RTL_TD_1, NULL, JUMBO_1K), [RTL_GIGA_MAC_VER_10] = - _R("RTL8101e", RTL_TD_0, NULL, JUMBO_1K, true), + _R("RTL8101e", RTL_TD_0, NULL, JUMBO_1K), [RTL_GIGA_MAC_VER_11] = - _R("RTL8168b/8111b", RTL_TD_0, NULL, JUMBO_4K, false), + _R("RTL8168b/8111b", RTL_TD_0, NULL, JUMBO_4K), [RTL_GIGA_MAC_VER_12] = - _R("RTL8168b/8111b", RTL_TD_0, NULL, JUMBO_4K, false), + _R("RTL8168b/8111b", RTL_TD_0, NULL, JUMBO_4K), [RTL_GIGA_MAC_VER_13] = - _R("RTL8101e", RTL_TD_0, NULL, JUMBO_1K, true), + _R("RTL8101e", RTL_TD_0, NULL, JUMBO_1K), [RTL_GIGA_MAC_VER_14] = - _R("RTL8100e", RTL_TD_0, NULL, JUMBO_1K, true), + _R("RTL8100e", RTL_TD_0, NULL, JUMBO_1K), [RTL_GIGA_MAC_VER_15] = - _R("RTL8100e", RTL_TD_0, NULL, JUMBO_1K, true), + _R("RTL8100e", RTL_TD_0, NULL, JUMBO_1K), [RTL_GIGA_MAC_VER_16] = - _R("RTL8101e", RTL_TD_0, NULL, JUMBO_1K, true), + _R("RTL8101e", RTL_TD_0, NULL, JUMBO_1K), [RTL_GIGA_MAC_VER_17] = - _R("RTL8168b/8111b", RTL_TD_0, NULL, JUMBO_4K, false), + _R("RTL8168b/8111b", RTL_TD_0, NULL, JUMBO_4K), [RTL_GIGA_MAC_VER_18] = - _R("RTL8168cp/8111cp", RTL_TD_1, NULL, JUMBO_6K, false), + _R("RTL8168cp/8111cp", RTL_TD_1, NULL, JUMBO_6K), [RTL_GIGA_MAC_VER_19] = - _R("RTL8168c/8111c", RTL_TD_1, NULL, JUMBO_6K, false), + _R("RTL8168c/8111c", RTL_TD_1, NULL, JUMBO_6K), [RTL_GIGA_MAC_VER_20] = - _R("RTL8168c/8111c", RTL_TD_1, NULL, JUMBO_6K, false), + _R("RTL8168c/8111c", RTL_TD_1, NULL, JUMBO_6K), [RTL_GIGA_MAC_VER_21] = - _R("RTL8168c/8111c", RTL_TD_1, NULL, JUMBO_6K, false), + _R("RTL8168c/8111c", RTL_TD_1, NULL, JUMBO_6K), [RTL_GIGA_MAC_VER_22] = - _R("RTL8168c/8111c", RTL_TD_1, NULL, JUMBO_6K, false), + _R("RTL8168c/8111c", RTL_TD_1, NULL, JUMBO_6K), [RTL_GIGA_MAC_VER_23] = - _R("RTL8168cp/8111cp", RTL_TD_1, NULL, JUMBO_6K, false), + _R("RTL8168cp/8111cp", RTL_TD_1, NULL, JUMBO_6K), [RTL_GIGA_MAC_VER_24] = - _R("RTL8168cp/8111cp", RTL_TD_1, NULL, JUMBO_6K, false), + _R("RTL8168cp/8111cp", RTL_TD_1, NULL, JUMBO_6K), [RTL_GIGA_MAC_VER_25] = - _R("RTL8168d/8111d", RTL_TD_1, FIRMWARE_8168D_1, - JUMBO_9K, false), + _R("RTL8168d/8111d", RTL_TD_1, FIRMWARE_8168D_1, JUMBO_9K), [RTL_GIGA_MAC_VER_26] = - _R("RTL8168d/8111d", RTL_TD_1, FIRMWARE_8168D_2, - JUMBO_9K, false), + _R("RTL8168d/8111d", RTL_TD_1, FIRMWARE_8168D_2, JUMBO_9K), [RTL_GIGA_MAC_VER_27] = - _R("RTL8168dp/8111dp", RTL_TD_1, NULL, JUMBO_9K, false), + _R("RTL8168dp/8111dp", RTL_TD_1, NULL, JUMBO_9K), [RTL_GIGA_MAC_VER_28] = - _R("RTL8168dp/8111dp", RTL_TD_1, NULL, JUMBO_9K, false), + _R("RTL8168dp/8111dp", RTL_TD_1, NULL, JUMBO_9K), [RTL_GIGA_MAC_VER_29] = - _R("RTL8105e", RTL_TD_1, FIRMWARE_8105E_1, - JUMBO_1K, true), + _R("RTL8105e", RTL_TD_1, FIRMWARE_8105E_1, JUMBO_1K), [RTL_GIGA_MAC_VER_30] = - _R("RTL8105e", RTL_TD_1, FIRMWARE_8105E_1, - JUMBO_1K, true), + _R("RTL8105e", RTL_TD_1, FIRMWARE_8105E_1, JUMBO_1K), [RTL_GIGA_MAC_VER_31] = - _R("RTL8168dp/8111dp", RTL_TD_1, NULL, JUMBO_9K, false), + _R("RTL8168dp/8111dp", RTL_TD_1, NULL, JUMBO_9K), [RTL_GIGA_MAC_VER_32] = - _R("RTL8168e/8111e", RTL_TD_1, FIRMWARE_8168E_1, - JUMBO_9K, false), + _R("RTL8168e/8111e", RTL_TD_1, FIRMWARE_8168E_1, JUMBO_9K), [RTL_GIGA_MAC_VER_33] = - _R("RTL8168e/8111e", RTL_TD_1, FIRMWARE_8168E_2, - JUMBO_9K, false), + _R("RTL8168e/8111e", RTL_TD_1, FIRMWARE_8168E_2, JUMBO_9K), [RTL_GIGA_MAC_VER_34] = - _R("RTL8168evl/8111evl",RTL_TD_1, FIRMWARE_8168E_3, - JUMBO_9K, false), + _R("RTL8168evl/8111evl",RTL_TD_1, FIRMWARE_8168E_3, JUMBO_9K), [RTL_GIGA_MAC_VER_35] = - _R("RTL8168f/8111f", RTL_TD_1, FIRMWARE_8168F_1, - JUMBO_9K, false), + _R("RTL8168f/8111f", RTL_TD_1, FIRMWARE_8168F_1, JUMBO_9K), [RTL_GIGA_MAC_VER_36] = - _R("RTL8168f/8111f", RTL_TD_1, FIRMWARE_8168F_2, - JUMBO_9K, false), + _R("RTL8168f/8111f", RTL_TD_1, FIRMWARE_8168F_2, JUMBO_9K), [RTL_GIGA_MAC_VER_37] = - _R("RTL8402", RTL_TD_1, FIRMWARE_8402_1, - JUMBO_1K, true), + _R("RTL8402", RTL_TD_1, FIRMWARE_8402_1, JUMBO_1K), [RTL_GIGA_MAC_VER_38] = - _R("RTL8411", RTL_TD_1, FIRMWARE_8411_1, - JUMBO_9K, false), + _R("RTL8411", RTL_TD_1, FIRMWARE_8411_1, JUMBO_9K), [RTL_GIGA_MAC_VER_39] = - _R("RTL8106e", RTL_TD_1, FIRMWARE_8106E_1, - JUMBO_1K, true), + _R("RTL8106e", RTL_TD_1, FIRMWARE_8106E_1, JUMBO_1K), [RTL_GIGA_MAC_VER_40] = - _R("RTL8168g/8111g", RTL_TD_1, FIRMWARE_8168G_2, - JUMBO_9K, false), + _R("RTL8168g/8111g", RTL_TD_1, FIRMWARE_8168G_2, JUMBO_9K), [RTL_GIGA_MAC_VER_41] = - _R("RTL8168g/8111g", RTL_TD_1, NULL, JUMBO_9K, false), + _R("RTL8168g/8111g", RTL_TD_1, NULL, JUMBO_9K), [RTL_GIGA_MAC_VER_42] = - _R("RTL8168g/8111g", RTL_TD_1, FIRMWARE_8168G_3, - JUMBO_9K, false), + _R("RTL8168g/8111g", RTL_TD_1, FIRMWARE_8168G_3, JUMBO_9K), [RTL_GIGA_MAC_VER_43] = - _R("RTL8106e", RTL_TD_1, FIRMWARE_8106E_2, - JUMBO_1K, true), + _R("RTL8106e", RTL_TD_1, FIRMWARE_8106E_2, JUMBO_1K), [RTL_GIGA_MAC_VER_44] = - _R("RTL8411", RTL_TD_1, FIRMWARE_8411_2, - JUMBO_9K, false), + _R("RTL8411", RTL_TD_1, FIRMWARE_8411_2, JUMBO_9K), [RTL_GIGA_MAC_VER_45] = - _R("RTL8168h/8111h", RTL_TD_1, FIRMWARE_8168H_1, - JUMBO_9K, false), + _R("RTL8168h/8111h", RTL_TD_1, FIRMWARE_8168H_1, JUMBO_9K), [RTL_GIGA_MAC_VER_46] = - _R("RTL8168h/8111h", RTL_TD_1, FIRMWARE_8168H_2, - JUMBO_9K, false), + _R("RTL8168h/8111h", RTL_TD_1, FIRMWARE_8168H_2, JUMBO_9K), [RTL_GIGA_MAC_VER_47] = - _R("RTL8107e", RTL_TD_1, FIRMWARE_8107E_1, - JUMBO_1K, false), + _R("RTL8107e", RTL_TD_1, FIRMWARE_8107E_1, JUMBO_1K), [RTL_GIGA_MAC_VER_48] = - _R("RTL8107e", RTL_TD_1, FIRMWARE_8107E_2, - JUMBO_1K, false), + _R("RTL8107e", RTL_TD_1, FIRMWARE_8107E_2, JUMBO_1K), [RTL_GIGA_MAC_VER_49] = - _R("RTL8168ep/8111ep", RTL_TD_1, NULL, - JUMBO_9K, false), + _R("RTL8168ep/8111ep", RTL_TD_1, NULL, JUMBO_9K), [RTL_GIGA_MAC_VER_50] = - _R("RTL8168ep/8111ep", RTL_TD_1, NULL, - JUMBO_9K, false), + _R("RTL8168ep/8111ep", RTL_TD_1, NULL, JUMBO_9K), [RTL_GIGA_MAC_VER_51] = - _R("RTL8168ep/8111ep", RTL_TD_1, NULL, - JUMBO_9K, false), + _R("RTL8168ep/8111ep", RTL_TD_1, NULL, JUMBO_9K), }; #undef _R @@ -1954,7 +1929,7 @@ static netdev_features_t rtl8169_fix_features(struct net_device *dev, features &= ~NETIF_F_ALL_TSO; if (dev->mtu > JUMBO_1K && - !rtl_chip_infos[tp->mac_version].jumbo_tx_csum) + tp->mac_version > RTL_GIGA_MAC_VER_06) features &= ~NETIF_F_IP_CSUM; return features; @@ -8338,7 +8313,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) netif_info(tp, probe, dev, "jumbo features [frames: %d bytes, " "tx checksumming: %s]\n", rtl_chip_infos[chipset].jumbo_max, - rtl_chip_infos[chipset].jumbo_tx_csum ? "ok" : "ko"); + tp->mac_version <= RTL_GIGA_MAC_VER_06 ? "ok" : "ko"); } if (r8168_check_dash(tp))