From patchwork Tue Sep 29 20:09:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Brace X-Patchwork-Id: 259916 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 323DEC4727C for ; Tue, 29 Sep 2020 20:10:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D395120848 for ; Tue, 29 Sep 2020 20:10:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=gmx.net header.i=@gmx.net header.b="gNYgEmzR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729102AbgI2UKI (ORCPT ); Tue, 29 Sep 2020 16:10:08 -0400 Received: from mout.gmx.net ([212.227.17.20]:38675 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728362AbgI2UKH (ORCPT ); Tue, 29 Sep 2020 16:10:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1601410203; bh=sMWbZD5vC0MdeV/KmHDoQvXbINr4rV74Xjinnuzwk2g=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=gNYgEmzRDDTInOjkXdoGpde/iqR+1Kx38YTPQIoWbWd/wdjdYpkSv/okVDtR73cwc +lklFBGujOPdZBeLj0c6QiZRK/hHW87PdK4TwEQ6vBb0O47dsNYFYJsjD5hF9qynrC umo6Y4zuEksRsBMAhoQw9BaTjr03O4+L6/6JY+NQ= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from PC1310.gateway.sonic.net ([173.228.6.223]) by mail.gmx.com (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MxlzC-1kdDpk3yne-00zHUZ; Tue, 29 Sep 2020 22:10:03 +0200 From: Kevin Brace To: netdev@vger.kernel.org Cc: Kevin Brace Subject: [PATCH net v2 1/4] via-rhine: Fix for the hardware having a reset failure after resume Date: Tue, 29 Sep 2020 13:09:40 -0700 Message-Id: <20200929200943.3364-2-kevinbrace@gmx.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200929200943.3364-1-kevinbrace@gmx.com> References: <20200929200943.3364-1-kevinbrace@gmx.com> X-Provags-ID: V03:K1:ZoBxt5B4RYaQeAIhB+A0DsymBkQpIY/52GHeJ8JbcKhTos4WxT2 Ew95bOH0FeGHG7yQAz8yJhcARE/xdkN2u3X0RzJ8kVcGIwk8/wKS9D4e2Wkvo7YeOvotsKz mDGCsGHFqYyivx8kyK9sPssuciYdB4CFYZVD0+6YZsGfc8Cu6ax3w03aLxAiEH+eb75Zp/w ep9cNQ+7lssnBnmJhTO1Q== X-UI-Out-Filterresults: notjunk:1; V03:K0:PS2zRT3JGNA=:6pCjT912keythJ3VjdZuKo yfW4rsIe1RX4pm0rYXLI1CWIiCxJILZ+4V42iAGlf0/c8AAJSEUxfkqfpNVuQUK2iWnu/dPtX qE5SJ9q/WiahVXfVUg0fYOFzzKAXk+HLzsdYOZe4tJ6kuKzj3mXqjvH1kZF1o5HrHNpKU72oz LQtUvzbod2uzM7nfXot+spWA4e+1Oxm8GUl+hd9Opzgn/H6VW7Ao/QNdcn9HGxKY2qYwGlWja ajvNoD+EIdBe3dn9Z8dnyq1YmHY6r/4+K1+5FbQlYIPUNtA1x+xZ6EYVAVeam3H5PRLjFGWmZ +X6uz4A9YPZYynbnXfeqMTeQfeNaugCWzqkBIbBrFlkF6F+IG4xt4CVcdH1j0Du1FRtG99J2S NwKaiB8iH+j10R4K0S/CNZfE3I9UdKhY94UXhAtrrkaDoQ0d2jgrf1mDrvn97vEYuD27FHZnU GJxuFP1phpUJL0AjNUEWqllAj4KIwa88fGc+eSsXgK0EaeVM9mS/Evl/oxTHmBMzEE2RWFhgn vElRAVLKJHW8NtGumiEsfFH/wWy3XaBdThJC5dDPP0y0rtQ+ztdN7fIyCh9WP0/Lmvd3AWtBz T1wb1/b7XVbILMpmQwfJRYh7PMxt0Qvoitqw4mUnXwJ/CXaR7N63lZQHunbmuC217zkuTiwqz 8wJLyzWlZkQXBx+RzPk99pwFVVoZS6tSHccnRfXbvhUyp0mClsO+PyvQDCHcOQLBykbffMY8v 4xII7veueckZiyMYs1enuwEWN7At4QHluYvE/Qi9fRteIfQicMkGCKYy8CEPr0tAXC73UiisO H7h+mJS1vMw8p8Ivtn3pIkYJmFsGI9sADruwY9ir7nDV+2h8gghtLgW+X7E0nlQLiMq09z1qR Lidg/siHt2wEKtC/9hPho5eFTif+cz3rM0aULkI5EvEVeLqIXuQp5bZErPo2H7ByAF8Yttxvx xkHr1EaLd4TcU2z7VY6sQq9l24COzxiat/iUhLMvCJp2kTuUn8kJlxejDHDvt857yoWOpW6Ly aPECZ7DDc65BfWje2A4brw2M3vfQWn9TcJiNdKGlXsMyqMG2NtcyJcJpe/xeU8K7L0J5Yfz/s Y2zZ6faMJr2bcQW6reSCq8IFgNRZOiA39rh52toh1H85ql0vK5GsWYBSF+m3AMua6duziV3U2 z2xTi7+omGvK0MmkpWOzn1KKHnCWrxVFwSwbSvhFr9D6LP+8RoVcjYPfi3q6lPgDwW191hM9W f4AiMwLKk3+das0HtLL7/ngS3wUScJOJPylH4ZQ== Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Kevin Brace In rhine_resume() and rhine_suspend(), the code calls netif_running() to see if the network interface is down or not. If it is down (i.e., netif_running() returning false), they will skip any housekeeping work within the function relating to the hardware. This becomes a problem when the hardware resumes from a standby since it is counting on rhine_resume() to map its MMIO and power up rest of the hardware. Not getting its MMIO remapped and rest of the hardware powered up lead to a soft reset failure and hardware disappearance. The solution is to map its MMIO and power up rest of the hardware inside rhine_open() before soft reset is to be performed. This solution was verified on ASUS P5V800-VM mainboard's integrated Rhine-II Ethernet MAC inside VIA Technologies VT8251 South Bridge. Signed-off-by: Kevin Brace --- drivers/net/ethernet/via/via-rhine.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.17.1 diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c index 803247d51fe9..a20492da3407 100644 --- a/drivers/net/ethernet/via/via-rhine.c +++ b/drivers/net/ethernet/via/via-rhine.c @@ -1706,6 +1706,8 @@ static int rhine_open(struct net_device *dev) goto out_free_ring; alloc_tbufs(dev); + enable_mmio(rp->pioaddr, rp->quirks); + rhine_power_init(dev); rhine_chip_reset(dev); rhine_task_enable(rp); init_registers(dev); From patchwork Tue Sep 29 20:09:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Brace X-Patchwork-Id: 289372 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09D7DC4727F for ; Tue, 29 Sep 2020 20:10:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A7B212076B for ; Tue, 29 Sep 2020 20:10:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=gmx.net header.i=@gmx.net header.b="dr7ImIkm" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729121AbgI2UKM (ORCPT ); Tue, 29 Sep 2020 16:10:12 -0400 Received: from mout.gmx.net ([212.227.17.21]:35797 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728362AbgI2UKK (ORCPT ); Tue, 29 Sep 2020 16:10:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1601410205; bh=G6HceT0It0VlXbkDsImh0/RDdHE+KDDap8TVy5//N4o=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=dr7ImIkmx8nsv+XPfGIyWN0GxMqnWROpgJjxQJoHIMzdLDaur3BeSRsacm2jAOJQr fjky65m8whlw/WCPopzC/yz9jO8SGl0efHzRcm5/gx5bgL3obK1/HWBR93o4S7TbHv BdiBZs8Z/UEIqLUbEAH5h+EBE9ESknRH+PpFPObQ= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from PC1310.gateway.sonic.net ([173.228.6.223]) by mail.gmx.com (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1N8XU1-1kRQXU0Idt-014X64; Tue, 29 Sep 2020 22:10:05 +0200 From: Kevin Brace To: netdev@vger.kernel.org Cc: Kevin Brace Subject: [PATCH net v2 2/4] via-rhine: VTunknown1 device is really VT8251 South Bridge Date: Tue, 29 Sep 2020 13:09:41 -0700 Message-Id: <20200929200943.3364-3-kevinbrace@gmx.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200929200943.3364-1-kevinbrace@gmx.com> References: <20200929200943.3364-1-kevinbrace@gmx.com> X-Provags-ID: V03:K1:GW05DPbECrhikbB6dMRNw5XO/0scZtqzrPCR/tViZCEwC2EiZ8G oqec+Qc8MVytU2dOgHWBbe//WuTM9wF3oK4Lidb72KtRrzGMn2hD9YdV7fbX9myrQEtlVxd i31CnlPhuHhMkJrd1R2q5q7YveR5pgiHzZ1jm3foRvkVhl5854sUULL66pS30eajfsEuZL6 aVoJ03hhdly3/0y2enbuA== X-UI-Out-Filterresults: notjunk:1; V03:K0:lNVK4CllrZA=:bnfIa5PgiSiKUXaNNYT3Uj OkZkEt1yYoSTL0CC17/+Cm8KtHHN4fI6a8KIIt2BUq4nNAyENjpeY8sT5dUWo7lEM4be325Fo 4PqlwdlA8THoTTe318EqTeJXmWNX0IolS/WwYLucUvCQlMRkAvl4wC6Gs5ax1X+vFZWOtkIF9 U6t7e/jBuhMksp0ZabNxnn4jTUecKBASxqu89TnE6B+O6c3gLOvCyktvpcs6qcFmBfjZZnxFP zu5bfe3mmhvXKXbIYw0YQZ2cpVMCXcdtwi26otXygaqdK4mqb7fpzhhW1+3iGD1Yn8PmPwe+J NvtWCbjvSvgvlcTBiXWlTnk8K9mZi8faGXDpQbcWFIKwCckxpEkwmNCB6oBfDqnTTelubyJa6 rk4K9Y+vB+XtnDno6UokTcFk8QDVOKo58MUtpxTxY1DCAF/MypeEFD625ab4j24IcXWCPsClq GkH9KgLzszICG7yuEul3O98rcNnvR2KwaCOa7AZVvWszYdBhjqDtFZi270g5yuWC7I+4FsICH VMZqr3l24s3AoahQj2QuG1iR3xe2HTCxzVhi3zwpttl3IGee9qW3zuT79IZ7DmME/QTHpuF+E qiajkakMhS0Sbw7AbHG12oLRQ1xZrKCTEjephSWUSxR+JF+yMwwWr+Ge3wTL+9u9nz2zRQ010 YypmHIoQhkjNC+CbUmgUjiIFpioKJAGuAMUfIC1Lry9ka0H95xfw8P0r6OcnH8/jyH7P3ujw7 sHFYIevQ5//wrkjlptCg4p4PfJmXizaoS/9aVc4c3gh6kjRiFBq5zZMB6YQw4IaI+H3PJFNNs IZGi1nv70doszMfGwGkHj8GuoiZwpBAsaveZ51UzamooLO7pI32j5dlWfthG91CXAz7s3A9Cf CS+W5NYXV0BUXKG8P3wSe7pvUbnLSj2CyZxEemxmaIZwXA4CY61Z48Qg5lfzZ3T+2l2Qdhrj5 EUOlGo67NxxQoRp1+tCZUwlDUaPHjcOfyiVH7cnP/peliuEiyP8DFj3wzPe2cFFPpUDJ6D2PP FBxp+jQpDIEiJvSJQZ0HKPYR8jMlYt7F4xAOuGiFsrf1mbr4lSev5gTWodWKobl3Z63toDzuE ndLOMKJ9+TJlwdCmcltzbYdwnZcqKDnHglXaydNrdv5/nkhvJoiTUX2CLy90rdc1V3cVm0qbU hwA4rmxojfJyFm8d5+9Qy3JRdIodC+CsRiOXNxrC4ruct40JjdmsvFYlkKsjjlzj/RXXrddeP StLYQnLcsBBKPUnYWadVR4+YSxEW2LNlsCtSnsw== Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Kevin Brace The VIA Technologies VT8251 South Bridge's integrated Rhine-II Ethernet MAC comes has a PCI revision value of 0x7c. This was verified on ASUS P5V800-VM mainboard. Signed-off-by: Kevin Brace --- drivers/net/ethernet/via/via-rhine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c index a20492da3407..d3a2be2e75d0 100644 --- a/drivers/net/ethernet/via/via-rhine.c +++ b/drivers/net/ethernet/via/via-rhine.c @@ -243,7 +243,7 @@ enum rhine_revs { VT8233 = 0x60, /* Integrated MAC */ VT8235 = 0x74, /* Integrated MAC */ VT8237 = 0x78, /* Integrated MAC */ - VTunknown1 = 0x7C, + VT8251 = 0x7C, /* Integrated MAC */ VT6105 = 0x80, VT6105_B0 = 0x83, VT6105L = 0x8A, From patchwork Tue Sep 29 20:09:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Brace X-Patchwork-Id: 289371 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 745DEC47420 for ; Tue, 29 Sep 2020 20:10:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1F3312076B for ; Tue, 29 Sep 2020 20:10:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=gmx.net header.i=@gmx.net header.b="PNMkN0WG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729114AbgI2UKM (ORCPT ); Tue, 29 Sep 2020 16:10:12 -0400 Received: from mout.gmx.net ([212.227.17.21]:48447 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729104AbgI2UKK (ORCPT ); Tue, 29 Sep 2020 16:10:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1601410206; bh=BYVGwhdYWRwPgIgX6pe4TbIptFotKQQncbHF2lSJXfE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=PNMkN0WG7upY332AU2/z8uj7/JA3Z2P+GGRfP8L4jMwKQ+EaZasKniy2zQ0FAg9fB bHFPPJar5N9yyj5gyLTjih6juI9WtQ0v8duGc/EuBWl4mwL0sJukePAGdKiZwop0gb o2wjOZ9FKabqF4XXDsHi2C3T/TeUVTY8R7tqlQD0= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from PC1310.gateway.sonic.net ([173.228.6.223]) by mail.gmx.com (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MAONX-1kFyUv0uDb-00BsBC; Tue, 29 Sep 2020 22:10:06 +0200 From: Kevin Brace To: netdev@vger.kernel.org Cc: Kevin Brace Subject: [PATCH net v2 3/4] via-rhine: Eliminate version information Date: Tue, 29 Sep 2020 13:09:42 -0700 Message-Id: <20200929200943.3364-4-kevinbrace@gmx.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200929200943.3364-1-kevinbrace@gmx.com> References: <20200929200943.3364-1-kevinbrace@gmx.com> X-Provags-ID: V03:K1:GfygOfKfz/jty/7+rPxFj9bGk4HrKM1zkqE0WGxrExSQsZ5LbMi 6ZvqoLguKBV2qnkPWtNBLVXMVGtOB9YtvUTvgJf9VJTjHY/pMiea8gBap+/OuuUCi0g2NOC CjV7VqaALUUKjfbYZCopDVkEG6S4H1a3GeXAoyOj6dgTOI6ak1pJ7Yc+RDfCfbpjSrxBjzW mi4DG2IKX5Ugv9S5K4m3Q== X-UI-Out-Filterresults: notjunk:1; V03:K0:CitgprZXY6Q=:2YxQqwwKquEupqpNf/1jkA 6vhuIygy37PXgjStu31/t6WZCISRO8o/JeS/SpUkXyInSjdYlTK1H4hXXgWuMZffmbz5LTRcP GVdJPLJ6JDAm4rZKNFTomKfKYngImtumCINwzd2eRUHDWYj8OVH5XyusX8iAKfZxyOPXkzs5Z nE1aaqZnbgXJbS1Wv00IAQN3gqQyqrIoYs8priLKzRxNLRI6RDs0xkhGmqawTkvnCSn7FQKCG 6/dtnpI36dW5KbLBCrj2YGWc8yBsNVWLGHuJGu93RESlJ55hGmh/1bKNeRkOaMgxTCvuWMhAU KFYW5WpZmWYphXlaFug7Ham0KDX/du3vJqVSjP2vaF/VxvaMR8FvSWYKmoI3jNlCKd3o9f8O/ ol1OolQswYEtqRb0/DLC8S6KKQ3NP2RyOr86SkqspLF6RIi8woVvWiZP4b6ifZsBVPPrTaVSV L6p2B6FPHaKyQzD5tR6h6XYd/1awMPoOK0uccO5IqGhQpZlZOGteUleHwdhT4syiJnSXWV935 2NpaWDPZLsE+E/AqRy1e2WcddH/C4B5yGeryHt+3Yyu3oo/86maFpSGmLv2CF4/zu6Hyf5Nkz zxt3vH4kjEkYQmguHNJuppf+buEb9XD8EOOmRUg9m78f8+2qiOweTnYxxF8botDBFRV8rTl0m i+bHvKdUBlzKPKvWq0Dwv1BKJPtPtKl/1QZ8VEHKwQ6Hxp1GWUhh4knR18rlNVtUcK7xqYWRb +/3m01Coh9XrpPak38RfjR//Yy7VyjuRU1pAWWzYrKa3FPnq71iP51PqRK612pEx/TVdM/MJP KR78pO8G+/G/2yqx7XNBplC6c17cLzClLFOLhpgwuOEC3AFxuZHVVVYOu75qpmwg8Ab8PXFUV vJHwIJFD2Id2PLNDk8ywXz84vvY6z8P91Nh12yJFzV68pAeuRlQS4e0f6kHZytg3wkFCiHi4W XcyxLbZBcnG97SuiQMtdnnhI2RrIn3sRk5cHPOBk5tRAbhjwoqzF0MII/vMzjtQKJN1Sbfvxn lEddyl6QX9ubT4JE2uZAGsObapKg0At3QLAYTBMU8t/00DvirrdicJVInyplaHdvXSztvRhyg mAfh2iIB73H5O2/FZeR7p82OKOxnPBrbPQkzS92pLxbrfxyBTR7lKE1YN9EAjusx25t6YucWR A5GuVY7MkJfaH8okwYcWJrUt7ty1XA1FxYmdvUBwqBovzaLFFBOjYCeQoZKqjG7qhr495227v KdkjfdF1uIz3tB5PkX1G8AqbYmO+awdOmxfAgYQ== Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Kevin Brace Signed-off-by: Kevin Brace --- drivers/net/ethernet/via/via-rhine.c | 15 --------------- 1 file changed, 15 deletions(-) -- 2.17.1 diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c index d3a2be2e75d0..8e8cfe110d95 100644 --- a/drivers/net/ethernet/via/via-rhine.c +++ b/drivers/net/ethernet/via/via-rhine.c @@ -32,8 +32,6 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #define DRV_NAME "via-rhine" -#define DRV_VERSION "1.5.1" -#define DRV_RELDATE "2010-10-09" #include @@ -117,10 +115,6 @@ static const int multicast_filter_limit = 32; #include #include -/* These identify the driver base version and may not be removed. */ -static const char version[] = - "v1.10-LK" DRV_VERSION " " DRV_RELDATE " Written by Donald Becker"; - MODULE_AUTHOR("Donald Becker "); MODULE_DESCRIPTION("VIA Rhine PCI Fast Ethernet driver"); MODULE_LICENSE("GPL"); @@ -1051,11 +1045,6 @@ static int rhine_init_one_pci(struct pci_dev *pdev, u32 quirks = 0; #endif -/* when built into the kernel, we only print version if device is found */ -#ifndef MODULE - pr_info_once("%s\n", version); -#endif - rc = pci_enable_device(pdev); if (rc) goto err_out; @@ -2296,7 +2285,6 @@ static void netdev_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *i struct device *hwdev = dev->dev.parent; strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); - strlcpy(info->version, DRV_VERSION, sizeof(info->version)); strlcpy(info->bus_info, dev_name(hwdev), sizeof(info->bus_info)); } @@ -2618,9 +2606,6 @@ static int __init rhine_init(void) int ret_pci, ret_platform; /* when a module, this is printed whether or not devices are found in probe */ -#ifdef MODULE - pr_info("%s\n", version); -#endif if (dmi_check_system(rhine_dmi_table)) { /* these BIOSes fail at PXE boot if chip is in D3 */ avoid_D3 = true; From patchwork Tue Sep 29 20:09:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Brace X-Patchwork-Id: 259915 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29B95C4727C for ; Tue, 29 Sep 2020 20:10:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CD6D12076A for ; Tue, 29 Sep 2020 20:10:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=gmx.net header.i=@gmx.net header.b="XQvmEkd/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729127AbgI2UKN (ORCPT ); Tue, 29 Sep 2020 16:10:13 -0400 Received: from mout.gmx.net ([212.227.17.22]:38599 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729105AbgI2UKM (ORCPT ); Tue, 29 Sep 2020 16:10:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1601410208; bh=kOKiJXQ+3TeVc2ixmu2j3vWtMg4b4ukBmC5xheBXpSA=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=XQvmEkd/tWKRM7HeKV5WbRXtFQgATYAlrjO/hF08c+3UisRMQWrNkY7rMhx6o7OQb hseCWp/+fQ8eOUwQe1kG3PSmBV98hc7RyrHrsIM9tij1ASuq+6fRDqEbZeVeA1KBDv 7fe3vIIO9XaLiP+zjJE1/rmPHIkJ6IFee6o6Lsyc= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from PC1310.gateway.sonic.net ([173.228.6.223]) by mail.gmx.com (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MWRVb-1ju1nI1WOp-00XxQs; Tue, 29 Sep 2020 22:10:07 +0200 From: Kevin Brace To: netdev@vger.kernel.org Cc: Kevin Brace Subject: [PATCH net v2 4/4] via-rhine: New device driver maintainer Date: Tue, 29 Sep 2020 13:09:43 -0700 Message-Id: <20200929200943.3364-5-kevinbrace@gmx.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200929200943.3364-1-kevinbrace@gmx.com> References: <20200929200943.3364-1-kevinbrace@gmx.com> X-Provags-ID: V03:K1:tklC/BUjPyEF2mozpSfVyNll0g7TtLL57ksZ8EN+RaI8j9Jm07g VK9oUI9FmJbsRkaNAKKkiG1d0BDNRFqXajBMjoOlJF8qgf88eCmukTXSdLnTqoUUNwQEU7O dXlYdwnOAs2Ftlfi29SP2NKXxsjsGYMHqfCpvpUQ5AoBl0hUOAPFph2iFgqu77TyEL6Fnw6 m8YdWdV39jjbOX5kRWHmg== X-UI-Out-Filterresults: notjunk:1; V03:K0:l0ucBDL3QcA=:TUqXMneBXo0SdmyXTMPtb/ vYiPoFFJLc2XYIy1wEoC44k6dcnO97/lQZ/letJ/ZhybyHgjcmZEMEzJcZAhdS1sUEa1bMYg8 M+XVME9mCWOGhZV+OYDHVWpuZtph1dZ+6Jc5AqEfqHGdpl0J2FPrF0/NPoiaDfFSWSIiXfbWs /a1B2N4gO9lZOlZ9sSrJdS1yX8Q3jvsgOJtJdV1xdKN+6k5jcGxjrF07IRWe8KRBzRRXsEY3D RkYXfNnswvtyMS1wmzAF76znzLiwp6S8FkTWGY8+jBLj0smMttkZQu1EVytWaUaE/EjradCr4 PZ/G9uhjyiAF9l/Z/9Wwp2b4zhpTHRIYyt8Q0N9I4tCy+tBk3Z8OyhMccYRKYZVh7FxqrPg21 BGefRGIPnY73gjpmzyCjq10aoDhe/76JgImHa6P1kpsyo+wZV0+uX0Xm3La12mPEB3Q/JMSZf fzAd50XW5xGFjsjEgehGtgmfPXtRrdBR5rcCNRrq2pRcy59TU8o0ULMFUSSZpXG+oJuE3n+7x x9eLow8+52J+AWTMzJ0zoMHbvUtPj3UgxW5a2XyHqmHOPSYrbqa+MEdxbAzAxDut9o3bbjd4S HkoTaFjZJaxdN94mLwHDEqoV/lN0L0Yb5rKy5/wG51bv/VdJDvypS7WiBYah+yLEPFNnbf4th sZTsK41Nb3ktMvsjlifcXLOL1fnme2t4atkMz9zY38ookP1Jzt/vgISDE/kptDlfBxzkcdmXU ocLLo0RLHyoWTfJsZgY7mILgFNjDNZjKmMeDSXiNlHR3iZokOvvadh3k3rU/fkMiVsPxPKA9d CNVPfWYEh1NToDgYyYsWsbYKBC8vQP9TMBiHsSb3XStApwEY8Smcx6i/6kq/Gx9aNB5I/KKCx 0atJubqOL+YbPn27UvMxDdLHnwosY2Tcwycm5NpgXK/EDLgT08LWo24TmTFM7OOYOzseG4Yhd yXYWdnH8rVVEC/CdqSBtGxhX6g3nqQ2ng1fyBrJay07MQNfeXPMVu0oJppBpj4DUjoOFN8WFP DADNp80WmzgDGLJ4vwyIT6grXOMuZBi4OMtM+aCzPrBC1WvxptjTwqntKf1WGGaoeQn6oEt9Y 6Jy3ky3VlVKPxbiWxTrRpSwYcyTEr2WJl1AdVsNa32+uPkioQuEgOptVbEsZxZ04se7zjMQ1q 5KDIRCnyP5D0Io2xwnsue7Q1NNNotkfCh18VfZanazWnW4sMc8W6Sh6bvl3qxiDuAKiVo5Lgm 8yt2kIPqHNKwYiHzOGjXrOpUNh0rNomobs74G+g== Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Kevin Brace Signed-off-by: Kevin Brace --- MAINTAINERS | 3 ++- drivers/net/ethernet/via/via-rhine.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/MAINTAINERS b/MAINTAINERS index 153f7b3419c8..3e5ae3185847 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -18058,7 +18058,8 @@ F: drivers/gpu/vga/vga_switcheroo.c F: include/linux/vga_switcheroo.h VIA RHINE NETWORK DRIVER -S: Orphan +S: Maintained +M: Kevin Brace F: drivers/net/ethernet/via/via-rhine.c VIA SD/MMC CARD CONTROLLER DRIVER diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c index 8e8cfe110d95..55b0ddab1776 100644 --- a/drivers/net/ethernet/via/via-rhine.c +++ b/drivers/net/ethernet/via/via-rhine.c @@ -2,7 +2,7 @@ /* Written 1998-2001 by Donald Becker. - Current Maintainer: Roger Luethi + Current Maintainer: Kevin Brace This software may be used and distributed according to the terms of the GNU General Public License (GPL), incorporated herein by reference.