From patchwork Fri Feb 17 21:07:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Belous X-Patchwork-Id: 729354 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vQ5HZ63qlz9s85 for ; Sat, 18 Feb 2017 08:09:14 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=AQUANTIA1COM.onmicrosoft.com header.i=@AQUANTIA1COM.onmicrosoft.com header.b="hZhJMxOE"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935074AbdBQVJN (ORCPT ); Fri, 17 Feb 2017 16:09:13 -0500 Received: from mail-sn1nam01on0077.outbound.protection.outlook.com ([104.47.32.77]:52345 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S935044AbdBQVJJ (ORCPT ); Fri, 17 Feb 2017 16:09:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=AQUANTIA1COM.onmicrosoft.com; s=selector1-aquantia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=d5dXJfzrRp1VSs/T1AMkeHdNaaxw7A6hqQn2TL+GKWE=; b=hZhJMxOEIogVpibHU6uzkWoHh0HNTKalvlcx9MxVSjezTXu6RJwMUZpj21WSOd4tg9/wkEJemmNo57RmZ78BO7RxYXSz6LnRniBX9Zri1ThFuDJAO7NFIkhD/qR6t+mA7WYR4yQtYkHwgNL40/Qgm1Z3sbTpRCj2ZsLheg/88vw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Pavel.Belous@aquantia.com; Received: from atltest07.rdc.aquantia.com (83.149.43.106) by BY2PR07MB534.namprd07.prod.outlook.com (10.141.218.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.888.16; Fri, 17 Feb 2017 21:09:00 +0000 From: Pavel Belous To: "David S . Miller" Cc: netdev@vger.kernel.org, Simon Edelhaus , Alexey Andriyanov , Lino Sanfilippo , Pavel Belous Subject: [PATCH net-next v2 02/12] net: ethernet: aquantia: Removed busy_count field. Date: Sat, 18 Feb 2017 00:07:24 +0300 Message-Id: <79f9f6857e80493c2b19a0ba01399b49eede4fdf.1487365317.git.pavel.belous@aquantia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [83.149.43.106] X-ClientProxiedBy: DB6PR1001CA0023.EURPRD10.PROD.OUTLOOK.COM (10.171.79.33) To BY2PR07MB534.namprd07.prod.outlook.com (10.141.218.19) X-MS-Office365-Filtering-Correlation-Id: acca72b0-3022-46be-7437-08d4577932b6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BY2PR07MB534; X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB534; 3:fMzJvhK/AKkR8+e6H0nkj2SWp0BLXayyotc7JF2nA7oaWDNQ6/aQNMZyr06arf7GtBV/0fk5kGABsMMxHWdeHra8CQan4u9xxMg2hKW/gmLvaLw2LDa1aLZAf31rLTsuNoNQ0jgKmkNq5dAnsYDt32w4FT0Tyvg5f8wefIwVBlhOaKoxZzcW+8grGswPUE5rNYl/jTFyGrDpwv/7VQIuOQN3Gp3EVb0VM8tFDyom3jqDX/yB9f4VKYLJ65CQtTG1kBMz8wYO+8h3J6WlBm2exQ==; 25:7URIQttqLCu2tknGRkuokcKhwz++8JXESAIuxviRKQBUmW4v9UUe0kDPFcDzWxDsiKudrRaj7QRdsGOLVWNI7NlTVXkIq0RnHe3I2hXjb7P/2frO4H5dUPumERMbmT6FEj3lv5MpatAFuu805WMDtpVU2woGC1Wl5dCrf0IvBI2RutrZBJSYuJrjACJJ8meq8/uaGPohgACNhXsgl7+1jufVzuvwX4m4/U40nw3SWURsbw+S5UEDPOc/G87KeYvBBgT03NR/VC1C0fGetJCLSm985H7OjRMDhavs/JTJZO/8Co4gHiVbSNLri+741b7qwGAKV0Ba3lQDuL23BL2lWBYQlmxl+lYDaPBJjSxA31/WpP2O0vwr1+J4Y375WZBQngtcWr+3n0VdbOiDwG5yfyKrPT2iJmkk/C9p1mRbH8UcZ8e+X/SKS6m2KoeXzGU0cll4seQ37YvA4s+5PA2/YA== X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB534; 31:2nN8nL/DLg1/K9frEigJWfo4xUAGleRgHkz1MsvNRN56oOYb094TxH/FH7ut8MSfes2klNKwWFpGScj2zJDK4Zxk65k0RLdmJ1RC5bH6blQH6YrklVQiNJXfQlFUgbSKSZUGcfFmZOMQTJdd5AxseiVVJ3yvJTZT+VZhZh0SqnnP4VWDpSZzeyiVh1/6McSiZkqE2GvH7T2Lwqd93/EmjFp7+xyIo7jM+CdjhrhxHpZ+ijKnq/ZcomCekxphkwEe; 20:dWSMB4K42EDWiSLW5XzOi0K5kHHzfDWWm/zRzvrM8svb5+grhnb2T/Zamqe24OpV3s4Hv9y+ErgXOnjKZgWaREVEdZz65CgkvmT5mubkqPt+4o+3MqO3v/FIIqTZbWCHBh5akJ/FE5RTGH4qFP/JNKDRfKeKbQK5J5otjRZvZi1AUIRSKD5z2vvnwOILB0deRPb5BxFpR/XYEDFFYWGXCQLppeNM2+gyOzinY25JdCBo5r3+jRvy7eu8+fXDvOozahvSK+2NUa6BMK++cjFlzpZkPlR1uBsXZr/4wn+07HxlK+uMC3GmCKV8iI1mk0lkgrA7qBu15DDaZvQ/NoHM0ZtEPKVKu4lOUs8MLIGsL3sRv2blN4HOVkpK4v3piPYNpRyfAoEryW70BA6kvSwmJks+1cdUvfXiPLbmSEQbVMSJwrd6U4+LeP4DSc6z7IdM9xLDdtYGaRrXVarbQZIe4unfT3V2rQ1DQ0wNZgoOKbM6eVxwNfX90eHX6hMAcVrj X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123560025)(20161123558025)(20161123564025)(20161123562025)(20161123555025)(6072148); SRVR:BY2PR07MB534; BCL:0; PCL:0; RULEID:; SRVR:BY2PR07MB534; X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB534; 4:bNnZjMxUO/MfoBJplJTUgYh1eQ0jnGOfGib86SIqQadnEYMsh61lkestAbTxRMh9jtSZXlIjQgQzaMJfnMrLVXipQX0IPUlEwpbog7zDHBOSUmo9w/HkT/7a6hdUe4CGzG48+VEGbiZ5enfMpfpekXvDPUnQdA46JQ4EzaULmoqCnNfeMRZOUbWVt/BbTJyy6kldtmIRRHh/VRitd7LbQwsSA/8h6jiiAOXMt/Y36/hfJpdgBHhnOMrcjJrQoyWrm6FAPxCsXno3x6iaYfR+qHPq62pcKzjv9C+BLea9wYmcpnce3Fn13gxDUA1JBCfIxXFZ+pikpsmV6Iq7t5WeexAIKziZIN57YZ+hJjhhGDQhQM1e/budfBXJTokMkCw/+/iMiVl548HycXH18OMa6k+G+kun2ddsZ86+kkkGrmtkasPTmlqIXoHJPA+clJTqyB8Eu+cbBi8fdgGi3Cuj53AP0KHSKDk5zKQJSV++Sl+BdJkqsejVyTsCGdFZFLrnlwFBoZueI0XrE5XVwGsOYWS+kmKtPg5hfvoZdvuiZRuEX0vcRO2RrG1OI9C7NgmrzPst2B3NX7noJeh4jep85tvTTHJIQ0nzpOl+MU7wHD0= X-Forefront-PRVS: 02213C82F8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(39450400003)(189002)(199003)(8666007)(92566002)(6486002)(5660300001)(33646002)(54906002)(118296001)(50986999)(76176999)(101416001)(25786008)(106356001)(42186005)(86362001)(81156014)(81166006)(50226002)(8676002)(36756003)(47776003)(66066001)(105586002)(97736004)(305945005)(4326007)(189998001)(48376002)(5003940100001)(6666003)(7736002)(6916009)(68736007)(50466002)(2906002)(3846002)(6116002)(2950100002)(53936002)(38730400002)(110136004)(107886003); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR07MB534; H:atltest07.rdc.aquantia.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: aquantia.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR07MB534; 23:e4yhDMnHmf79ppf8rTX18Itibhdx90L8Sl0dS4qtwW?= =?us-ascii?Q?JJL9OkCWno5Udy4eGRDRu58ytVcghHgAbRlpiYDq9Y9Q6P4Xhwo2WT9AxuvZ?= =?us-ascii?Q?qPyRr7z8A0pfDzUjv4ABWLmxUXh8iC+68wNe8WcUUVjdjf4OUo286WilXxDx?= =?us-ascii?Q?D9AHUB6gst6Ks6PrRph+Le80gdCFVSfM0e7uq0Br2yXUtbnxTElflEy9qwVv?= =?us-ascii?Q?e8Q5y4JS8zQqLnUG1yO7zCatrp+GzaC7OfxwDdb/tooDVcCGv1IzlzdoVQMT?= =?us-ascii?Q?XPEEqR2cnDTIbm/4dqZU/J+FLf40S7h4W5NbvuP1+w24uSyrfxke25T3wpt3?= =?us-ascii?Q?u8tpYpY129v/AlegluI1yaSZDNbAK/OmScgljbaKll4jlz/MtVUQv1BTu6PJ?= =?us-ascii?Q?ohaKN/cdwOOAmx2qbuYBWlV50SboFqZqyLvqCibICBwL+I5saeJDmJ8DElWJ?= =?us-ascii?Q?QSWGYcL1wXMcyDdOFyTKZdL7t8alr4nZwLyS4Pz5wClmKygSJUvYsdmJFxmX?= =?us-ascii?Q?4T8Cf/qK6BtOVi+CzMaOiED2nKFuHdOdUi5SWr7jjvZvWzGpnVp2tKDCWXdz?= =?us-ascii?Q?SNxic7IGPhMei/UeZnil1rFO56sGhnU2W0njot0PG9ueRMJSBx9cUMECuKOV?= =?us-ascii?Q?SBhJkFkeqv+t4HcSNbr+nsXorQ18DyL1cyytqw8tzZ8SaL32rCiT6tO5NTjk?= =?us-ascii?Q?CJXjCl2b5U/WOck147UJCSSknDFOC4A0bHM/3o1NQxUl8/GGq+0G8rxcsZC1?= =?us-ascii?Q?zLCMAR+FqucZ4jWj7o4dLkmGGSGXmJ443NN3tZw0v02joDpXQEqoWiXvpCrA?= =?us-ascii?Q?FNZ/X0EiBAzPY3AGYMqytfpK5U7a7Z3ThqXLJHXSH2VMj/c+S0nLfO1Ixcw9?= =?us-ascii?Q?sllTf3GeX2CcmPcaeM/eBtnEGKAHhrzEZSZNUx0AteEryLs85uDwNRogujy/?= =?us-ascii?Q?11P+3s43Thfdl9Pcol+XPbakvomTzjqaZhsGcuDTVYrbsUDh/E0arHqblNC9?= =?us-ascii?Q?ZxjIDzmJDwzvUdwRYZ81cKerFHkfXtJBIV+3U2MV8eqdnv5lZk3Lu0MDti/z?= =?us-ascii?Q?ZaNdMwwzoYMNl06Vte+/SqZteQ3q0FMhCYICryUMFOsGcbgx4rcBqI1zHkLG?= =?us-ascii?Q?7n9IGwW3ntuhnxaLBsYFc7y5sgq8RE?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB534; 6:67tyFNe68KxUefjh6P+nWE5GbJ4pNPIHJV4Qp5IqYhXRA95O8EEfX3PB44P9f6/5UH4tfm2MJXTYoRXIt4IoGLn/4LxS9DdrI0Mt7So8mtaGSB34Mx3BMjXUzg4dl0Gt5aqW0zmOMaM3od1+0/nsMqz28Lb2V9AHCRCcNO8cBfCGHuq4+LZWJ2H2H52wLe6vo4EYI+o4LgyfWk7WnTbTijfftZuXHjHlVxL9DwqCyePOMwrc/FP6gYVtV6cgCtjX8x6LLCoZ1R+CeeGxOLLNjlFZn46powWEDU5B6cYX4qG45zrfeI/8RwLRVucfNaBYf9ldzgZfyhTdBGiD3PDvT4gF6QkO/KL+Jta+2SYCu1ZFhY1JTrTo0IVvGcdJy/y8WAMZAe5/T7gASmfkVNTmdw==; 5:sEQC3jp2HrFJ5CltyZhPyaFY/4F9/OAuBvELCKwyMGxHIOqOXby/Lpkcn4+URP8eznABQ3XCpcgzuYeky5v6/ITBo41HlLlluhCDXP0HG4WY5EYOLTV2X3PijbTqzZ1CnXg8kL1GRBZDqhakAuP9Xw==; 24:TuRwbov15kMfoFPcww04uvu0U26x0YwLOfMWf5LzumKkwMLgenAYzIzEPh01m/FXH2+4uuZOk8ZALinTcZeMt5m1c10f5e+QpM/M+OPijF0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB534; 7:yIW3fUrgCvotKG3JUod+xCPfjhccTVWBpJlnhpV9OtrZGFl4YeikaOILsdjzuoj2jRrv1LT1JT71WKdfS7aAScQnGS+sN2Z0KOkIyD473HrqzzHRmw3zFWFc+UzfGQTAb6LLNbriKZ0cIi2BeIlFZPS4/sAS24S0a/S6Cg3/0K0pqQTyr1QJjqALfysdMhl/4uPeahYI0wByR1JCPpXkjDaj5tms/5nR13OwYZLVPdblEPZ1SApsnplaqFFMmeBWZE6xGUJJEVhlimJklFkDUkAjHt9etmrOuF6BIblj6UU2BRIqNqJMh5CvKBvFy+QesaQwgOWxr98dJ6L+jYR5XQ== X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2017 21:09:00.2684 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR07MB534 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Pavel Belous busy_count field and is_busy flag is not needed at all. Signed-off-by: Pavel Belous --- drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 11 ----------- drivers/net/ethernet/aquantia/atlantic/aq_utils.h | 1 - 2 files changed, 12 deletions(-) diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c index aa22a7c..a153750 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c @@ -122,14 +122,11 @@ static void aq_nic_service_timer_cb(unsigned long param) struct aq_nic_s *self = (struct aq_nic_s *)param; struct net_device *ndev = aq_nic_get_ndev(self); int err = 0; - bool is_busy = false; unsigned int i = 0U; struct aq_hw_link_status_s link_status; struct aq_ring_stats_rx_s stats_rx; struct aq_ring_stats_tx_s stats_tx; - atomic_inc(&self->header.busy_count); - is_busy = true; if (aq_utils_obj_test(&self->header.flags, AQ_NIC_FLAGS_IS_NOT_READY)) goto err_exit; @@ -170,8 +167,6 @@ static void aq_nic_service_timer_cb(unsigned long param) ndev->stats.tx_errors = stats_tx.errors; err_exit: - if (is_busy) - atomic_dec(&self->header.busy_count); mod_timer(&self->service_timer, jiffies + AQ_CFG_SERVICE_TIMER_INTERVAL); } @@ -574,16 +569,12 @@ __acquires(&ring->lock) unsigned int trys = AQ_CFG_LOCK_TRYS; int err = 0; bool is_nic_in_bad_state; - bool is_busy = false; struct aq_ring_buff_s buffers[AQ_CFG_SKB_FRAGS_MAX]; frags = skb_shinfo(skb)->nr_frags + 1; ring = self->aq_ring_tx[AQ_NIC_TCVEC2RING(self, tc, vec)]; - atomic_inc(&self->header.busy_count); - is_busy = true; - if (frags > AQ_CFG_SKB_FRAGS_MAX) { dev_kfree_skb_any(skb); goto err_exit; @@ -629,8 +620,6 @@ __acquires(&ring->lock) } err_exit: - if (is_busy) - atomic_dec(&self->header.busy_count); return err; } diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_utils.h b/drivers/net/ethernet/aquantia/atlantic/aq_utils.h index 4446bd9..f6012b3 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_utils.h +++ b/drivers/net/ethernet/aquantia/atlantic/aq_utils.h @@ -19,7 +19,6 @@ struct aq_obj_s { spinlock_t lock; /* spinlock for nic/rings processing */ atomic_t flags; - atomic_t busy_count; }; static inline void aq_utils_obj_set(atomic_t *flags, u32 mask)