From patchwork Fri May 1 17:22:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1281399 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=s41MF3Dn; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49DK191j2tz9sTC for ; Sat, 2 May 2020 03:26:37 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729360AbgEAR0g (ORCPT ); Fri, 1 May 2020 13:26:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728972AbgEAR0f (ORCPT ); Fri, 1 May 2020 13:26:35 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0AEA2C061A0C for ; Fri, 1 May 2020 10:26:34 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id e16so7147362wra.7 for ; Fri, 01 May 2020 10:26: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-language:content-transfer-encoding; bh=ru6FC8FdFcixgDEj9CxDCxaHWfysbK6DyM9A+vmycX0=; b=s41MF3DnODCEs1P5D4hzoIUgGzl0uZ/9elHGwJUl0xAEbOpnM/LoBHpHSZ/Iy6Xi+t 1y1vlFo9+j8Vm9gtvdRdyaDtBZ7bzoOiMMj2bWXrEfcQDECvC8xWJfG3cPyQB8UPsOzq ttHQTZ1n6TsGGGOO8161LrDq/dcbxNC+Buvm9A+hSicefyd6IPSdU+rigzjxrnH4W7sT 45sjDjy7Meij/1UbzMFg8P/GWDG41IPsd/F8rq1FTQTnBgfNpuipyoSHZvhlpEhkMpu0 /VhmsLyh3gmtaQESMOwC5cwiT4LnGoJANUH1qMRkxq3ForiU06drwTc6WYdWSHTDKIWS s8Gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=ru6FC8FdFcixgDEj9CxDCxaHWfysbK6DyM9A+vmycX0=; b=AdD5D/FY1398Y3zTgv4Ec8igRhfyinjx18AKmz9W2Dcdsu/AZSdvqxZSzup24IANZn 6lbBryuc2o7El5Vi+Y5Zs4u6EmyIMQxZb/xoB7UZr5vZfrQVLFC8wM9y5AUQ4MXmAPMk EGvSkx77A8Z7OqWDx8Dbm/ynYYmoEWRUsSZ4SFZwmvDYQpO7F0dmmPLbh9J6oDNRWlwV irbMD+d3+iAxuBw2t6y0yOoVBtb6E8LWKOs6IWqBcxALOjcLe3ZNHLbpp5EkSjIMSO8O E3d8QV5PhO32H4SQ7PpZDbcouIf7YsdjyqDFQ4jUfjbscpbVKUrjfmt1gJpozwAFl8jv ahRg== X-Gm-Message-State: AGi0PuY9+d9JUG0W5vRWxo6QskCzRJAUQkCl30o1sjeG8kAsmyayi1Qt B1ov02x0nmKMNDGNAwj1tqttRc5d X-Google-Smtp-Source: APiQypLvHCr+nVwj4ZtOWiiOCV8hjFAkZTSTRLLETUBpuYvlaMck+tgEBhcOKr6j3NvmzJcp3h0MrQ== X-Received: by 2002:adf:fc43:: with SMTP id e3mr4930525wrs.234.1588353992438; Fri, 01 May 2020 10:26:32 -0700 (PDT) Received: from ?IPv6:2003:ea:8f06:ee00:54e4:3086:385e:b03b? (p200300EA8F06EE0054E43086385EB03B.dip0.t-ipconnect.de. [2003:ea:8f06:ee00:54e4:3086:385e:b03b]) by smtp.googlemail.com with ESMTPSA id w18sm5052370wrn.55.2020.05.01.10.26.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 01 May 2020 10:26:32 -0700 (PDT) Subject: [PATCH net-next 1/4] r8169: remove redundant driver message when entering promiscuous mode From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller Cc: "netdev@vger.kernel.org" References: <0e2ab257-5564-f16a-92f9-d0635e140837@gmail.com> Message-ID: <9852ebb8-b651-01b6-ab9a-815cff2f8dcd@gmail.com> Date: Fri, 1 May 2020 19:22:29 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <0e2ab257-5564-f16a-92f9-d0635e140837@gmail.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Net core - __dev_set_promiscuity - prints a message already when promiscuous mode in entered/left, therefore we don't have to do this in the driver too. Also the driver message would be misleading (would be because "link" message level is disabled per default) because it would print "promisc mode enabled" even if it's being left. Reason is that __dev_change_flags() calls dev_set_rx_mode() before touching the promisc flag. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 0f869a761..bfa199b36 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -2634,8 +2634,6 @@ static void rtl_set_rx_mode(struct net_device *dev) u32 tmp; if (dev->flags & IFF_PROMISC) { - /* Unconditionally log net taps. */ - netif_notice(tp, link, dev, "Promiscuous mode enabled\n"); rx_mode |= AcceptAllPhys; } else if (netdev_mc_count(dev) > MC_FILTER_LIMIT || dev->flags & IFF_ALLMULTI || From patchwork Fri May 1 17:23:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1281403 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Q1a7Mz+3; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49DK1Q0wbqz9sTF for ; Sat, 2 May 2020 03:26:50 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729247AbgEAR0g (ORCPT ); Fri, 1 May 2020 13:26:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728933AbgEAR0f (ORCPT ); Fri, 1 May 2020 13:26:35 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15DEAC061A0E for ; Fri, 1 May 2020 10:26:35 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id x17so12269173wrt.5 for ; Fri, 01 May 2020 10:26: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-language:content-transfer-encoding; bh=Oj+OOVN2501NgEOQLlWuQZ6wcEbqpjKhjWanig+Crek=; b=Q1a7Mz+3hozdG8oEiokf+DoEdj0SO8+fQJ/+mgrCtZCyp0DpOTkGbxydnvqXpYuz7T OmY80ps09Z+8shc8vV6IFwMDcaseXFm0vIL3xsxOcaAXIXIiLjJy+QBAyKKvR0Uzcm2A swpzMKNnGaxLntrxclv88yLR69W3f2zAxTV/K/2oIpUyVnC/nIADznz9B56Ft6klf7n1 xU27BEhTr25AOksUZGyPPK5Bn19o6z2xEn9gv/rIhrvbihpwsdJ2fwaDlIMJy67/Ufia BtjhE4zR9Ryl9KKXzdl+aD8W56kXHw0ww9rpnDcRGtrYyyII5Ipbmq7/T/nCUtM+KTAm 7cGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Oj+OOVN2501NgEOQLlWuQZ6wcEbqpjKhjWanig+Crek=; b=HcGwmO9gFtLpOHIW3a/SriaG0R/9MybRRDB3dwEYrxSPprsYZFpCRwX6neh9CvNTJz YnmDusfrPQdpBTWDOLuqHkkW6pliAba7m6TFcH8O0Z936T+gQPgD6XqpRinqtktjKomX chWzkPpruAmyBLtCYuS7z2EX1lr4r2efxS/5uDLNIcuQ4TpAsluVan0PhlQ9JTokhNQu yXzZ1diVHxfFZdtnDJH+ZmtSJ3vn2ctgTaJPZ0me75qYj2kkjIyYQV2nEyrpAocUxU1B 7YN4wkbgzjt8qf+Fnc7HZYIEIH8MMZ+mUryJBVqqe25qs2ksgpKmeOGJjk3ufX8X8BXl GD5w== X-Gm-Message-State: AGi0Pub8jvm/dLMhjU1NI/PZCKS5tWRL3gutHWuVCArhHdd9MApaRMYx 4UMCnzCHwALZnU72DNl9962gUDuf X-Google-Smtp-Source: APiQypIZE0DHfQKR18EzCc9aWSPzD1ohI5GCLmpHmT2R3OB185KNflSXWF0rJX1zn3X3MsiB/RXhqA== X-Received: by 2002:adf:aad4:: with SMTP id i20mr4850372wrc.47.1588353993468; Fri, 01 May 2020 10:26:33 -0700 (PDT) Received: from ?IPv6:2003:ea:8f06:ee00:54e4:3086:385e:b03b? (p200300EA8F06EE0054E43086385EB03B.dip0.t-ipconnect.de. [2003:ea:8f06:ee00:54e4:3086:385e:b03b]) by smtp.googlemail.com with ESMTPSA id 2sm732081wre.25.2020.05.01.10.26.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 01 May 2020 10:26:33 -0700 (PDT) Subject: [PATCH net-next 2/4] r8169: simplify counter handling From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller Cc: "netdev@vger.kernel.org" References: <0e2ab257-5564-f16a-92f9-d0635e140837@gmail.com> Message-ID: <60f2357b-cb6b-8939-e6d1-0431b6243eb3@gmail.com> Date: Fri, 1 May 2020 19:23:36 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <0e2ab257-5564-f16a-92f9-d0635e140837@gmail.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The counter handling functions can only fail if rtl8169_do_counters() times out. In the poll function we emit an error message in case of timeout, therefore we don't have to propagate the timeout all the way up just to print another message basically saying the same. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 38 ++++++++--------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index bfa199b36..1c2ea7506 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -1625,7 +1625,7 @@ DECLARE_RTL_COND(rtl_counters_cond) return RTL_R32(tp, CounterAddrLow) & (CounterReset | CounterDump); } -static bool rtl8169_do_counters(struct rtl8169_private *tp, u32 counter_cmd) +static void rtl8169_do_counters(struct rtl8169_private *tp, u32 counter_cmd) { dma_addr_t paddr = tp->counters_phys_addr; u32 cmd; @@ -1636,22 +1636,20 @@ static bool rtl8169_do_counters(struct rtl8169_private *tp, u32 counter_cmd) RTL_W32(tp, CounterAddrLow, cmd); RTL_W32(tp, CounterAddrLow, cmd | counter_cmd); - return rtl_udelay_loop_wait_low(tp, &rtl_counters_cond, 10, 1000); + rtl_udelay_loop_wait_low(tp, &rtl_counters_cond, 10, 1000); } -static bool rtl8169_reset_counters(struct rtl8169_private *tp) +static void rtl8169_reset_counters(struct rtl8169_private *tp) { /* * Versions prior to RTL_GIGA_MAC_VER_19 don't support resetting the * tally counters. */ - if (tp->mac_version < RTL_GIGA_MAC_VER_19) - return true; - - return rtl8169_do_counters(tp, CounterReset); + if (tp->mac_version >= RTL_GIGA_MAC_VER_19) + rtl8169_do_counters(tp, CounterReset); } -static bool rtl8169_update_counters(struct rtl8169_private *tp) +static void rtl8169_update_counters(struct rtl8169_private *tp) { u8 val = RTL_R8(tp, ChipCmd); @@ -1659,16 +1657,13 @@ static bool rtl8169_update_counters(struct rtl8169_private *tp) * Some chips are unable to dump tally counters when the receiver * is disabled. If 0xff chip may be in a PCI power-save state. */ - if (!(val & CmdRxEnb) || val == 0xff) - return true; - - return rtl8169_do_counters(tp, CounterDump); + if (val & CmdRxEnb && val != 0xff) + rtl8169_do_counters(tp, CounterDump); } -static bool rtl8169_init_counter_offsets(struct rtl8169_private *tp) +static void rtl8169_init_counter_offsets(struct rtl8169_private *tp) { struct rtl8169_counters *counters = tp->counters; - bool ret = false; /* * rtl8169_init_counter_offsets is called from rtl_open. On chip @@ -1686,22 +1681,16 @@ static bool rtl8169_init_counter_offsets(struct rtl8169_private *tp) */ if (tp->tc_offset.inited) - return true; - - /* If both, reset and update fail, propagate to caller. */ - if (rtl8169_reset_counters(tp)) - ret = true; + return; - if (rtl8169_update_counters(tp)) - ret = true; + rtl8169_reset_counters(tp); + rtl8169_update_counters(tp); tp->tc_offset.tx_errors = counters->tx_errors; tp->tc_offset.tx_multi_collision = counters->tx_multi_collision; tp->tc_offset.tx_aborted = counters->tx_aborted; tp->tc_offset.rx_missed = counters->rx_missed; tp->tc_offset.inited = true; - - return ret; } static void rtl8169_get_ethtool_stats(struct net_device *dev, @@ -4759,8 +4748,7 @@ static int rtl_open(struct net_device *dev) rtl_hw_start(tp); - if (!rtl8169_init_counter_offsets(tp)) - netif_warn(tp, hw, dev, "counter reset/update failed\n"); + rtl8169_init_counter_offsets(tp); phy_start(tp->phydev); netif_start_queue(dev); From patchwork Fri May 1 17:24:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1281400 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=L+/v5lV7; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49DK1B3l19z9sTF for ; Sat, 2 May 2020 03:26:38 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729451AbgEAR0h (ORCPT ); Fri, 1 May 2020 13:26:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728933AbgEAR0g (ORCPT ); Fri, 1 May 2020 13:26:36 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EAD12C08E859 for ; Fri, 1 May 2020 10:26:35 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id x18so12290663wrq.2 for ; Fri, 01 May 2020 10:26: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-language:content-transfer-encoding; bh=a6wPzzaAib5DH3Zs/s/voSmXDBvZjx2Piu7nRV2HDvc=; b=L+/v5lV7QmhUfuqxAAknTP2A5qs4FP67SUJqNRcwp4cHbubxFw39xHzbTyYcbdyDfv i7EWFdBNwcMPI0l3hyONwXScnTUyahou6Mqp/4V0/s5V3aE9BvhHIirWLwFIxDxGhyRD bhgPvJcrE4SX6tBTe2fFK1yPROWvtTHpcT9dTO7M00/yjAO9L0DbX2nr23dFz4LecxI4 VygXEnsev917ePpC+Jj+auecYAZXE3wFTq+WnjXJ+i/+fRnke7j2U9A9TrNB3mtYcECM ohXTCEWLPRb14BVvDX1JV80APJj4+67BEzRYq3ILw9qZoJ+jCDUVlejQUaYPbFLwPLQG yeIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=a6wPzzaAib5DH3Zs/s/voSmXDBvZjx2Piu7nRV2HDvc=; b=Nd1P6rdpKLYaPLM1QVPOVrSERV6SBqzdaYQVZjTi3og3vgHkhQJfD/wTQ/Cy61ERtM aAxsB2alUvqO0ytWyJlPb0P4SsXdUYIdBOyl9nc00RYSENzXagL9f7/7egOYPjniFJ7a IEQu+dQV6tMHAA6vQE1jZ9Cdho63vd3sIJd3OuaOKvt5rrxjseZrPwT2Ni4OP4RDehDM 0mRvVu44FunCl/MAdgTocx8DfVEwZg7HfbVzXqH4VcbsrKi/1zQbOdGjUzvUXjQ7kUQG xfOMMyHY2oL6R60xiE0xKzdEw6UgMu8T5MZkbuGRR07eNQwmYl778odRQjpIHG/FWhPG hImA== X-Gm-Message-State: AGi0PuZlq6QMA2r+5ojRuWQZ5X4W5MFx3hRPd2NQSQuv3v2gGSeWgqDd aYTlNFfGtrru8i71NMfk3rL40dog X-Google-Smtp-Source: APiQypL0C283hAECn73LJRcAnW2vuiRDkSbHlsWArVCZtNHaRKORucl+s12jc1EaZWuLDr4wCmEihA== X-Received: by 2002:a05:6000:4:: with SMTP id h4mr5395201wrx.386.1588353994474; Fri, 01 May 2020 10:26:34 -0700 (PDT) Received: from ?IPv6:2003:ea:8f06:ee00:54e4:3086:385e:b03b? (p200300EA8F06EE0054E43086385EB03B.dip0.t-ipconnect.de. [2003:ea:8f06:ee00:54e4:3086:385e:b03b]) by smtp.googlemail.com with ESMTPSA id e21sm5638683wrc.1.2020.05.01.10.26.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 01 May 2020 10:26:34 -0700 (PDT) Subject: [PATCH net-next 3/4] r8169: remove "out of memory" error message from rtl_request_firmware From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller Cc: "netdev@vger.kernel.org" References: <0e2ab257-5564-f16a-92f9-d0635e140837@gmail.com> Message-ID: Date: Fri, 1 May 2020 19:24:47 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <0e2ab257-5564-f16a-92f9-d0635e140837@gmail.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When preparing an unrelated change, checkpatch complained about this redundant out-of-memory message. Therefore remove it. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 1c2ea7506..768721d56 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -2507,10 +2507,8 @@ static void rtl_request_firmware(struct rtl8169_private *tp) return; rtl_fw = kzalloc(sizeof(*rtl_fw), GFP_KERNEL); - if (!rtl_fw) { - netif_warn(tp, ifup, tp->dev, "Unable to load firmware, out of memory\n"); + if (!rtl_fw) return; - } rtl_fw->phy_write = rtl_writephy; rtl_fw->phy_read = rtl_readphy; From patchwork Fri May 1 17:26:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1281401 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=ANwixmv2; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49DK1C3zBfz9sTC for ; Sat, 2 May 2020 03:26:39 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729518AbgEAR0i (ORCPT ); Fri, 1 May 2020 13:26:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1729447AbgEAR0h (ORCPT ); Fri, 1 May 2020 13:26:37 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20CECC061A0C for ; Fri, 1 May 2020 10:26:37 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id f13so12229126wrm.13 for ; Fri, 01 May 2020 10:26: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-language:content-transfer-encoding; bh=i6+T9ZY8miwi1Ht/A9pyx9HK6GZg44XuE8KhYVMh0dQ=; b=ANwixmv2EnUQiet41GLD91cNGyxeO7CF9LDnanHmxSL0o9uSe3ABBGcAjeli4RT5lL ZyC8250I+BAsgo7/v3ao+x4SV2In+uckLJxNQXAQT77vxXZxoYygDO7O1HLweC90S/Eo kvCuGSqjhCkhWDzimitjSbP0GtG2WJDKWaw++DMLcwmcdCp3642ymzY9ubWZURqNNAsW B+JfbpmikknlpJYoRhUCQQQPGjUuca3St1lW0/u3MF5fxES6/j4FdKEyaslQ38KD/Q5x g4IK4AT+zFO6q7G9rDEAGJM7gjoxHZhbLWnY9Bt7K2dNb7rgVDAMtP5uy1pGbdg6dndK AkZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=i6+T9ZY8miwi1Ht/A9pyx9HK6GZg44XuE8KhYVMh0dQ=; b=PMwEAf5xImCHO/JYJRNs7mHnVVwx/F2ZNOVW+3PK1x3M8GVmLSv0tZPp7VBSonNGNt pMmBLanvn9V/D5SiAmn9lNNc+4aQ2markqdHeSQXOc6+YaXWiOZ17u2pib5RJbz+8YqL xocJ3lT/E0nX0hxJir4L8rSwwQl3zI6KSyO7dhEfd0IsYNiA2PlBPIwDPbTc9IEBZ51c 1tyREgC37vntnM84r4IpBJESX9dwjAiktULNFY4H1xRVKrlGbceMPdYM9nluNaUWWZFo XVyMigfKA7pRceHyAccb+jR6MY8mdyR2W6PfSAAYk4JhfHb+GBjkdv3kt0iGbtqITXy7 F1zw== X-Gm-Message-State: AGi0PuZfHCBF7CJhls78FiwS5DKonzAyJQbONPrYQjZGcZOdvVdMdtcX FNUgC3D52fQbspiNxjBGrjwQXxDt X-Google-Smtp-Source: APiQypLc7gXBBFPNILtDtTKJMY/5p7KQwneKtlELlkjEjgXgpZQ7C50TGwYHPKfBTl5ZWWSSqK2cng== X-Received: by 2002:a05:6000:108e:: with SMTP id y14mr5598220wrw.292.1588353995480; Fri, 01 May 2020 10:26:35 -0700 (PDT) Received: from ?IPv6:2003:ea:8f06:ee00:54e4:3086:385e:b03b? (p200300EA8F06EE0054E43086385EB03B.dip0.t-ipconnect.de. [2003:ea:8f06:ee00:54e4:3086:385e:b03b]) by smtp.googlemail.com with ESMTPSA id b82sm394686wmh.1.2020.05.01.10.26.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 01 May 2020 10:26:35 -0700 (PDT) Subject: [PATCH net-next 4/4] r8169: switch from netif_xxx message functions to netdev_xxx From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller Cc: "netdev@vger.kernel.org" References: <0e2ab257-5564-f16a-92f9-d0635e140837@gmail.com> Message-ID: <6afdb9d8-8769-874b-a3f5-0a3f13da2fe5@gmail.com> Date: Fri, 1 May 2020 19:26:22 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <0e2ab257-5564-f16a-92f9-d0635e140837@gmail.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Considering the few messages we have in the driver, there's not really a benefit in being able to control them on a message type level. Therefore simplify the code and switch to the netdev_xxx message functions. In addition add net_ratelimit() to messages that can be printed from a hot path. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 68 ++++++++--------------- 1 file changed, 22 insertions(+), 46 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 768721d56..8b665f2ec 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -59,9 +59,6 @@ #define FIRMWARE_8107E_2 "rtl_nic/rtl8107e-2.fw" #define FIRMWARE_8125A_3 "rtl_nic/rtl8125a-3.fw" -#define R8169_MSG_DEFAULT \ - (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_IFUP | NETIF_MSG_IFDOWN) - /* Maximum number of multicast addresses to filter (vs. Rx-all-multicast). The RTL chips use a 64 element hash table based on the Ethernet CRC. */ #define MC_FILTER_LIMIT 32 @@ -179,10 +176,6 @@ static const struct pci_device_id rtl8169_pci_tbl[] = { MODULE_DEVICE_TABLE(pci, rtl8169_pci_tbl); -static struct { - u32 msg_enable; -} debug = { -1 }; - enum rtl_registers { MAC0 = 0, /* Ethernet hardware address. */ MAC4 = 4, @@ -604,7 +597,6 @@ struct rtl8169_private { struct net_device *dev; struct phy_device *phydev; struct napi_struct napi; - u32 msg_enable; enum mac_version 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. */ @@ -646,8 +638,6 @@ typedef void (*rtl_generic_fct)(struct rtl8169_private *tp); MODULE_AUTHOR("Realtek and the Linux r8169 crew "); MODULE_DESCRIPTION("RealTek RTL-8169 Gigabit Ethernet driver"); -module_param_named(debug, debug.msg_enable, int, 0); -MODULE_PARM_DESC(debug, "Debug verbosity level (0=none, ..., 16=all)"); MODULE_SOFTDEP("pre: realtek"); MODULE_LICENSE("GPL"); MODULE_FIRMWARE(FIRMWARE_8168D_1); @@ -751,8 +741,10 @@ static bool rtl_loop_wait(struct rtl8169_private *tp, const struct rtl_cond *c, return true; delay(d); } - netif_err(tp, drv, tp->dev, "%s == %d (loop: %d, delay: %d).\n", - c->msg, !high, n, d); + + if (net_ratelimit()) + netdev_err(tp->dev, "%s == %d (loop: %d, delay: %d).\n", + c->msg, !high, n, d); return false; } @@ -797,7 +789,8 @@ static bool name ## _check(struct rtl8169_private *tp) static bool rtl_ocp_reg_failure(struct rtl8169_private *tp, u32 reg) { if (reg & 0xffff0001) { - netif_err(tp, drv, tp->dev, "Invalid ocp reg %x!\n", reg); + if (net_ratelimit()) + netdev_err(tp->dev, "Invalid ocp reg %x!\n", reg); return true; } return false; @@ -1580,20 +1573,6 @@ static void rtl8169_get_regs(struct net_device *dev, struct ethtool_regs *regs, rtl_unlock_work(tp); } -static u32 rtl8169_get_msglevel(struct net_device *dev) -{ - struct rtl8169_private *tp = netdev_priv(dev); - - return tp->msg_enable; -} - -static void rtl8169_set_msglevel(struct net_device *dev, u32 value) -{ - struct rtl8169_private *tp = netdev_priv(dev); - - tp->msg_enable = value; -} - static const char rtl8169_gstrings[][ETH_GSTRING_LEN] = { "tx_packets", "rx_packets", @@ -1985,8 +1964,6 @@ static const struct ethtool_ops rtl8169_ethtool_ops = { .get_link = ethtool_op_get_link, .get_coalesce = rtl_get_coalesce, .set_coalesce = rtl_set_coalesce, - .get_msglevel = rtl8169_get_msglevel, - .set_msglevel = rtl8169_set_msglevel, .get_regs = rtl8169_get_regs, .get_wol = rtl8169_get_wol, .set_wol = rtl8169_set_wol, @@ -3868,8 +3845,7 @@ static struct page *rtl8169_alloc_rx_data(struct rtl8169_private *tp, mapping = dma_map_page(d, data, 0, R8169_RX_BUF_SIZE, DMA_FROM_DEVICE); if (unlikely(dma_mapping_error(d, mapping))) { - if (net_ratelimit()) - netif_err(tp, drv, tp->dev, "Failed to map RX DMA!\n"); + netdev_err(tp->dev, "Failed to map RX DMA!\n"); __free_pages(data, get_order(R8169_RX_BUF_SIZE)); return NULL; } @@ -4006,7 +3982,7 @@ static int rtl8169_tx_map(struct rtl8169_private *tp, const u32 *opts, u32 len, ret = dma_mapping_error(d, mapping); if (unlikely(ret)) { if (net_ratelimit()) - netif_err(tp, drv, tp->dev, "Failed to map TX data!\n"); + netdev_err(tp->dev, "Failed to map TX data!\n"); return ret; } @@ -4172,7 +4148,8 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb, txd_first = tp->TxDescArray + entry; if (unlikely(!rtl_tx_slots_avail(tp, frags))) { - netif_err(tp, drv, dev, "BUG! Tx Ring full when queue awake!\n"); + if (net_ratelimit()) + netdev_err(dev, "BUG! Tx Ring full when queue awake!\n"); goto err_stop_0; } @@ -4334,9 +4311,9 @@ static void rtl8169_pcierr_interrupt(struct net_device *dev) pci_status_errs = pci_status_get_and_clear_errors(pdev); - netif_err(tp, intr, dev, "PCI error (cmd = 0x%04x, status_errs = 0x%04x)\n", - pci_cmd, pci_status_errs); - + if (net_ratelimit()) + netdev_err(dev, "PCI error (cmd = 0x%04x, status_errs = 0x%04x)\n", + pci_cmd, pci_status_errs); /* * The recovery sequence below admits a very elaborated explanation: * - it seems to work; @@ -4454,8 +4431,9 @@ static int rtl_rx(struct net_device *dev, struct rtl8169_private *tp, u32 budget dma_rmb(); if (unlikely(status & RxRES)) { - netif_info(tp, rx_err, dev, "Rx ERROR. status = %08x\n", - status); + if (net_ratelimit()) + netdev_warn(dev, "Rx ERROR. status = %08x\n", + status); dev->stats.rx_errors++; if (status & (RxRWT | RxRUNT)) dev->stats.rx_length_errors++; @@ -5326,7 +5304,6 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) tp = netdev_priv(dev); tp->dev = dev; tp->pci_dev = pdev; - tp->msg_enable = netif_msg_init(debug.msg_enable, R8169_MSG_DEFAULT); tp->supports_gmii = ent->driver_data == RTL_CFG_NO_GBIT ? 0 : 1; tp->eee_adv = -1; tp->ocp_base = OCP_STD_PHY_BASE; @@ -5484,15 +5461,14 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) if (rc) return rc; - netif_info(tp, probe, dev, "%s, %pM, XID %03x, IRQ %d\n", - rtl_chip_infos[chipset].name, dev->dev_addr, xid, - pci_irq_vector(pdev, 0)); + netdev_info(dev, "%s, %pM, XID %03x, IRQ %d\n", + rtl_chip_infos[chipset].name, dev->dev_addr, xid, + pci_irq_vector(pdev, 0)); if (jumbo_max) - netif_info(tp, probe, dev, - "jumbo features [frames: %d bytes, tx checksumming: %s]\n", - jumbo_max, tp->mac_version <= RTL_GIGA_MAC_VER_06 ? - "ok" : "ko"); + netdev_info(dev, "jumbo features [frames: %d bytes, tx checksumming: %s]\n", + jumbo_max, tp->mac_version <= RTL_GIGA_MAC_VER_06 ? + "ok" : "ko"); if (r8168_check_dash(tp)) rtl8168_driver_start(tp);