From patchwork Sat Mar 24 00:36:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 890344 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=none (p=none dis=none) header.from=cavium.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="J1p09dkg"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 407M1C5z5Cz9s0y for ; Sat, 24 Mar 2018 11:37:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752025AbeCXAhB (ORCPT ); Fri, 23 Mar 2018 20:37:01 -0400 Received: from mail-dm3nam03on0073.outbound.protection.outlook.com ([104.47.41.73]:36882 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751814AbeCXAg7 (ORCPT ); Fri, 23 Mar 2018 20:36:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=4bzsa5x83lChGBr8WsvDXRRwVuweASm5NEkLhZh4ROY=; b=J1p09dkgKEQkukfLD6WCjgVSTkAWL8MaBR9SlXgASbMXy1perUR67M6zsOenKcBIqgl2Sl5VNEzcI2QQAAnAht5EbG+Y7/fR5W5Gli9e0XjQ1coOuqF3OkQErvE3G7Mvm3+BxNmLx9IndgGexCrpeOY+HWpui9XY8sPc2dUqZ/w= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; Received: from localhost (50.233.148.156) by DM6PR07MB4220.namprd07.prod.outlook.com (2603:10b6:5:bd::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.609.10; Sat, 24 Mar 2018 00:36:57 +0000 Date: Fri, 23 Mar 2018 17:36:56 -0700 From: Felix Manlunas To: davem@davemloft.net Cc: netdev@vger.kernel.org, raghu.vatsavayi@cavium.com, derek.chickles@cavium.com, satananda.burla@cavium.com, intiyaz.basha@cavium.com Subject: [PATCH net-next 01/13] liquidio: Moved common function txqs_stop to octeon_network.h Message-ID: <20180324003656.GA6476@felix-thinkpad.cavium.com> References: <20180324003618.GA6457@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180324003618.GA6457@felix-thinkpad.cavium.com> User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: BYAPR03CA0007.namprd03.prod.outlook.com (2603:10b6:a02:a8::20) To DM6PR07MB4220.namprd07.prod.outlook.com (2603:10b6:5:bd::29) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3ad0c10f-1c68-4475-b911-08d5911f59df X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM6PR07MB4220; X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 3:q2+HPt6sfwudZFhQNCXGTeJ0UyRWV96kX9Vgt9u10lus5Y7iG/v/wYe78EPXQswbwbHlNbWeFv43LpOrNWdZzm+jL9BPzbcRayqTRYuLL28V92zkpuOjHPBFGdRJlSDviDNhcWs5BZ+vBAs4ZKmpLwPOdcHz9MQ2Zfe8K2AUG0yHJysq9gP+BDin3KFhq9nmofjGbEzTRmLTyXLipa+4YEIHuYxWm2CCKbj73PvWzYWWQKK+aR4f149Swd/A/Ftg; 25:W4kFhGO5UFI19hLQhnst7Asz//9y7+Gp/KhaCcehqt8iDg28/ujcPCy1zxwRgfGtQEtemcIaKGxwsGfcoZCKjWSEy8SvmtBjCd3hbqJcM1V+QYWcQnsuHZTXCg1mhVtdnsTBM8jz/BWFYcJ8RIF9kKrHkMowAyQOrPbK2pCtLmQbwlbVtoX1i7G2QbDiSBMoNN/4EWUEQOzRRkP63lQatc677CM/VDaiQLg/cWUQZUo3tNkxMZL0uobAvkkEXiLMqKiTyHbbGXVDTcluH/TSR1ErvEDmLv+/WDxKnyveTMKIRyJ+pK7jb7R3IHsPKOJFnQjyhjMOiC1wn9EVzrARIg==; 31:FoKdMGsqD5puRoE0HnoNbPXOAzzTwZj6tvwLPASYq0kxPkQNlJ0v7TuJdKduB2kZPq5VgDnCWBq4x5wwrQiFT3S5iVAiptbiIK3Js+OGtD0PlswDk9FG9zTaFzYSp/m6NuRu+xHL5jPOO4DZdS2rkg0MRIjlr+WZF0SXAF0ApIIJJTmTxlptRlTy3nvxsvX+FkuAAkpUtwnGuBjqBD6q9ZMZr5Ofng3FXKZeb3rpuYA= X-MS-TrafficTypeDiagnostic: DM6PR07MB4220: X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 20:F2jeOJBikNXVdsK0M/hrokpqHxfYH8HURRAIdGvrEhvHCVkhto3wwQ7Ohh1EIecpN4j5/fkJX4kBw9261cS7jxLZCNfIf3xMSyfD3TQJm8lJxEh9mnRdXYalBmwljC9qWd799wSegRO2CUv4XabpxZfbz328wOyfvsIvd6VF8VLp/Sv2VS4BLvu7MXT3OfTwH8yWNeBzgQLgMelugunfftL58jd0djq1ScvCwMZkNqFdSKrtX6FBqUxOwvN2dl405VCBtv6Mq+o9gS1xP/mnkHlSRskK4rgTjCJhnLadfIIP8+yg57+5mo51X1MYz0sMgBFPUcIKei1ws0wnzoBBSd3h5qjH4j4cSewsbgQsRu6cqJKRgmhNecqDN43QWN9rO2JZo18MVz4FiP98gZYO1BOiIa44E0sFcw853YfKJ85bvqPD77fhKjDFLN3VBGHn+WXhmkvrH2lbTHLiH+4k7gkWCsBbXhTveCVMyPN3NCXWxiQK2FoRdDXBX93H/UR0; 4:BgHY8HuYu5pDzck3hEqBmoQSHJBGFDNdzLL3CSO7/V1OMfoT7Y3//mCdN3lymYrmPqQcEbIw0+zefaIj4WuBu8QAtZkA3c2GHnRAa7zV6HV1H93wI8kvPV5c+GDLzMna6mfhXrIkkigT7lFGjdAgSfR6vsaZzzFpPyiY3QqP2UY3qR0pMzCBaRaaL4VXh7DrMniqvL5Fht5s7b/JS7i7AnUz8vYcNfNRxhU/bAHTJBNB7fh4CbnpgHaH+CJAm7OONjxaUHiYDmJfEZZKfTlsrA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(3231221)(944501327)(52105095)(6041310)(20161123564045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:DM6PR07MB4220; BCL:0; PCL:0; RULEID:; SRVR:DM6PR07MB4220; X-Forefront-PRVS: 0621E7E436 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(366004)(396003)(39380400002)(376002)(346002)(39860400002)(199004)(189003)(6496006)(446003)(66066001)(386003)(2906002)(1076002)(478600001)(47776003)(3846002)(52116002)(6116002)(23726003)(72206003)(59450400001)(50466002)(16586007)(11346002)(316002)(956004)(97736004)(76176011)(58126008)(86362001)(305945005)(8676002)(16526019)(5660300001)(2361001)(7736002)(8936002)(68736007)(186003)(6916009)(81156014)(2351001)(25786009)(76506005)(81166006)(26005)(107886003)(33656002)(6486002)(105586002)(4326008)(106356001)(53936002)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR07MB4220; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 23:+WblA8rVnz1pgzeTyI7Hb/6Zc2BFYuMJEKa9u0BJkQd1qC2zgIgW3i1B2PGOeMC7j1T0KlUGRBGM0UrodQMYvooHMwaX+TXFgUfTFLPazceG7DmESU3Bm5BE4wHDg+mlaoZgGxonxndyPfTTXpRYl6I2UC7MFvu4rt4P6eNnw+LVP1nipEqXqjzNR4qwIa9JS6zL/dyuR/5ThPA0x7iVBAUwbtq6dNuXs8D62V+gmxB+b9CjNkc5XxIobC7tcBQ1NEKQQC5a7Mi2Vx1f4lMQhOCPs9heTem1VE9KhG8BEmiJ//DTa0HJAGeXJER6SEowNSve9p6drKPBwonzENorDs7MR7Ei9125JonoCUypxrvEspnt7yLpvEhozg4N7vjpFGP3fQ9noVWfYmxX1LA7Ir3ewHrYdLu5ecY03J+wyHGHpARWMoQDSIyBI4GuseiKEArCL6AQDOABOjTMPTgb1GHM1ib8oOQjAhqNaCz49GDvQWjycN3PD4gCjmpWzA6pmnkjFvaw1n2/VCUCI2yUt9vHqgezgHEeujj2WSBE8uet/5ZN07A7qWkypN6nTdXkjT3596Z14EOxgBMpr4PXg8VdTn08f4q4rMV/k+i+0uCb30lIhX0BsGGlrMoVqfcfhHVzGnRi+FhR7GsfdHUYRGaxWfW1HQ97tmmtdZpoqkA1qAxTfcWG7MHHkrvIXdXmWK2AjXjCING77eoITcsejlryV4CsL9Q/ukk+i8H8EeE7GkuP4rib8j+Y1eZHajmbx1ici+KcRS2yl/8BA4LjSJOA3T2KX2tUMh+I+znUkFhxs2roT7WUTZyU6PRSY+MSHRmRd4XHac77E5ew7q5aRV98T8u+JERj3ldbW57zjyeh0N0lA5R+UmR4zYFFZ5+2SOXTTV5A5hzhPDbN4tWPnEwzVTv3e2oowImbUenxbMRyVyTpJFhNy3z5RbIRLF8tGRVJFBygC/U7HTX2uHHk446BEapSKkNvfrsdbNl3qYhS1C9pD9VT67viAr6jM/8jcQ10RKkofL1kRHIbl19b0c0MS6eZXx+KxrmkF3bL2giALrk8grlbdmLvusZMAJsS/gCXfj7jhgQgOjNxkBMzeEAzc9EaDhFfIIWe9xOWiNqZdbFv0o4QbAt7ztOev0oMdHD6BdH3eCZicptmgIVZnSOI8GfUWkJZppeenERO3vARWpfT/mCvd8tJ+919vIXwYjPzMxWrVWQftSBeKSZFMYBdZi4WDSGIyhdSOoMgi/e81DJcLrTu50WlGk8Rqyfk X-Microsoft-Antispam-Message-Info: 981sWDjWHs89waff+MKoeFqVSI9yj02KAwRJkgIZ9bdORkDJd9jn/TlyzKSy01qiryjd9dXoq8xRkan24jWlwFffMmpl0+lsswmIwu8KHpJAYLPYoXY/TVLQrRNgMPdGvENv5RPyOuOjPpve1tuiiAkC9nQG+dK6gfQhwG8eB+/fZTlPRfzFeAZXBZEgNf+J X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 6:b0ZSgabYkgUa9qbCIiKctY5886AM3eX0skCf7YimqOR84H8EGt9Ury92wwy9/OypUBgPDlv5DXel1Eezu6/Xvt0Jw/SoV2RjvNpqnHkE5nPniWC/lRurzM1wUbzkoX3sZFDy0o9ZoxAsXAj42lf8vJhpe9+hfbnN53Yyp3ybOGNTo7ZKvtL4QRf8DfUCawcAQH/A3K9KGEWUNJ9MKnnzziVGOeBzFHpD31+ZzoSD7inCFQ7chXJFX2hhK8eEwqUjwRXtKls+uoJ1OOo1xuQTmOnlcCcQ40+QlAW6Psfa5SXQPiixUTVR9ixRQg/DZKBjXydaT70Fhd0z7BF5V8l2aaH7HrQhx9VHO1GMOiv49wGvRTNHb1t+38+t5EoVZztIRyX9ovBhu6FaNT8cz9HxNKLntz3FOL7ktkav6gywBtg1+UUy1N+p/qeb1m+VMIkcUmYn4JJdx/piv/jm+B5Kew==; 5:aENi177lF7QmkT8Xs8kzPyu20g9KhhSm/U6XJHL4zvPHGY695zOz+raW9QcrXTG7qEeHkjFw1uKnSRFsmep2+lsBvSw28h8yVL1YbRPRd3bPFzBeVVLfE3xYn9xOMVf6ME2scmY406y4+hlt2t3yQyIjN7NAlAbqqdMgn62s14Y=; 24:i+Cq8B6i0RXECfnluowjyrfXAYahKpy4RMJsd395+sZvljmu1HAb4Aww1cz8F6UnHDmAHQn/3gIQM64ewuh6v/ySkiUFSZbQgfLc0wJDwHA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 7:CWhkFJVJzqiJ570A5b3UtcPwojjxBsMrwfK+cDKwlvreFw1iHLx8BotNALR6BmlxsgD9wt1sflS65mzppSlbn/Jw/3C/G19BSkaBgStCryokVeElIhOD8NvGib3UxAnAVzOrcVILA+hZNe9RvVgJesl5KPcHQ8UVKd/FufrF426UKhY/PfjaRaESn8QAnRgGjhh3FIODiUrVqhAiyGIJd+bg8q50LgN+vAGllWs6TV2+2F7xZHqGzutnli2G8aib X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2018 00:36:57.9703 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3ad0c10f-1c68-4475-b911-08d5911f59df X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR07MB4220 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Intiyaz Basha Moving common function txqs_stop to octeon_network.h Signed-off-by: Intiyaz Basha Acked-by: Derek Chickles Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 16 ---------------- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 16 ---------------- drivers/net/ethernet/cavium/liquidio/octeon_network.h | 16 ++++++++++++++++ 3 files changed, 16 insertions(+), 32 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 140085b..05c5162f 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -509,22 +509,6 @@ static void liquidio_deinit_pci(void) } /** - * \brief Stop Tx queues - * @param netdev network device - */ -static inline void txqs_stop(struct net_device *netdev) -{ - if (netif_is_multiqueue(netdev)) { - int i; - - for (i = 0; i < netdev->num_tx_queues; i++) - netif_stop_subqueue(netdev, i); - } else { - netif_stop_queue(netdev); - } -} - -/** * \brief Start Tx queues * @param netdev network device */ diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index 3342d64..2e31446 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -285,22 +285,6 @@ static pci_ers_result_t liquidio_pcie_error_detected(struct pci_dev *pdev, }; /** - * \brief Stop Tx queues - * @param netdev network device - */ -static void txqs_stop(struct net_device *netdev) -{ - if (netif_is_multiqueue(netdev)) { - int i; - - for (i = 0; i < netdev->num_tx_queues; i++) - netif_stop_subqueue(netdev, i); - } else { - netif_stop_queue(netdev); - } -} - -/** * \brief Start Tx queues * @param netdev network device */ diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_network.h b/drivers/net/ethernet/cavium/liquidio/octeon_network.h index 76803a5..d8079e35 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_network.h +++ b/drivers/net/ethernet/cavium/liquidio/octeon_network.h @@ -506,4 +506,20 @@ static inline int wait_for_pending_requests(struct octeon_device *oct) return 0; } +/** + * \brief Stop Tx queues + * @param netdev network device + */ +static inline void txqs_stop(struct net_device *netdev) +{ + if (netif_is_multiqueue(netdev)) { + int i; + + for (i = 0; i < netdev->num_tx_queues; i++) + netif_stop_subqueue(netdev, i); + } else { + netif_stop_queue(netdev); + } +} + #endif From patchwork Sat Mar 24 00:36:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 890345 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=none (p=none dis=none) header.from=cavium.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="gDXfuGcb"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 407M1M2xVgz9s0y for ; Sat, 24 Mar 2018 11:37:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752116AbeCXAhJ (ORCPT ); Fri, 23 Mar 2018 20:37:09 -0400 Received: from mail-sn1nam02on0040.outbound.protection.outlook.com ([104.47.36.40]:15081 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751814AbeCXAhI (ORCPT ); Fri, 23 Mar 2018 20:37:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=FtVjbEWU6hwFN+S4euioUV+/hHtaq4+d1kGxeVBmwFU=; b=gDXfuGcbqGvZKTvjVAB/B0MepcGO3xLSHb2QWvT1Nzi6NWHvmYLiLJoIbLAyXPcrbB9f7odYGKGFb6WDs5qAA80IkgLEyH7ygbYFlDrerabBGYHJ2aXl7T1UOsQ02c15Vveu9hIJkgOtIKKU17lp+aEkPVNELwZCRCWKh9ijbRU= Received: from localhost (50.233.148.156) by BN7PR07MB4209.namprd07.prod.outlook.com (2603:10b6:406:b2::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.609.10; Sat, 24 Mar 2018 00:37:06 +0000 Date: Fri, 23 Mar 2018 17:36:58 -0700 From: Felix Manlunas To: davem@davemloft.net Cc: netdev@vger.kernel.org, raghu.vatsavayi@cavium.com, derek.chickles@cavium.com, satananda.burla@cavium.com, intiyaz.basha@cavium.com Subject: [PATCH net-next 02/13] liquidio: Moved common function txqs_wake to octeon_network.h Message-ID: <20180324003658.GA6487@felix-thinkpad.cavium.com> References: <20180324003618.GA6457@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180324003618.GA6457@felix-thinkpad.cavium.com> User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: CO1PR15CA0099.namprd15.prod.outlook.com (2603:10b6:101:21::19) To BN7PR07MB4209.namprd07.prod.outlook.com (2603:10b6:406:b2::11) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9aa35c23-5cdd-4496-7a17-08d5911f5f1c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:BN7PR07MB4209; X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4209; 3:tuM8BWREfzDPa+sIVcC0k1UGJ2Lil8gZDshoVxxX+6LNBj5Laxh7UduEVk98ZHDHsgQ8WXJi6t7UCEfJGvRBVMTGDGpGXmcauUvwj86tQ2jJEH3MNtcb9rrbVJDtjUPX5/Ens8sdifHQscOqUun4oM3MvnmpToHj1MKNFx3WknavAgULQpMhDG6w/DE8IOET7zPaun882KZFEpr8ov40o69Z/l+QOK6XHxHZtDsDJOZVMOBOy1z+mAcH3sQHUOm1; 25:8vqOilpRZZuoETfFznmrkU0JJ4RqJIR231CKrbb6VexKehtilo2kE9jG9aeEIXpVv5HOMOEYZ+QOzgArlsUViVVesE+owEeIH5ASs7EjvhDVM88lCQ+ttCeHdu119j8vwNpiFIF5KX+S87jF/qtma97zy2w8WC09/UiToQwN8Q1HmTZRiC/GXDT1QEAOb7SP9ETGGaS6zpEBhFxfO8VQS/Z+w8k5MUMGKpW0Nw2Qpn13oDYY844r+m8yfPUX28DyoFu+a7rzJr0/+fhrpo6NgBxumoX5UonDEzP1M+ipP9UbNR0sTsmVi0Yb7jViMZv4KbdN13wZP6pHiLUhW0JLSQ==; 31:2meL0FqOg8cSOWNFVnFCijNNhtmSs6cyMwPQ5nVKdmIy61tMH4WrxW5RzX4rc5nOtokoNa99Drqaptomex5fSQAIl03otizVkLKVugbLIQIniMz1edsXrb1kaCrnLTNN0oJBCX/NCvxA7zzpON4FAkofKb+MxOjYGKf8VmJaShQRgU9eRRf9d1FTK9aJFfkYEG4BKz9msALOQQHSZiThzB9RKiwn6A+dNBOF6E0hCOQ= X-MS-TrafficTypeDiagnostic: BN7PR07MB4209: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4209; 20:8prmZqUTzsIa88tXjRKvq8tKbBY0trSAXUc4yOZgSER9gyZWtlx3SxJU+99JGrtaJmpFkQAFSc7QkbyjABMlQH3kUX2iZ0hunTHCLOTZCev6ZWommwQCJSBROlEbQC5jtqQfqeKoyFKZ2F41ayoUlzz3vQnarSZZ1MNw3ILYLSw5cv+6yagOyaFGfLnIFRAvhSWZei2KQBuY1aeghcu0dSEBeY+rSbj/0ji7AXqZOQ7B4zRd208+j619Gum1iJH5zvJIc7TphHm7k7XP+vGUQN68q7z66L4kmG1R7TgHFbGDCJJ+diCk043J/ohC9hEkiwxmFg9AlozzRFkb/jL2Bo84CdOS+Vg2QrXdpuzJV4pVXmx2isIIJav9ZOY70cZ2+YZI46FpcAveeC7hc8jsPWsyg7dFT6mjUFALWls4mzR0rIVL6XFyXLJiR+XBRebBDxyX1oyIFWpFv1SrUoLHHyUj7/qk/UP8AYljGfQfRKO3ZSpuxiKYT1QdH6XqKyFm; 4:AIGLvzbbWKe5Tvk03UqAXf3hj7YZGoczoPXltja5wgSiq7sBdX6lUrGXoje0YuaUI1M+V2iBmftfCD7B2T0mIE1hbN89rgKC53fA6f46qspq1c+zxQ2MO2bGMkICUYQ5LHBqfijgUHcngl5qB29SSrCInBgJRP4AxCu+I5C3KypJDaz1C8gzQHpZvkkEjhg2yj6RuLBvdjxzAIf1W9gZ5SF9UJGTFbVeMq1p//RrvvLcUMfgylMf/HpO2ddPcaENjc2dZh751v/YQC4GtsqTFg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231221)(944501327)(52105095)(10201501046)(3002001)(6041310)(20161123560045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:BN7PR07MB4209; BCL:0; PCL:0; RULEID:; SRVR:BN7PR07MB4209; X-Forefront-PRVS: 0621E7E436 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(366004)(39380400002)(376002)(346002)(39860400002)(396003)(199004)(189003)(47776003)(52116002)(76506005)(16586007)(81166006)(25786009)(66066001)(8936002)(8676002)(81156014)(6486002)(97736004)(11346002)(76176011)(956004)(316002)(4326008)(58126008)(2906002)(105586002)(86362001)(23726003)(1076002)(68736007)(107886003)(478600001)(72206003)(50466002)(6116002)(16526019)(26005)(186003)(2351001)(6496006)(386003)(106356001)(5660300001)(2361001)(3846002)(53936002)(7736002)(446003)(6666003)(6916009)(33656002)(305945005)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN7PR07MB4209; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4209; 23:1xG8oT+eSWTFndwSuQ4GlQ5kGWg+rHMNmGYUGkOdNRPWaHerLz3ad3M/yzv+0Ftc4avZ44wOINzxd6oKuW2tWtOwC6AwyY7iTF7e4uONWn3M0ZrMCqqM9CwitnfggfV/TPuLx881qC0hJoMp+AqSQjMxa/wZmfDA6dA/KGEHhYNbcvtLSGcmLNhRfQa8aGgjnjmgMBVQJsKUFxalJY9IWBzzzndZ3piT/jo9kKcPTA8TyB2ulqNQ1H0gtD6Qfly3gxchHp/X53jhK0j+wfam9sSuWbIZkKf/MbCnY+YlEksVoeOubSCTo6faObZzu9MfNDVcz46q+ae3BGwy/Ozvpfoy5mj3WR61Qn7K+Q8xIbvtDI5631+KglwjFdaoQXOYX1eU8n+Gb8uTku6NaoP7j/IAsywRKDxpRaDH7Yh/ZHV0udy5ypeVG6d4E7G4XFr3EbE/m6sKxqfmIpPQWT0GLlmrafK1IU/RqHCnhraImKybmd1ptxAQkUhIVHaxb3d1dkG/CtFi82Vqx4F545wGnXV8ag5h6RIj/6fjF+qhrRuyd1p9xjXc83MKbOu6N2JQHRtkcvRY2hO8jLhW2SQmv5XvLNNXYdzSQ9emJ6RSW6/6KG2k89cH4yXbaSfOEbbZQhNS1HKXsP36EVm22YtUFzcurQZjt7sCzQ5CmneKFK2u45R+WMUN5j8W/1+8tQGvIXm9eautP516GyLluJu2v6QbsfE4ZrStkrOh8pPAVlcOdiDzkCbo5txYfuTMLBitORsu5jugKTBqilKMSvp7Bu/ySBjm0OTtFT5uCd0Y/Wxg4jbHEHBtSN8WycGnhQpqmBlspQbgrTlx7TwN+zvA1VPyRuwQ2Gd6cY4jXdaTRjvhv2inV/fDef2skE1i1BJuiei0dDI0JgpbRSpWMAcfZXdPkjEnXKsTuqmcBc0dd+3jyoHfs+ll9dWuqF0IASebE+RCtgC8g54CIuh6Qt66zEP1A6L3AYyHq7zUKdnalRg09ksLpylbfYuf6g9eneNOIJcklrD71aX0BMjXflbMHnuesmqS4/BUHBVOLAE4UkAV6HON1s7Zqe5LHEtM5IiYqC5mv3gILfcy4TPlU7MielDTYQQXpE7cy1ptjrc/fYqChUHjG0dkv5XvDDORQ6Ju53xO52Ujhlp3maVBru/tB41pSci9ogLTQQGUkXHEmlHEQz0STFIvwn6xqAil6jeidl2h7K9OmPFXodCUcZPa+FPM64yR+AQil5Z65ibcSRQ= X-Microsoft-Antispam-Message-Info: GyPksw/nXZvx6DgJ8lIvHR5HLtpE05NykpkbxsJuwK3urAX86m3Snc6OCg+/VG7IwchWlhoIna4+YdKuqv7WxRas+eAWN/ZTDwANNdkQDZxi+k+ogUPxFYr9J7DtpdvcTdwOdMl5t48bjX59jmt+CMm7yhg+c7NWe0YAKHT7tCvuEjs+jBYUW1JQl8Ucpm/c X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4209; 6:nsBs8E0U3BXSg6s7swngPscobEuSRWNt8YUm82lrHL9fX7GN1tySQln5uAHf2FexRvCEHAB5OTnNhuyg0GHNo/Hs1WKSmgmz+bFUPVi4d+fzoASVBOd4DId9VIkwrHeox2nnEY8MKU3/grXE3jf625yAfiEDgPxc6NspxD/MyZ5q/JbNBIiWVelow23ZOa4ySkjyKCsXSBRVTMYXB0uJcHjWnNJG6VlDfruHZE9dTP7G3qVXMRJvgXO75PXgh50LEqTnkosEmru0v7cOwxjKadpE4vmPkyDqNwbOezZr3BzyxieuTiTkmTAkO0/H+UejginAyn6dwMQJq5hEE8NBkyFr0cg42E/aukohOKrmxvRuEBFX1qBuaBtHstq9kwGKoGf7XVzV5+feMlqiRH1Uhli9QjYu80D4AkUG5by8hZjnqWl/twHg8tAk56OSPNeRlAUM5zB/s7wGwB5P8MIM1A==; 5:z9OpgnkpvBWRqA37Zk7C+7v3n1BucZFBKsbDQe/L0dubUtdf2jp3dfq4RurSq8pMI83ikM+S1hmCnUNuDIhGMjjkLg8+OnLy5NqUmuA83GaOiSY2DIwdfVilkJyIQzOaq76hBV8mxlaDy2lfyysF2NzbvmFAfAgmq8V5CLd51V0=; 24:IbdN5JODaboWKHFoXqO23AcO0oFMGf3VS7em2wHwBnYIpJQwsWl7AKo5gpjWfTHCC636YOlvMxnLLk9bUznYI/zW1AI2jFT6VgD3rsrQWCU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4209; 7:bjUlYHteTMsoaHyVbtGgDuxg3GBpJvPeE0/RNlEibCkdb9ysA5O/Oja6yMHP4JTTaXPqW9RJjX21vr3efDSRu/pWcA5z26dc1xUY4kZR1BIbz2GLwCZ7RH+vg0QYHQsNM5pyZb70VWh60k6Kh8DoPjoCBNhIR0EeIlTTVfCHsAX26yVmfPLK2WC3Hku2ekmEBqsdz706jmya7RyfX1rf1fRFlr1ofnuyEA/UhkkOpNhnBR97dIA/3Mb11GxAcotI X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2018 00:37:06.6217 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9aa35c23-5cdd-4496-7a17-08d5911f5f1c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR07MB4209 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Intiyaz Basha Moving common function txqs_wake to octeon_network.h Signed-off-by: Intiyaz Basha Acked-by: Derek Chickles Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 28 ---------------------- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 27 --------------------- .../net/ethernet/cavium/liquidio/octeon_network.h | 27 +++++++++++++++++++++ 3 files changed, 27 insertions(+), 55 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 05c5162f..089f494 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -525,34 +525,6 @@ static inline void txqs_start(struct net_device *netdev) } /** - * \brief Wake Tx queues - * @param netdev network device - */ -static inline void txqs_wake(struct net_device *netdev) -{ - struct lio *lio = GET_LIO(netdev); - - if (netif_is_multiqueue(netdev)) { - int i; - - for (i = 0; i < netdev->num_tx_queues; i++) { - int qno = lio->linfo.txpciq[i % - lio->oct_dev->num_iqs].s.q_no; - - if (__netif_subqueue_stopped(netdev, i)) { - INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, qno, - tx_restart, 1); - netif_wake_subqueue(netdev, i); - } - } - } else { - INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, lio->txq, - tx_restart, 1); - netif_wake_queue(netdev); - } -} - -/** * \brief Stop Tx queue * @param netdev network device */ diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index 2e31446..60743c3 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -301,33 +301,6 @@ static void txqs_start(struct net_device *netdev) } /** - * \brief Wake Tx queues - * @param netdev network device - */ -static void txqs_wake(struct net_device *netdev) -{ - struct lio *lio = GET_LIO(netdev); - - if (netif_is_multiqueue(netdev)) { - int i; - - for (i = 0; i < netdev->num_tx_queues; i++) { - int qno = lio->linfo.txpciq[i % lio->oct_dev->num_iqs] - .s.q_no; - if (__netif_subqueue_stopped(netdev, i)) { - INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, qno, - tx_restart, 1); - netif_wake_subqueue(netdev, i); - } - } - } else { - INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, lio->txq, - tx_restart, 1); - netif_wake_queue(netdev); - } -} - -/** * \brief Start Tx queue * @param netdev network device */ diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_network.h b/drivers/net/ethernet/cavium/liquidio/octeon_network.h index d8079e35..2d2f49b 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_network.h +++ b/drivers/net/ethernet/cavium/liquidio/octeon_network.h @@ -522,4 +522,31 @@ static inline void txqs_stop(struct net_device *netdev) } } +/** + * \brief Wake Tx queues + * @param netdev network device + */ +static inline void txqs_wake(struct net_device *netdev) +{ + struct lio *lio = GET_LIO(netdev); + + if (netif_is_multiqueue(netdev)) { + int i; + + for (i = 0; i < netdev->num_tx_queues; i++) { + int qno = lio->linfo.txpciq[i % + lio->oct_dev->num_iqs].s.q_no; + + if (__netif_subqueue_stopped(netdev, i)) { + INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, qno, + tx_restart, 1); + netif_wake_subqueue(netdev, i); + } + } + } else { + INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, lio->txq, + tx_restart, 1); + netif_wake_queue(netdev); + } +} #endif From patchwork Sat Mar 24 00:37:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 890346 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=none (p=none dis=none) header.from=cavium.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="I1xSIHbp"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 407M1Y68b8z9s0y for ; Sat, 24 Mar 2018 11:37:21 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752145AbeCXAhT (ORCPT ); Fri, 23 Mar 2018 20:37:19 -0400 Received: from mail-cys01nam02on0070.outbound.protection.outlook.com ([104.47.37.70]:23584 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751814AbeCXAhS (ORCPT ); Fri, 23 Mar 2018 20:37:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=CZllD18y7qb7EK9A4VLD1jXt53cF1RC7wZChe1G/HUQ=; b=I1xSIHbp8RK0vqVZDjCnO8syY3PIskTP9IITYuFYe/AtmJIijyuXQt5CSeb47GMz47XjmP9dxyq0/MT1lKGzH2fiY5XEl9LipqT6atOiSh7of+kAIwwb862O1BjxDFXoAqFNv7YtVyyQBgCbpzSTZx9OjYLVfQ5qtS1IRPkCH6I= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; Received: from localhost (50.233.148.156) by DM6PR07MB4220.namprd07.prod.outlook.com (2603:10b6:5:bd::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.609.10; Sat, 24 Mar 2018 00:37:16 +0000 Date: Fri, 23 Mar 2018 17:37:07 -0700 From: Felix Manlunas To: davem@davemloft.net Cc: netdev@vger.kernel.org, raghu.vatsavayi@cavium.com, derek.chickles@cavium.com, satananda.burla@cavium.com, intiyaz.basha@cavium.com Subject: [PATCH net-next 03/13] liquidio: Moved common function txqs_start to octeon_network.h Message-ID: <20180324003707.GA6498@felix-thinkpad.cavium.com> References: <20180324003618.GA6457@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180324003618.GA6457@felix-thinkpad.cavium.com> User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: CO1PR15CA0111.namprd15.prod.outlook.com (2603:10b6:101:21::31) To DM6PR07MB4220.namprd07.prod.outlook.com (2603:10b6:5:bd::29) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e338692c-b399-4657-c3c5-08d5911f652b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM6PR07MB4220; X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 3:fF7yw4RCly9xlAbqq0+i7qv1B9KBbfPdrq8MK30i44f6tFxXnjYLjfrSXtHlBguqW6JFA9yGOZnleTp+qOilJpi1eAPZy9kPEX95o8j2dGu3SXTt4bVCqmew2LIKffoYXZ6EKbMyASs0fwjBPtwcK7pr2CDsBinUDQ67IqBA7KvKbwSY5nhWqn9PVZbAvg2P3S5BJv+HDBsqhQ1mkxVpx51+FMGBatDozi/90aoejfti0Q8XVO5XsM80vwdjA1Q9; 25:U836ZhuEstGELxxjQg3VLSTaJEuZQlGRWTG3bVZ8WLbrys80jx5QQGnpQvYwgHGOm/7rRcDeaQqsp+3uXnYGGmuz9cbHWkNi87a2BYUzGCEx5D9HTy6/cYlElxa27D93IXvwvWD+zspBYuX/zNAw0bWHpg5pZVZyObjNBAbP54gONZ9clFlXoZCH7qJfe/PSB1JaXbjcBe3jpCSHB46WWwecnUw3ZNavo4SFLddJ8pdcjYp9KpKZm0x1ict+Gn9ci/jUaSe/qwzV+GfTxWu2vQF66RwFrzLCFyrg7ACo/74POTzDAMqxPyeIaBop5tl9K3MB/brNeMujCfWasMzgkg==; 31:mOG4q0RQE1amqE44RQ7h8ptQrVd7KmlGxM6+sUghDQ/UyDqG0f15mUzxlWbhj+qq2IqohNtlBY17g8ZYFuGte2+g18qbntVpkC832jYLU33V7grW0vKpql3V4IAP1NBxbyG7VgGclwKPeW5nWPK5nYQSN4qTKeaTkYKiFGM8YodnbKZY4xfWP9S5hWYncOVvQpXsyFbRtL525gCR2PHs5MAYX30CPZDhz0klslD72L0= X-MS-TrafficTypeDiagnostic: DM6PR07MB4220: X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 20:rwvQVIhOCsj/gV9rJis8BwW3qd8Nprym0VGJrZO+pYtzHw6RAo+JHaBB8o/KPpdqvF7fs8gxGFWViY86APbiEv5c1RbjcGfCFvOu7nxg36an+bcGqjgTISu/nwhpZ18rDlgu5RxrztNISt/woBPb3wux1LBJOqDrHfJBIvn8A3UuVi/ahw0jcqZXxC0WsKQlPeB+oDN28C7oPKpfR9Va39l/iFRH9qJvZfv3DOeNawGs8J2X/Zsh0JGc5pfaoaw2Np1Z3/l1NBVNmMhHaLbjTyxu3AckfIS9k+7wB1utFeOlu0n4FCymZXQJfJAgZ3jBdaG+XW3h4jqmY9PmUOyn/xHJENm4fwgYhWcu/lkB3eZlwAlJsfEMsi5eV6jE/f5Rp3oXQxWflMnzNOulzao0G7xvRJJSKtUux3kr++msoH1UfCgmajAYFrNaJIDWtl9RSbtcCJZGdBixQ0qJ4wczPOIO5lZf/I5m3yDGoq8J8TbidY/QWwGrpLMdIZgqNqgU; 4:9bJUj4eg+W+SYLKnGNeNNPJN+u/3aRlkkcx5ZE7m1kjUcFR+NndzxCmjzBBi/QCGMYb2PXCmAIw1i9jImSZkXNFB9y/pC6+jTYdgGPIvDrk0NeSDdOUxAg6BO8TuLIq5j4ixftZc1s0JHIYuIcg2bUfhVvJ5TDceEhlY9DYGDdqkvuGCC6fr/w7ZL1jmIq6EysZ9gEPZmMaRD+03kVs8QLkkFT3QoaVyQDUytGl1zgp5TENQ0sHrAfchB75t4/JtkdMEoX59TSMvW2GhRV/hag== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(3231221)(944501327)(52105095)(6041310)(20161123564045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:DM6PR07MB4220; BCL:0; PCL:0; RULEID:; SRVR:DM6PR07MB4220; X-Forefront-PRVS: 0621E7E436 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(366004)(396003)(39380400002)(376002)(346002)(39850400004)(199004)(189003)(6496006)(446003)(66066001)(386003)(2906002)(1076002)(478600001)(47776003)(3846002)(52116002)(6116002)(23726003)(72206003)(50466002)(16586007)(6666003)(11346002)(316002)(956004)(97736004)(76176011)(58126008)(86362001)(305945005)(8676002)(16526019)(5660300001)(2361001)(7736002)(8936002)(68736007)(186003)(6916009)(81156014)(2351001)(25786009)(76506005)(81166006)(26005)(107886003)(33656002)(6486002)(105586002)(4326008)(106356001)(53936002)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR07MB4220; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 23:2thFT5JpkQRYpEKNEOgzAaFqVtxcaWv2gmIeH6S1yuJXCLBKEbXbkuLVagyvrCltHFu9+iL0HLbOdZE/tcYQQaRcNb8sodoCTByupZytH5mCfTOJWI2cXpb5CODTHklFSFrkpXnOTghlaeRkzfq6xCZSNkrJS58LLfduJ6O0C9pL9RZPplw/RO8XLDErUq7fYHR73ukUWghTOquusbmZs4u30Rzl01oS5p6K9LKhW23897DWreA2/VIHTVDDVhAUUn9xLv/oFEDBRNmx1O7x664JGLp78G6J1V35phry7n1/RW5O3ljMzmKdJCITvyGKeRUqzX/QkQFzpFgBy08YzEeZIWZAKeSSmt8De0vQwnpLGIcEOsN0HXUq1rLe6RmwJ/LKgysEJqrPabNH24xjkIEJmyjviTRDhykKyUJmct2fFUea7NLgHj/R/wdaRYQd5QUgZmrGBbyWaxCrBd5/ZeZxE89kSgSqTGcptDbdMCy1jCESTb2OQu7GE6GgzIbwE7aSji+B31A1Rl8SMdOyo5vrFgfhMenbz9pUKbig5Vq95uZKG+gN9NQ3TAEe0IylxODzKX6nASRVRKHHmGQD1lZbsxv6HAZOiwMsUoQBle2XX/aQ5vD+QuzPWnycd1ZitFnC2yuOGh9XpvcLWoKOppGGEJebAqXhdC1u/wrc5H7KhvPMkkNQ772Dwsw7LN9+hqsehniOaOOA14NZsuzyAx/PXkOo/a//OU8CxVcMyKHwm8SsifAsmignzFod/OnG7aZl08mJK+DM/sqJg54i/tPU9YxR5BdVFZHdfwn/MTIAfeBe/nKbdWfqA9LEDLfgCZOAF2EUx4IQgLhO2MJPGvI0aAIl2mpgJU2gygODTilKXnBvSlVs7Ss6QC8KEPrhQhN7kaIgRZ3g8CtAeV4NB7BbFYM1Te27Siy4cuUQQHaAkNRmlwUu6wC3ZW19xEkfDnj2BtrPCx0Y7E79jytqcjaSKcNKRvhrz9//FnB4egdcKOrC6fBgYBRZ85/L7CetZna2jB5351vhhvTP6m9ZM+FEMxJHDDAeLRjvyiuYziQZ5usB5DJjawibAmUOqb8WOtLOi9tC2XNSXCSL7om5rSgd2gmcjBJx0A8ObTfmEX8JUAAIpINILp/KzqOMKRYuJiqcdkGXhDVjgICKVozOd4PqxI+g2r8tNRqE7Jh8C+ieRJGk1bY34R0TTDWnMHuwFOMdN+kXQMwJMj3VX/4YCzdqJsg5Z1+UUxv7eXARB10= X-Microsoft-Antispam-Message-Info: qFapxK1Fksp6inrMztcEuqO9dC3BorztDCiDrv5KQbsIvnfm6cWkTC01IGo+zfnvZjSTWTCG66ynkam+u0gAFedLmrV/dxg0zNKaQw2in4fdxYBbsewF44DtyW3e6hDLMBjDz3scPWoVJvRQWIb/Z7Af51lLbHTBKWCGjrxwYqTaIF1vjdifkVBNWiY8RiPv X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 6:NGH36mwzfqzHpruLWs+HNA3x9FllpownlWO31DUvVEGmuyHEdgr41jI3eIiY0SPdFEvRw9TfqKPLooEaukcqU+ThTbIQH3yGJ6SoPgzLuaPo30oOCJ+6PZx+Xm8HVK+jNRIIYJlW3Xd1hK1BuOO+tbjS9HLC/l0ZfJKRqbzjK2XKWucLYKsUf7+Qx8ByLzgHB3HOpwbniFS1glL9rYjcb6bneGBKQsRIQboUxge1ssXU307JW0W12yiUTwPA01Pfsnq7AAHhuv6Qn8+1gNiT00eqOCRwxp15kvWBVLWuuXBHqNHpFYbi9j0NeR0uFBTMX/xWLiTO7zwFV27FRMnT51F35MuZMtSMGzRttzP3BLNTGNJ4dgObUckYEnixffJ3EM/28V5o3Yfu+bxarELeuCkihVL+hBVXdxIusjzLKxPvQlKeOjUd8Yu03exEyuNF7iURSUfUfu6neTLEPGbgGA==; 5:1PX0VLGDyFakOcs6ltKNIYjjQPamg70mVW+GnzL2PdJLU5NPQ7ijg71gGVtpGzF72O/FFHntdwKnlHH5d4zY2cFvlg5Lr3ODKrh6iQBG/s18bJouBttBQak1qNsxi6AwNcf0S5WK/fmn6OhK1Ch5aT2mgycPSoppGNKABOb3Zwo=; 24:fnjZrmpzvTifCW0Ave2ehfovJxDdkw76zQzdzyGRpCAFr57ZF4c8jmyxyKpDA+Uo5eQ1EvfFdpZqMF28aHivkkHrsZkC2jJfkh+RCZmv/VA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 7:HoMu+Zwza6ZjXPDUVHM8NA7+puLu6hq8rnOuwcFb76ihYPJV5WxIy+nOBXhEMMg67cYu3fCHkTb4t+D6MmuQHNEL9b8u76LHfbOwyHQv4mqkyICOeBWLzdnpZ7lcXG5GsN3z4ARzTk4ioDcF3nm5QXDC4dwt/J/M4i/4leNua36G3pbBjFZz0llsje5kJ/0EHf4/4lrtZPAa+++nY1/J3v9rOJ6g0mZLMia33sFRq99sQfcQwxhSCgQJF4fr9vC1 X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2018 00:37:16.8923 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e338692c-b399-4657-c3c5-08d5911f652b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR07MB4220 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Intiyaz Basha Moving common function txqs_start to octeon_network.h Signed-off-by: Intiyaz Basha Acked-by: Derek Chickles Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 16 ---------------- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 16 ---------------- drivers/net/ethernet/cavium/liquidio/octeon_network.h | 17 +++++++++++++++++ 3 files changed, 17 insertions(+), 32 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 089f494..8e280c5 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -509,22 +509,6 @@ static void liquidio_deinit_pci(void) } /** - * \brief Start Tx queues - * @param netdev network device - */ -static inline void txqs_start(struct net_device *netdev) -{ - if (netif_is_multiqueue(netdev)) { - int i; - - for (i = 0; i < netdev->num_tx_queues; i++) - netif_start_subqueue(netdev, i); - } else { - netif_start_queue(netdev); - } -} - -/** * \brief Stop Tx queue * @param netdev network device */ diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index 60743c3..82d70e4 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -285,22 +285,6 @@ static pci_ers_result_t liquidio_pcie_error_detected(struct pci_dev *pdev, }; /** - * \brief Start Tx queues - * @param netdev network device - */ -static void txqs_start(struct net_device *netdev) -{ - if (netif_is_multiqueue(netdev)) { - int i; - - for (i = 0; i < netdev->num_tx_queues; i++) - netif_start_subqueue(netdev, i); - } else { - netif_start_queue(netdev); - } -} - -/** * \brief Start Tx queue * @param netdev network device */ diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_network.h b/drivers/net/ethernet/cavium/liquidio/octeon_network.h index 2d2f49b..0a14d77 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_network.h +++ b/drivers/net/ethernet/cavium/liquidio/octeon_network.h @@ -549,4 +549,21 @@ static inline void txqs_wake(struct net_device *netdev) netif_wake_queue(netdev); } } + +/** + * \brief Start Tx queues + * @param netdev network device + */ +static inline void txqs_start(struct net_device *netdev) +{ + if (netif_is_multiqueue(netdev)) { + int i; + + for (i = 0; i < netdev->num_tx_queues; i++) + netif_start_subqueue(netdev, i); + } else { + netif_start_queue(netdev); + } +} + #endif From patchwork Sat Mar 24 00:37:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 890347 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=none (p=none dis=none) header.from=cavium.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="T56Nsyh6"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 407M1g3dHDz9s0y for ; Sat, 24 Mar 2018 11:37:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752163AbeCXAhZ (ORCPT ); Fri, 23 Mar 2018 20:37:25 -0400 Received: from mail-bn3nam01on0075.outbound.protection.outlook.com ([104.47.33.75]:35390 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751814AbeCXAhY (ORCPT ); Fri, 23 Mar 2018 20:37:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=JlrlSIlEKxsGqSTXK5zK4Yv2Z5rIgTCgCC2vQpLNviA=; b=T56Nsyh6aMrRdZyaa6Waa4xMHioahnjT/zYX0jgV+cY8Q1gD4jAiXO8IALD5+sDXEBjQN+Sog6Z+iYZ9jPUvDe6YMvjVsfENOoWr9uT6WXKbs2bhlaP36p1dcQyiHRi6V4f8+uc6JQjMg6Af17IRP2D7iDatT3hAnKpPDCwsc2Q= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; Received: from localhost (50.233.148.156) by DM6PR07MB4217.namprd07.prod.outlook.com (2603:10b6:5:bd::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.609.10; Sat, 24 Mar 2018 00:37:20 +0000 Date: Fri, 23 Mar 2018 17:37:17 -0700 From: Felix Manlunas To: davem@davemloft.net Cc: netdev@vger.kernel.org, raghu.vatsavayi@cavium.com, derek.chickles@cavium.com, satananda.burla@cavium.com, intiyaz.basha@cavium.com Subject: [PATCH net-next 04/13] liquidio: Moved common function skb_iq to to octeon_network.h Message-ID: <20180324003717.GA6509@felix-thinkpad.cavium.com> References: <20180324003618.GA6457@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180324003618.GA6457@felix-thinkpad.cavium.com> User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: CO2PR04CA0122.namprd04.prod.outlook.com (2603:10b6:104:7::24) To DM6PR07MB4217.namprd07.prod.outlook.com (2603:10b6:5:bd::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1c9f6954-4170-4c44-4631-08d5911f6713 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM6PR07MB4217; X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4217; 3:H5UhkTGAkNpVEZDoldsEmpNTd5a6G8xKLTxvlPwVeR9sxwIR1azXCufkDS/fuPd89/rhUNP8CksKQheiGbnqMrf0UlNiYrkvvorj/FCH9hOA8JmMzmjxYlFxMrQBbik5e1GDPrQZLtR6HF3JJO7hLsO1msUSRFox1P39llFhUV0wFt+GnaqqIHDCiKG1K7qzbx4+IrJDfFFa37iQM7e9ZACIEdrehLqqJtQTxpDIzOIwCpFxnLWO7AXvzQ96iZVj; 25:9BgkWuc/hyz+ZfqSIQf3a0wYyAqL9Gl/Rs4cKZM3546nWTHUoqLd+drKqM/3h6rkrWDTEn0zojM0LMJ894vZwZmH7W63J86DyNevQ3haMA59i/JFqcUNlFWnVGOf0KAAv5LUSOnZ0OLLr9+ilMJibUKuS2+/DQ5kBcUqHizBIfS5npyKpfhAjkFk2dukxec5/xMtvnXW/tl5m0hyd43RazGDy7jJDfg0RgHiPegTDBnRnzwXpwFwQy9xRcdg7PBne6yRvGNrAS/WXxAxismWtuv2p7lFo0H+4McaMUkiSInd6Mvs9+RYauyp3XkDmHWW1v08rGYlD1guR5oHHoTwzg==; 31:o9Um8GZHe4aSCXLIcCLq4yYZzHHZ/A+F5a+ix8eL228BFiQnERESnzJmGnFjNph0BA1OsbOoN3ESbMMoGQb3hYDxMHQNnQUwQ7kU4JPg9iuhYoWAOwXJkjYUE/VGBelAPQW2+TVJQsEdewPk+CZpnt2SN+P0ILTz7gaXcfaBWgMak806I9W71KS4dq7KFL23Lp+2o8A+S6LBwr1iQv58hI2W7OnS+83S+bAzbnAKMvg= X-MS-TrafficTypeDiagnostic: DM6PR07MB4217: X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4217; 20:M/WW/yxGvzQQN+sPqJS22itODN6bpAvVKbqL52ee4gsxZu78lkfSowedtMVUYymDatLTAROheqPYc8D4FuwfxohBuPkBNHMHGDznSv8czn0wKA/jGQCG/kVHeAkSgTUN8mEQbFRxjkAR5DUyvJcNKUJmh6dkPZ4v7Yb68hKpkO4r21DDI/M8TUQu8QBv6TuGl3efC/E3OyUN1HsW1jyA3jcrHyXyj7qBpX5mEdy5sfybLJ4tjFHYLSaAazxmuRNq+7HEtYZP8DpcxdM4FLwolRYG0mifISfTgV1PoAYoZZlj3aiF+nXTnV9ntDMA4s9dhq8Z0ttC5UWETGo14ORS2aBAUgdl4HNhP3T2O3oyLAfTuLvqeMnG9tbgR6Yz+FWUnJzAnWZHwb+dP+kpZom0NKHxuBoBKauC0iHaijWdmRGIJ2xrwwmqD8x51zrv7eY+guJZIJ3lbiHgXT9jbcb/EjmXW+XS+vxIbnhVmiEl2C0Tln3cKobYfD9ss0kmcjzw; 4:bPIay6w2Gwd2AZF3BjkeboIs3ORoRZgm4UesWuy29Vt9XlTBNO8Q70gqCspV2+a7AU7UdGeGwQfg4chYNzSfIrw1y/IZESdvTB8VNqBZAI7JETPyAnx7kXk6Ey3+6j2f00Rt9B4X8ZQXZiJs5TtN+p0vuhIiIOkNpgjt2jbkAFUXyhcAxI2rQLwPSWk3HNWjLLyaUDQiUc1q/SPRX3WaSnQZvM7tg9/IbP7oxtLbI3iHF6tXctO4BF4Cb7UuZ1ugy+IEOAVDZgBhgX6sOV58Bw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501327)(52105095)(93006095)(93001095)(10201501046)(3002001)(6041310)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:DM6PR07MB4217; BCL:0; PCL:0; RULEID:; SRVR:DM6PR07MB4217; X-Forefront-PRVS: 0621E7E436 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(39850400004)(366004)(346002)(376002)(396003)(39380400002)(189003)(199004)(81156014)(81166006)(25786009)(106356001)(6916009)(2361001)(6666003)(386003)(2351001)(33656002)(76506005)(105586002)(7736002)(5660300001)(956004)(8676002)(2906002)(305945005)(186003)(4326008)(52116002)(53936002)(6496006)(446003)(11346002)(16526019)(107886003)(68736007)(86362001)(478600001)(316002)(26005)(72206003)(47776003)(50466002)(3846002)(1076002)(6486002)(76176011)(6116002)(23726003)(16586007)(8936002)(66066001)(58126008)(97736004)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR07MB4217; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4217; 23:SJ7znKEh9k3fsyTr8cJ2g7uMo43+dhVmUjeYCjSC+i9/MmBqnep625cdTM2XEdi/3pDTGc0HB0cu95LXQagXkDJCUMIl03pQTHnJnXfZ5/dhu41vGFqeLDRz6DLQbG2jTLR70w2fQMZdPh/CKY/U+932xMcPGFY9+Hc544j38Cp/KBaPV4zE+zkYZy7btL0gUj3Ygq2N8xdNpzb7JLa4pZsOONfoedQlB+VZxdLyXBItDoIZgiNP2Rn66P81+yajqRZeKwqL+JwEXTYXBmk4iNg5HzzQ1ptRgY9n9xAqqUHHIrB6heOZSwEniZEIHyA1AZvSjwubvpwyijxkzJdWrEzfNO43SbN+7aG2j3heKW2knBTTNRa2fMrihIzA2gWXH2WElWsGn71LlsIEC18/DxuDM9EDmgmP1GdVs3UonkUKiABdTRx6Jaw99FPwge5KqNCGzavGnZvDTs7f63ED/ZiM/w2mcwXqs+ADySruEIKTjpOM72ssZ5Ys0rK6tcS1ed0Fs9z/muWnjoJYsf6WQZ8FY4I2Zdw27d31rROfhDZxHc+Q+jG2tOuuBbQnIKfpI+Ibg85UNpfEaSma6QQdnRcS9AB7yFlZziY7W+n+yhHdd5u46uNyBTSeKtZ/54xGob8UM/ZrP1rEu78DLKt59a4p8tumWp4GfBeba3VJs1ODRKzLBOfq/LWaX2dVAylBpy4N6hQFegrRoSQ+I5r1NCKJFQqzvtPDBaR4zKLsU7BK56PoPunFzB7CHkGf8DmFSGuVxH91TTKWx0E0FcP4X/hAprXuZ0vA3u+XhqJGKxTjvQu1rVdy2CCIpW9Ihpn1USHsTnlEzLD+0QS11cE9bslposv0RRIYUf4nYD4/dMEYtiwgFWG9fphqHM6aG5WKjsLXto0wTEghtLpxvhlmfDN/31RHXmK3LaPYRcmoA3Tv1gkYOs2JcrJArCU2mcTs0iYhdkvs1jWHYdbUAd33VF572PE2JSiomSr5YKAea5P/lN2BC6yNyaU6dxWflhPnmIalWWo4fTgfLTjnJfqHgOpz1pbeE4vRS4R154wi9VxlNwJnT0BiPzBFQ7Qk+1qP9Qx/4IXvAES8Z7eguQZ7eJ1jU6wi4EvEVAoqDftZOWtMPfC9eNOxFKLO7/Z96Q3mwaJh7wkePDxFHwXHgJJaXJN7EulD/Ie6SQ/ZijizycCtw2QJDkQZSnhG/UB1V2PiBpuhi7aeJaRQoHM8AyIVzcHFf4T/SfTqxOTcVkGr5WI= X-Microsoft-Antispam-Message-Info: duO3m8BNFouXO+pg3ah5n4W7RYgQmwsSAyhOZQGCS3D+JgcQ01AzeF4ML42et0T6R7FD7yAaIxzAY/9RYV2DNZzJx0QwLsshcW6yzqxnb1yFOmIBK4WnkPQGBCm74CRRQwa8BJn0tUqOzqSNR/DQd4BGbXDoeGuR7czVWQ4ZR6L7eKehbLRkTHVgEQOa89f1 X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4217; 6:6FV4EpggCMH9aM3Ke5hoszfTJu8U345eyM6GlLzic0FisRPsoeW42S228Bzx7ze0WLmXCr9clhxmS/73s151xuYk8OOjACB9kwd0DLOIOveCz8L5oLBBvX3nIDKR35FLbFghBAg4vCQ5IGK7bi6vtDI3OKc50h51sT+ZQTq7lq+K0GypEAH1/fuCPJMEn4R5YkdaYAkoXICfSGhU+OciBxARGZONGDCZnyHm+O7VyiSj6fMemQ1mOAIuE/yPdLmLJERvEBsFafFz+5cQuX3/8Jmo0Fa1mktE8mI7Xt9TAVfz9cNMUs83Rdoar4ZTqVzYgWHbPXLejrhgIDwShVctHfohmjmKo4VQs6w2Pw6G16um1SJ/59ECl3D3Sd4q5GHdaq7Ei7F9mq1B1uIN4pZsZODmo10FcfYRKIMeS40BmruW/ogev/i1KIyMH84j24L3YMCQwvIlIm85XGn4VVlXmw==; 5:+RY6KFQyjclcjOR/NZK2KCLRsk6JkKvrXjW1lnIS9JwSJNtkDJ42Xq5gGZ8SdDaWL9/41HWUYo0BpY+/jGQd1ZLvwUXdN74Gws3Ij1jdz6gjtiWcVyZfjn38q87jfv5ukH0lLp50qU1ZnQZTnJx+LTqRJBk95SVKwplVjcJys5s=; 24:dPvZ6Y2wfjCp/FmuWk/zUokwfmBbHnPVuQkJKfqQi/grkNRBxZ2c6uWnSt0XZxtNSNuEjq2IrgLOyu3khviivvEkqM2zI/IjMucJrRsjFm4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4217; 7:Hc7DWRe6/KCSUEgzKX9qtdLwsJENRcz4iLnqYAa0AyK0NXne6o7CYIrQik6NXw/8JdeXUdwZfMcDS54gxobATEI0nuvpH0C+8Cwqx63OYQSFr1uyCWXkFRYtAJYBnL94e2NzCD7oed4gNW5fMXev3wp/EkHwTL8WSvpRLDzMQoRVfOBW3mEWDKlSN/15pee5VLrtERZgj9jyCxyfAD5DxHfncMUkUOp0s9QOaalFY+fSfAcvmo53cRA/rcWj3J0O X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2018 00:37:20.0717 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1c9f6954-4170-4c44-4631-08d5911f6713 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR07MB4217 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Intiyaz Basha Moving common function skb_iq to to octeon_network.h Signed-off-by: Intiyaz Basha Acked-by: Derek Chickles Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 10 ---------- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 10 ---------- drivers/net/ethernet/cavium/liquidio/octeon_network.h | 10 ++++++++++ 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 8e280c5..ec7c403 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -1687,16 +1687,6 @@ static int octeon_pci_os_setup(struct octeon_device *oct) return 0; } -static inline int skb_iq(struct lio *lio, struct sk_buff *skb) -{ - int q = 0; - - if (netif_is_multiqueue(lio->netdev)) - q = skb->queue_mapping % lio->linfo.num_txpciq; - - return q; -} - /** * \brief Check Tx queue state for a given network buffer * @param lio per-network private data diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index 82d70e4..5f0114d 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -993,16 +993,6 @@ static int octeon_pci_os_setup(struct octeon_device *oct) return 0; } -static int skb_iq(struct lio *lio, struct sk_buff *skb) -{ - int q = 0; - - if (netif_is_multiqueue(lio->netdev)) - q = skb->queue_mapping % lio->linfo.num_txpciq; - - return q; -} - /** * \brief Check Tx queue state for a given network buffer * @param lio per-network private data diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_network.h b/drivers/net/ethernet/cavium/liquidio/octeon_network.h index 0a14d77..cd334a7 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_network.h +++ b/drivers/net/ethernet/cavium/liquidio/octeon_network.h @@ -566,4 +566,14 @@ static inline void txqs_start(struct net_device *netdev) } } +static inline int skb_iq(struct lio *lio, struct sk_buff *skb) +{ + int q = 0; + + if (netif_is_multiqueue(lio->netdev)) + q = skb->queue_mapping % lio->linfo.num_txpciq; + + return q; +} + #endif From patchwork Sat Mar 24 00:37:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 890348 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=none (p=none dis=none) header.from=cavium.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="SJL0wmjS"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 407M1m1znNz9s0y for ; Sat, 24 Mar 2018 11:37:32 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752186AbeCXAh3 (ORCPT ); Fri, 23 Mar 2018 20:37:29 -0400 Received: from mail-bn3nam01on0085.outbound.protection.outlook.com ([104.47.33.85]:55904 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751814AbeCXAh0 (ORCPT ); Fri, 23 Mar 2018 20:37:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=VR/5mFDYs8Hs2OBwhyO5R7ebtYjysonKo6UVZaYFe1Y=; b=SJL0wmjS2b8yCrs7kXW5h2wMQuoMJp9DeAxrC2nngVMOXl1EtkS+TKvGI+V8GujltEMid23nomSnmpHVitfttIVFSIV379RARnaVUJNNiuj4oKSySWoodno7sxxtm6tT6cPxEVlFbZPB903D5sAZz21fThBq7jtoo2ObIx0bChA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; Received: from localhost (50.233.148.156) by DM6PR07MB4217.namprd07.prod.outlook.com (2603:10b6:5:bd::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.609.10; Sat, 24 Mar 2018 00:37:24 +0000 Date: Fri, 23 Mar 2018 17:37:20 -0700 From: Felix Manlunas To: davem@davemloft.net Cc: netdev@vger.kernel.org, raghu.vatsavayi@cavium.com, derek.chickles@cavium.com, satananda.burla@cavium.com, intiyaz.basha@cavium.com Subject: [PATCH net-next 05/13] liquidio: Removed one line function stop_txq Message-ID: <20180324003720.GA6520@felix-thinkpad.cavium.com> References: <20180324003618.GA6457@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180324003618.GA6457@felix-thinkpad.cavium.com> User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: CO1PR15CA0097.namprd15.prod.outlook.com (2603:10b6:101:21::17) To DM6PR07MB4217.namprd07.prod.outlook.com (2603:10b6:5:bd::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 18c79a93-d077-45cd-397a-08d5911f69ef X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM6PR07MB4217; X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4217; 3:CefFa/1QHcHZy4BciY1DGSXzq1R53yLTUO7lXu+sZKKCNRKp9/q11t0JTkzU4Qu38AwDFqWzFvdxY7LiPaErtRmX1NWAC4jIKWU8MpMMOzyOWcTGaGHJdSYURCeD4iKsWvhXBFV8hRr6wAKyllyuTS5mVMmtWHzdZRnRnQ2/lsv+S8EztBeVUCwdIoQBG6XupjGEoXrW090mX/4FTznhSjHW5k4yq0EsVYbu6MtZz8/di5by7mmhYvoqIYR1j/cA; 25:vaxWvp9lRgkqc1rT8XMTYdOjnZiXK5m9voD97D7ucuX7d9aX2ymps8g+sBjyAp1+NxFW55P3aAX2jycXubL6F+D5TaZnF2e1K+2JSrYf69kC/Z4c7zXuScFcGOw3OXZMi8popAvJ9iiH7zSmtQ19liRYaISyBM14TFS+oq8ypr7ELmJl9KH36Mnb2APLSj36VQ4e6hEFEWFEjEzdHhbuySGwvL6/T2AcKkTTMMB0TkOxtCzDPzxRsCebD3uCfFzxylqWAujn9EtazjF7Vyl249k6+7vDitDi58QLQUzF+yYaNo6OzufkJNVN4extPXpc6Bh4T9sdaKJ6GNSNfCf12A==; 31:VX/PHdFQVjW/3bu7uO3EHGpmRAiq83zMFAzgz74Hyf+X55O7l69xSWaTVVuand0fZ4ZC33G78MKxNF/KnM05/qC9BEbOa3QhskKuwASm6ELISSe4cfe6um9fa5rPMUmXUNhrUc8vnAVA87u3sXOjWP5a1LRrlZIx3eVv5xOdvGDix8UWWSmpQU3cI2vixlvnR0M/3sL+58D4DTfVynFv5qOClZeMFH9xfDKtNpCNLC0= X-MS-TrafficTypeDiagnostic: DM6PR07MB4217: X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4217; 20:EHzR7/TOmGrr8p4w0rjFTOVua8+7ZToVoU+rFAHJuCZgW1vbKjD8gEoZtWfffUrEI4pVOGqmYUQO2JFsaSdNIr1gu08It4KZ7MUQTnj3/SQxEEF6VGunY7gm3yuubYb0Bfe0OAEDrXpzhETrHOT/ZiVC13yqeRhjtBNWba/ec9qSEjsHNMzAK8gzve9ZHtg/Ewl6Dx1mypfE0qqEiCfm+CE2BWobORG8QMlemUrSfIhk2Ozwzhkvp5XtpY1LboIDdngWgKS1VOfHJYgy7XtkattQK8teyFFEaC0aOu86HHDFEMq5UDEgFOL6RplS1FtRS75ccbfMnjUlWbIl8EfqbaAMXyNRtUv9pcZgXyxs2GBNtVQlgBB0kFkqXFRd6S3cZp1yZVwODAbf8NoyStSFfNPoueBWSKxcy1sDJPqkZ/S6Jsis9ixJNKogJ0CtQxDr6Ry+HQGPqnzcV1EvVSwL7RYzgzn5M+ik/HNOdm+BrZc2aB6QhtpoBTArgql1A3B/; 4:OQRxz9YXgkfOLsNWTySRpTzudPb9hATBh6dJksrdHwdNhyWI5u9GHURmOW+sLlk+9YkU5ikjS4Svsnd1842e64Q/UtROLBS19YiZEO+ZeFXWRLo/hHPD/9GNZyDl+M3K0EO/yyiZMvRfc9FEJMskwFsJuI0aR0Gxwk58IWy8VpNYyKsqOAo0E3v3fhDuRa8pHhjOVkvmm+qBagfI012ZVUtkNVom8d+tCA3TLq1V1nNnufJ5AQUoYFZtLZIyf/+ZR6HrlPdYDLgnSpWTOQL0AA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501327)(52105095)(93006095)(93001095)(10201501046)(3002001)(6041310)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:DM6PR07MB4217; BCL:0; PCL:0; RULEID:; SRVR:DM6PR07MB4217; X-Forefront-PRVS: 0621E7E436 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(39850400004)(366004)(346002)(376002)(396003)(39380400002)(189003)(199004)(81156014)(81166006)(25786009)(106356001)(6916009)(2361001)(6666003)(386003)(2351001)(33656002)(76506005)(105586002)(7736002)(5660300001)(956004)(8676002)(2906002)(305945005)(186003)(4326008)(52116002)(53936002)(6496006)(446003)(11346002)(16526019)(107886003)(68736007)(86362001)(478600001)(316002)(26005)(72206003)(47776003)(59450400001)(50466002)(3846002)(1076002)(6486002)(76176011)(6116002)(23726003)(16586007)(8936002)(66066001)(58126008)(97736004)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR07MB4217; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4217; 23:H7NjfwRelG+EFcYdfbe8GA/g0uJnpe3pG+C3cdAqnaTil8tZDT/gq6AG69k7DWxMIUqeGDBXR3/y0QNZ0H3k/OLKKu4f0GtPq2wVdUQAs3YtLCrdUuG6roo4RIcjO319xMLSWxlpCWs1SCQD9XhjmSidQIdftLOfGLqSh3JCA6L2cZR5WdasbyDiCYyLRLxTCpHSp908xrH6U6hXu77vsq01a0ThfjdW/OdWlwW7ZUF2a1nm8dPg2uuPN+B0z+e328jIjL4RPV8hSVK2dpRK7zAj9Gv4C4hRWvOs/PmG21XY/ZO4987RAI8bBikgJeNVW9wRo2MEE8z08FfkLOFSQa2nSV/ldAaGc2QVQ5yLUED1g/hpqCEORqajgx7J19otCvJSMObOEMRaiaPJ4Wj38tZi0xXt+3PtvhXDfxt+ZufMPEaCAHLxH8IxI/LjTOAB/TquXkOduTKdzbn1BccPnp//yq6V8/5zgBROHihtDYapOKylk1maaja7NPFBAC5cH04usRhmoF4I2L3wEmFc5wGOF49P93rUMvhgw3W+ClGjK6zpaprZ98ALkYqZitbbI7O3fTvwymQ3YbHB/L0+0lZaThWw2qilQWVkeiP+CBZz7RfLTqwWMj6ORU2/oTRe3uiKtFl+ebQB5JZSYfNaueytO5gJtv1K2UoqYzHDvNZJSw7Qls0W9AcmngDV7s+qZ4LVTt8gvhXrwsuSt1pnD+Qdc4KqlBnF0Bl4iTTol36geP8D97um15zHO2NYrz2dtkld/BmB/IoMhEkmNr1MtN4c0Ok609Nvwjgn8OulLk9jJzVOS7Df/F+rswdlaG+NScuScqT4atk7Zv5AS/G3KnGIx/Uml3m0YbqOrNwvEG8vWmY9OeDeWfnayQKPBlaRXhMj/ZvnOpj9cb0yqXFGXRuJoNgrgXiZghg9vf1UDJf6/g1oRE0Tl+EtR5WdRd5x/EaarlLp6d6Dx6En9RAQfOsCpWcWmTMz5zVm2cCe/H0REFhEpVLi6wTp/EfYi1RB66xWdM2ZOo0/3N6mYx0ehA/4C3lAdSt4p0MPLBHeE16nHEbcU9/k8kDrnwUscHyRCysvo2CT61yF3zQ54XjWHDtDKBrbbQY2JZ0t8bVs/BztQ2uRcDx/qMCvYPik2xVSgm5ZWGZDPDD1QUaTKToN644NraSu1AGWQxvoj7mcVHpoHFigiKNk2RpkBA3J3tEfjioHUtpy6ThMwsx/sRdKUSXXZch1R4t2E+qkK9erzqX4bKFYmcXzuiNPY1j47rSb X-Microsoft-Antispam-Message-Info: ZbEtPYiJneCZ4huLdShlSnOMFWZjrRSc1Y1qXhR25rToQ3NRh+TUTGKV9FAW1pJ6IVMoh89cRbqdeK1+sJeeQTbdaf50ghdo2rwzYgzT77WU8TzadpMLqtgyCxz6HFAZb2sx7n1tNd3L4hMl2Aeu51e/EbDsC93e1VaXuTpCz4Sn4M/2+R7Or23zq3yBLcxM X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4217; 6:M85Cqi5KomJmbMepG5kpm9Mf7OPTgN0B/Q7Wt4R1O2/oVPT0LyfyUberiK9Ec6oIDBuz5UFwiih86KF++y4tawFYukDpkHsJw8qByKNFy/BiwFPnWS0rDCw+C+dRcNgWU9jmK3gfHMHII/voWRUU2Dqxzug9X9Ztk0Qrk97BzzSVWbSqtMtWl1imlU4EYTOw09B9RBB3uxJY+kEU+fbC6EDFXZVq4vD0D5fxi0NXmKF+6+t8eMQQgvpVbWWgyVZk1npKDQILrrjlgc8+68Mn0R73aYisv8JI53Am+Oq8O3K43fPa2AIWobgi8cqOGpWn1WileUpbOs6cbCLN4k3R/ChlFi5snKKwF7eM3bSj1Kdmtuj3iLagFl5BPFjrF7kgHq6JeafZuEiHATMBa0Cx6cWqaPNUtmwR/F4aGfnCj+yxi+xpQZ7/h66SiAwNcLY9I7HdM5eJT4a2XAnkdQGNuA==; 5:gkmRz6b+i209cNTFYL9VW102XQYUFofa3jarpqwkfGmT6quYu8duBxZV0m7x6nfZqiS9gKGVbxaEw51Hi6MFtKO64CyUdAXj0mSt4S3zQdXiI7k0LCHAbaZcsH3qRl8Yl7iWPNNIgnKPquoTFZf999nXYowxTG6eN/uXlO+iVI0=; 24:S7cUtyZA47Sz5qh3b1932ajlZR3HrqZRIj2n5r3o7QGFqPp6k8rXNfWowrSFGSgUfphwHv3W3t5NPbTmlisldSMPTDw77m2brf2lofZtHxo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4217; 7:7llCWnlRQ0lrXvqo0qxjtZEz4QFnU8A9Rq4vgWrhqW51JqBh+251U84wr6TcBBU7GNQ96ChZFQ1kct8idaQIvvBSurMYSSfSGhS+SK/ij6L/smfmJzZKRG1wSsX+bpsSLQ4TpCVciFDz3Q/+HutqJb6c0hblgNmjGcBbVdAd/Z2RtwJPKdYL6vWygGx4OktKn6C5JhNvRqgRO9b0RzIOpQayB9jCt8PMnqSzB2b05AYJrGt2qppcoU+ULmZ2SYOP X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2018 00:37:24.8217 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 18c79a93-d077-45cd-397a-08d5911f69ef X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR07MB4217 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Intiyaz Basha Removing one line function stop_txq Signed-off-by: Intiyaz Basha Acked-by: Derek Chickles Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index ec7c403..6b44d44 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -509,15 +509,6 @@ static void liquidio_deinit_pci(void) } /** - * \brief Stop Tx queue - * @param netdev network device - */ -static void stop_txq(struct net_device *netdev) -{ - txqs_stop(netdev); -} - -/** * \brief Start Tx queue * @param netdev network device */ @@ -839,7 +830,7 @@ static inline void update_link_status(struct net_device *netdev, } else { dev_dbg(&oct->pci_dev->dev, "%s: link_off", __func__); netif_carrier_off(netdev); - stop_txq(netdev); + txqs_stop(netdev); } if (lio->linfo.link.s.mtu != current_max_mtu) { netif_info(lio, probe, lio->netdev, "Max MTU changed from %d to %d\n", From patchwork Sat Mar 24 00:37:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 890349 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=none (p=none dis=none) header.from=cavium.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="ZE2qjMN8"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 407M1s2GyBz9s0y for ; Sat, 24 Mar 2018 11:37:37 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752213AbeCXAhf (ORCPT ); Fri, 23 Mar 2018 20:37:35 -0400 Received: from mail-dm3nam03on0078.outbound.protection.outlook.com ([104.47.41.78]:41472 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752165AbeCXAh2 (ORCPT ); Fri, 23 Mar 2018 20:37:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=rXvfe3rLK7u6iveLT3fLBMmfNqxUU8qCdSXSqkeab18=; b=ZE2qjMN8B2dNZEOiDUvxhm13wXl233Sjc/4gZpJykF4l8GMJZ3wi7G+rErPhxsn3ES/e+c3LTXMgl7Xpo0ONVAYlpK8ohZ+GbDT8xWQ8acd7FmuLiC+viFgZa0kBFiie4JsWGI9wmkekkD2NGwkAe8mieKlD7lPmIeatJrYc0V8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; Received: from localhost (50.233.148.156) by DM6PR07MB4220.namprd07.prod.outlook.com (2603:10b6:5:bd::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.609.10; Sat, 24 Mar 2018 00:37:27 +0000 Date: Fri, 23 Mar 2018 17:37:25 -0700 From: Felix Manlunas To: davem@davemloft.net Cc: netdev@vger.kernel.org, raghu.vatsavayi@cavium.com, derek.chickles@cavium.com, satananda.burla@cavium.com, intiyaz.basha@cavium.com Subject: [PATCH net-next 06/13] liquidio: Removed start_txq function Message-ID: <20180324003725.GA6531@felix-thinkpad.cavium.com> References: <20180324003618.GA6457@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180324003618.GA6457@felix-thinkpad.cavium.com> User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: BYAPR01CA0028.prod.exchangelabs.com (2603:10b6:a02:80::41) To DM6PR07MB4220.namprd07.prod.outlook.com (2603:10b6:5:bd::29) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c9689f67-edde-46ac-1939-08d5911f6b94 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM6PR07MB4220; X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 3:w3WFVRWzuUKVQedKbzaamOAOjarTSH3jgVnuYR+rOFcek2dkD6oub6wYnGytFOwSZLLf6CzVoiZXvi6963+ma8fgsysOT/yyRzOl5vDWn0oslV3codd4h8PNev7cmRXM1osPH+2vqfq4XUDPa0pAsFt8o3ZYqAdM7PtImvZompVPegGdlqyqjZC4YKRG1/9s56QZm5vS+hFfjwfJCjGy08RTvqCKO+rGhtPlKFHJoSASlgA5Xbc7teApWHs7x4Er; 25:e58DesEo26E5JbtzEAItpTxcREc2l9Xtw4Ds76MmScv/8SZmfia5ZUaYwzOcO29aUlJPrxLJ+95d+aXfOb6gKgbmLfPMpMJIq4dL5V1y8FNMWWyEWn4MHLrOjj0Rq4l+VxoilhPO4WK7hxFElqTrDqTHC5tl6tHA1iJxOuALlxU0uF6prgWfxdG0t3kujlQF2BjAArN1W+zfsJRq6vuHrp1uM59bRU/V057ENfvxlwJ0Uw81uFplzJ5/qKKJXt7ThPBlv+y4QE6jF6kY8XOCuK5oDozRJJDV8xF8YVu1k5AItnYBdBE0VUuc/t2dlbAeLndT+xJlCQvs4rV32/F5Hg==; 31:b1V8Iz8Bnp0XZLveKL+icwmlpt2lJB8inyaFSM+czQjffULjYCAnK1YWTAuzja2iUOZa/95RoIlMCwP8Wer19JWbq1ecODA6yFy3RvhZwo3KEMkPxpgqvNopReZKh1zlT/T6mLQX18Wdufk+zvCT5XE32xWH2rcI0vpBOlwf+6tEtqxFF0dZOms4V61xe0eFNhZol0kh9Uxjk4SO7LbftUN+++rG/uMtn3T1vnfnA9c= X-MS-TrafficTypeDiagnostic: DM6PR07MB4220: X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 20:CwGqbXTGTU9ss/r7XnV7xxjSlG3WjN0m94cWyXFguQCAIjRUh1hl5kWZTVrP5JK5Ex6VE1DAyODtF2np+JbQbnCEM90xy5ZPz9AwECA9OAp2FIPm4l8Pc1yxqYr593t4PBw1azDrxZEUtKXrSZzZnENPCt7pdBSsj3jl7rzf27uqS1KK2gLCngNe5cUs1421H0AYuvU8WNawqZqtDaKUe+tSaicRPphZqw1sw6Ayq6aOYX/QX/5rxwuyXFVH3iUK1QBeVf4G4lhYjIWS6V1gaJ1UCDWsIZuYswZmUJEwtuu+3wqYDN6paJ5NxSpkQpMkkPhpGK9n6eeM4vLen31RmRyLRZqXApmlSB/vIK8uPJS1GnLALFe0SeEFlexwSkpGAS6hHVkcRUmw1hUPuEhYsuwyR8BtN/bSSA6gcx+xSXTGZ4Tcep21dxR61+ypL7GJ3PZFYL8FQUppalbUB9AZJPkHwntaUd9D+SzwZ7wo2ttJtlCIBobjFe52vU+bvo/T; 4:IX5QDeBMewOU62eZrCO1jLmhaFjeb3SYNk02dBiFbMWxi+TNHPm7adBvie1UOZrFJxxmxvkMc3rWtPECEpwSFRWYulf4qJ43+Yqk4MohDcQenIChGn+/yiPX4bq5XRAOjd7ZoINwz+ZJ6uXhf8qTKEz1jyapcbQqmGIAj6r11MHCARpMzCnxzhyDSdBd9StL2q6hXt5khbo1ljazVMzxVN4Enue+AyjMymX0viuNkobwxXOU6xpf2k+Wi/pSv2usuFsC4YwEUPtNlHm5zZuU8Q== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(3231221)(944501327)(52105095)(6041310)(20161123564045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:DM6PR07MB4220; BCL:0; PCL:0; RULEID:; SRVR:DM6PR07MB4220; X-Forefront-PRVS: 0621E7E436 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(366004)(396003)(39380400002)(376002)(346002)(39850400004)(199004)(189003)(6496006)(446003)(66066001)(386003)(2906002)(1076002)(478600001)(47776003)(3846002)(52116002)(6116002)(23726003)(72206003)(50466002)(16586007)(11346002)(316002)(956004)(97736004)(76176011)(58126008)(86362001)(305945005)(8676002)(16526019)(5660300001)(2361001)(7736002)(8936002)(68736007)(186003)(6916009)(81156014)(2351001)(25786009)(76506005)(81166006)(26005)(107886003)(33656002)(6486002)(105586002)(4326008)(106356001)(53936002)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR07MB4220; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 23:2pXL4kFtDKQA9aytBG6GE0Yr3Hxu9mMQW3PvZgk8XOI2PXBpLfvz9wFVucTtzQxtGycm6JeZdkOg/XMFa/oXcQm04dKqhPGgBt4E4S9e1vNNWQHnkuyI/s00N9FufwXTdIIRznMZ2dTb64uaLoWglIz6y4blGoa9SBBVGukrEFvs6i/6PC2wSuWTAJ2yMYS2JYd3slRk6dRpshL9BqFIcSJbVQy453p8XQorLQ1AYsmyMtMRQ1i0U23YgGc/hH7jeOEvmFVdbagwfx/6bDz4i1QBUTQwvy6WLrgt7VukIfAlsdrme9OxleEQ7UkbVzHlU19ulNg95czP65SXYyoUNBbArt2qjJ4mnKEv2hCYylrZUBi/Bhh/YC3SHAwFGFhrNdV0m/P7Ii55LjUiggj+YwcfXLBwIQ1K8UWZoRtaYsYq/aApozBs3GiVliKhEuHjY/XcgPvV+uSRPHBNCJPSrGI0rI9+Hu1seInd3Ibz8okvgF3jHbnRsq8w0yPJdvGE0a762PBP93GzR+gAtyDbaLXrD1PeIHuTqbiOQPzd7OtCTf+05s0JJT4KgSBZfhvNsBdl8zmCZzFjKVb4p5Vz8ZPtE5vpsCA0EEUxclAIvDXdnNMJxRfp8g4Gwm+AralybeRa/SpzRtf2nLuM2KTOoexs7fmSityBO6A6tXuMp6Gxp1tnt5WwdFQdi/UeLFpfxC5CVHDJ0DuY0RRrEMgwxcVnqBCuWPRxsM5CPV1cUwVzKGWasIeqR6/luAk1wSLBKqWCirY5z4wm7ZFn+JMFjVpSY4f3/EKr8/bMmp0Ic3BkbGl6eLtXEwx683OEDLsY52qLGhTgXRjrHFK5vOXKIwieqF4LLn1CWgKl9uAZP2KOnGpERaeJ/MoHf14K+4vumxVIMq73yy04OBfFlKIU1zsyEUkQ2BSiM9JDKnSLbyZ3kEvYCyHnYOaO0qTMbt0Ly+tec0h0YPmLbu6MSvhHgOhMO57WWFSyVhfmks0psMBLSCW+dJ5ryD5Rr4FpkQ01Gr37Xq3R7XIG7jzAQzeAiuX6po6lEBn39SxrZELUPG8z7A40c70gM6bUmZR+BrvDV20UUhh6Y+jeKuvtcGB3dyw7dSdLAi4Tq8LEAUaymCPR8CQCPgbWx/nS52zquqzVJCKUiTcV/FRLPG500uUrDoEJgHpPG8pL7ETCa34/HvaZEOtROPG8vtuodnoxgVTTCDmuP9RENdffvl0QHaY4XQ== X-Microsoft-Antispam-Message-Info: IkSAdqW3L57VGEnwyqDrMvb5sNLRL//qnTh81MU7NfvvR//zKPq1vNJnX7sLhFpkmAqnqJ4KGPylTIFWzDytHYqFSnMACApiT83LXpZ4ndyzZ7z2fPXY2vBn0k+VBq1R8HXF0pvNkm7Ha37xFWkKybD1mSGKcNMXtZXMhoiikRFSWrFfhVw0+P6KDkhLN80b X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 6:D8X2BYKvjm+P856Ro9xdsEcoE9Uhp2RlK8vBw48/exAf2rovdv1UJiBn8m//6GvQAgcdCyzImbRTfQOO4dEoO2vKX7e1xLDteH1bcbjk3FlDs3Tl8H9XVqr9zJDaBG78R6b+rTpOMwYz7U6WPYteE2NtKZpd3HSYBCuLeAnfTn7xiR3VdP6jJK/hW82w8mEIub6MZ1fxFKga/uFja7BRQd+wcTvJnMIQSMk+vIb1mzpp5W/g2CN9Na079/CU/wfcedC3xZQQOXRSkaVOEMioL2SQGc0N+/diO2m8ZoJ1dhTxlSj0digOHy6vKeDqVn+tilq2DnAEMvheAq6kAThXfA0w2hr3N3tDE5AWC4jl6x3CivFNNbW8ZlfP+r7Qfw2rYXKOzdaonesZjOMmyKgzQCOlvcRZOz5bQZ84cgcN28oLVOmBmRIy8CII4K7K0rxon9PHWqgc0xl+/hRytBSCEQ==; 5:MJi8gnFFLJrBM1KIsuV6FPenqHhmbq28E3mQ6y4ND/pz2v+JR6WMJaRJZAgf7lsk1PTU7elLTLrDwgaEZBci94H+w+bBdbbJPj6KyiqDK6i8Nf6cnewIPNMr1GTxlNzyjDv3TFuc075v+8PnsSu1pmfb4zXmBoS1HR7hg/hteV8=; 24:lXfnvmW/fK7o74fPCYQ57IuQRw5edZwezn7YaVFhDSz34R92BmdobQnoKduHY1/utGmQznTO/3Epr26EsmlsMiiryzrKXDYp//+Q7izROAg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 7:Wt29BAczP98fdWIVdZAmepb3xdIpVsHMS8+Qb+vagkA9aB6V9r64k3m9WB+oK2WPDsK5jfQl+Hp7SoJVOpnjVr1ZponQEvDWwttOovSoJVAFRX7U3rpqUKy5ezGCJpW8Cft7BGtxpsz09H33CTSNMVOqoBnDLCeRDSPvUxbAYu9lVxczeMzici7kTFF6z2vcHLsNFj8a2CoXIYHJDxDi7fRziOftsZTZOc/QEZBypgRRPFbfOML+FHqnETD8XDNr X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2018 00:37:27.6893 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c9689f67-edde-46ac-1939-08d5911f6b94 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR07MB4220 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Intiyaz Basha Removing start_txq function from VF and PF files Signed-off-by: Intiyaz Basha Acked-by: Derek Chickles Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 16 +--------------- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 16 +--------------- drivers/net/ethernet/cavium/liquidio/octeon_network.h | 16 ++++++++++------ 3 files changed, 12 insertions(+), 36 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 6b44d44..41e992c 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -509,20 +509,6 @@ static void liquidio_deinit_pci(void) } /** - * \brief Start Tx queue - * @param netdev network device - */ -static void start_txq(struct net_device *netdev) -{ - struct lio *lio = GET_LIO(netdev); - - if (lio->linfo.link.s.link_up) { - txqs_start(netdev); - return; - } -} - -/** * \brief Wake a queue * @param netdev network device * @param q which queue to wake @@ -2140,7 +2126,7 @@ static int liquidio_open(struct net_device *netdev) return -1; } - start_txq(netdev); + txqs_start(netdev); /* tell Octeon to start forwarding packets to host */ send_rx_ctrl_cmd(lio, 1); diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index 5f0114d..57b6ee5 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -285,20 +285,6 @@ static pci_ers_result_t liquidio_pcie_error_detected(struct pci_dev *pdev, }; /** - * \brief Start Tx queue - * @param netdev network device - */ -static void start_txq(struct net_device *netdev) -{ - struct lio *lio = GET_LIO(netdev); - - if (lio->linfo.link.s.link_up) { - txqs_start(netdev); - return; - } -} - -/** * \brief Wake a queue * @param netdev network device * @param q which queue to wake @@ -1189,7 +1175,7 @@ static int liquidio_open(struct net_device *netdev) lio->intf_open = 1; netif_info(lio, ifup, lio->netdev, "Interface Open, ready for traffic\n"); - start_txq(netdev); + txqs_start(netdev); /* tell Octeon to start forwarding packets to host */ send_rx_ctrl_cmd(lio, 1); diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_network.h b/drivers/net/ethernet/cavium/liquidio/octeon_network.h index cd334a7..72a581a 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_network.h +++ b/drivers/net/ethernet/cavium/liquidio/octeon_network.h @@ -556,13 +556,17 @@ static inline void txqs_wake(struct net_device *netdev) */ static inline void txqs_start(struct net_device *netdev) { - if (netif_is_multiqueue(netdev)) { - int i; + struct lio *lio = GET_LIO(netdev); - for (i = 0; i < netdev->num_tx_queues; i++) - netif_start_subqueue(netdev, i); - } else { - netif_start_queue(netdev); + if (lio->linfo.link.s.link_up) { + if (netif_is_multiqueue(netdev)) { + int i; + + for (i = 0; i < netdev->num_tx_queues; i++) + netif_start_subqueue(netdev, i); + } else { + netif_start_queue(netdev); + } } } From patchwork Sat Mar 24 00:37:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 890357 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=none (p=none dis=none) header.from=cavium.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="f/5Lp/x6"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 407M2d70tfz9s02 for ; Sat, 24 Mar 2018 11:38:17 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752414AbeCXAiP (ORCPT ); Fri, 23 Mar 2018 20:38:15 -0400 Received: from mail-cys01nam02on0041.outbound.protection.outlook.com ([104.47.37.41]:27824 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751814AbeCXAhc (ORCPT ); Fri, 23 Mar 2018 20:37:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=HbUYrSmOACUOAGnB5EJlpTFQfKxQTtNYmMTnjPW1kg0=; b=f/5Lp/x6//fmaPAqSL489oj0euy8J19zvttL2k0048kmRMvEWvGVmt9wk2SPB7HCtgqCxSDKj8zhhqI6A0ZQKE3VvrtDEmJoHdfG8VVdUv1yKjr+lVl296K0Al1PMdJordWdQGze3Cjb3qooHVjxNZXioHsGLZv+PyceAGdc0Ro= Received: from localhost (50.233.148.156) by SN6PR07MB4223.namprd07.prod.outlook.com (2603:10b6:805:62::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.588.14; Sat, 24 Mar 2018 00:37:29 +0000 Date: Fri, 23 Mar 2018 17:37:28 -0700 From: Felix Manlunas To: davem@davemloft.net Cc: netdev@vger.kernel.org, raghu.vatsavayi@cavium.com, derek.chickles@cavium.com, satananda.burla@cavium.com, intiyaz.basha@cavium.com Subject: [PATCH net-next 07/13] liquidio: Removed netif_is_multiqueue check Message-ID: <20180324003728.GA6542@felix-thinkpad.cavium.com> References: <20180324003618.GA6457@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180324003618.GA6457@felix-thinkpad.cavium.com> User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: BYAPR01CA0021.prod.exchangelabs.com (2603:10b6:a02:80::34) To SN6PR07MB4223.namprd07.prod.outlook.com (2603:10b6:805:62::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7f20bafd-7237-4ea0-86b9-08d5911f6ce8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:SN6PR07MB4223; X-Microsoft-Exchange-Diagnostics: 1; SN6PR07MB4223; 3:ORuK2+0nUqPIOwU+YQJ4vtb0Yyub9sYUT7j1HALSysdHyTfrKdzxtAG0oGSS6ICEv0Qm3lKkCWCPK1jtxx7iOWoNtPhPpfTQGjfv3KpH9fKeRnLneqMf7Xte0Ayq4LxYw/agJF1DB2iHXGPZzPsaWPhT8Dl8Q2fA1+K1OLFTFFFKb9ESKkO6jwfM2jFIGRhsKNDDOXLEuKqcbESw2ij8W3TLR/IHjpSEn0Ds14PSr/HI8/BnqjLrEoArot96686d; 25:WiExhIBjfdERvoQCaJRPXpNjQsmNFgMlkQHjhSPr0Ar5u/a+en/38GarVqEP0qU1zDHF8yZ7BIPsIHl3TGCSsPGKxwKxA/+0IaXGZbZ5wVHXpy6PU1g6yEFqlYcgtB5qeHCHLv2IuTUyAAw3hWqozeBYe9nL1ho+B5bzhuXpbPcfgssRGrt+sM1uiHdkpmYFPg9LZFf1sXDqBwlDxgmkns7OqOPOZ/BjUV9RpHsvzK/D500lSUQBWOuQ/lGntIaLFEFEvYMgWklmxPxQN6uJ3tun2Rq86ZoorZVXP56c9AgOcZ6W5gYVY7OT3IRmSf+QeeqER8g/trCriH4JNP46ig==; 31:DC/784z3Mvm2EdS9Ds/83pziQnm09nwupgkeRFHg9FkdVl/DmyN9TgwE5U5n1GakDtmmG+/VF+iE9l9Q8DitjdBHWyO6P/CYldKnXSuyoaUr8vunKhKEKL2Bej9ddOqIrfLCx0UGOVbdaiFiO/SOUu8ZRgnB1Qwl/yPUTmVXItsqlw2bsNFhQithsYHeS1wS3X5V+I6rFpR1iDF9/cF+pqOg5gDzYWzHjLpWErsKu9Y= X-MS-TrafficTypeDiagnostic: SN6PR07MB4223: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; X-Microsoft-Exchange-Diagnostics: 1; SN6PR07MB4223; 20:mSRPtHYNfsyVKFxHjvPBjLxcWUGTpZBZSxtNFtqs+LTwZaf9eNTXMCvikF1mW9kgKc+S8GOw71plePBitfNDpQR14tU11wPbV6NI0cu/JqTdAdIjawD/AWRHk7Xb9JT0iHp5H6fs1OVVWxE2hyN3aPy1dQpiyFJCd17sR6p50Ju18gVbyPOyvMrEeRPhtTB3+yGzZiLgYICks40bR8AaiTM23ZdJAn5IjGROmf/uwSQDEAjWn2ETTyj7Syakrcm26Wf8b+meKm1GtbR/ccf6rI027wImiK1YLikTnrBkVthliJLN/d0o7lYgmeoA63MbkKK2eo1+KafwS1CrlilEoojS7c273ZEZn2+aLavLmXmkAS63zrxtH+A+88J/kYXI6iaHqS4qGdP5WBrVEcafbzMBlhdUg50D+WwFW7a/e12oLHQ7fKTiG7zUA4diSHBNbpIk58Z5W0TQGPeFJNnmjuSF+8Gvk5fLh4W20syyhZ9rSBHyIrXXrQEaenu7g0f5; 4:I5u14mUNY0zDRcM4uDCEYqHHqoPMp0XPEAQIKYpEL0LDsVDHjSb810z+LZZWSy57pvGHZrxWWM0xGyuvisZG4SzOXj9Gf7XRoT8FPJAL+nDreS1LQOSNvIdcLJ/YKFObeRB8UVI/DGB3zQdsD+/3EkKz1lQIMscZIzLCaUqxBXFz8rFtmPHPJX7jOGVGoIR+zSlj+TB4TKGZGNPBKIfz+gYjdcAFle/rnPgmiiYN9oe0c0DJyRMgTpGrQgT0S79luFbxPCPCAwD94jMCPWvZPA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501327)(52105095)(93006095)(93001095)(10201501046)(3002001)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:SN6PR07MB4223; BCL:0; PCL:0; RULEID:; SRVR:SN6PR07MB4223; X-Forefront-PRVS: 0621E7E436 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(376002)(346002)(396003)(366004)(39850400004)(39380400002)(189003)(199004)(97736004)(6496006)(52116002)(86362001)(66066001)(446003)(6916009)(16526019)(76176011)(58126008)(11346002)(8676002)(8936002)(68736007)(76506005)(386003)(59450400001)(316002)(105586002)(16586007)(81156014)(81166006)(106356001)(1076002)(47776003)(2351001)(2361001)(50466002)(186003)(7736002)(107886003)(305945005)(478600001)(6486002)(72206003)(3846002)(2906002)(6116002)(5660300001)(23726003)(4326008)(53936002)(26005)(25786009)(33656002)(956004)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN6PR07MB4223; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; SN6PR07MB4223; 23:yucB2XKko5+xVcq6MqiO3ARuOqT+n5w9sRiHDYHGOQu9gWV4R2IeIWywKjCIAzARw25yZRkdRdKZLdi0xLi1G2U8WZSGfT3iyxL+5s4vW4/1oeBqStXaUXoBlG0ZHeM3SZ9RSl42+kN+mpr4dYd/WjYq2g2yCYHC+4tw++l+mJLYZo98Oh+rkmlKCm2P5YCZO61hk2QllKda1OrunkQVXcA5Rrho260g9Kb0usXvkvbClzPvGi/JOTWfLu9gQJ8ynP6T+WVX1rhKMDom5kko6ZLMvkv7or190MbE5gcZGpbZ3Og+7tQ3ucSLUCd45pf9g9Y9U6xRBN2suEE3/j8LEWFOOV+fUgIFs6XPwKVYwYgplizQLihRGk5O5JUD6j4kop1vanqp8OmRQbLeFay4TNOfv30mHCSAfmma1k9Y7wnCGXh212qlw2PpLDPxDDZ/zed68URPL49Yxjdvk+xBpGtqu+R9ru7wrozfieofiqDBJBogQIvsIkko3GU63GhSQMQnuWos8tJxE4KSgYtrfcHbv3VfwWtQkRzpaqqu43iQIDbODE6RC7PQy/ak9Is28VE+M0R/tICbffUFE1d+2FhuRRuo+P7KoY7QP3BbaBqcapT3wlWBQqK28AFKOHGHRq4RVQyLq6PZKZSsDW/lT/lLVBycLEKET4yPSxQJGS0XRy0OurFBJBnlhtitaOIb0ap6WnxzxV9tVaRNVRi1Cec+0hGOJCXdnuphxJIWrkuyafIznlmvZgY4Qf9/eTiFAvQCG1B7OqcItGN2fYX3JCQCjIOEH9ncgr2q8knyIY2bGDy+vOgg0cM8XeNSVR/YfXSuDP+WzFyu4ZlmQ4r+magROcIOGDEeMLLTaOPZwGyp7xfUcdey+rm2EjwU7RbAOqZs8Dh/PYs8tF1/zajwXs6u3Szq6RzDPWFYp5WeQQ+asdYkqDjjFH9gR454ntl5++gp6ce4X2VG89z1lmJzKlcJCQU4t53mPGex2ZnhDwoQiwbwTFY01UJJcoyNXR4wBgcM33fPdZ1FNbjqzCLT3z0C0YiSQ9eLWVwNkey5Ywt8iGCEHXB9bx8I5lMsn0f3EYZ5MjbjkB8K5zwsSPsScR3D+CEZlxMEg9Xj1ck6JRojHf4hy9IA16SURMhawvGjUcMzii42AbecNHg1T5k9tg7EFvtzZHEqeTPRD3HEXEWOQ5Rqk5b+Yg2CRXA0XzJ52y8zqFuJ9+w5tiUzdpM3BqOhtw4NCOoJSVgLDsQfx0Q/vrH9k5Pcaktuhpn0LgVl X-Microsoft-Antispam-Message-Info: ybmFTCFSjMZPgkduRGyodCmAJ+pV75s0Vd70cBMhLe/pN9eqMcMsXCFlHTrB4db9PpN6hAXw/yw0Z3uUbxiZMMBvXcL5E3gDtiCaCUoDNtZYb2dOnULb19nTLFTJhytBJ4nP5s+KzQfHJ93Oy11GCRakOyo6zlP1zCGK7yDCAZ8WIAN+dpIHsKuyFqJlEwi8 X-Microsoft-Exchange-Diagnostics: 1; SN6PR07MB4223; 6:d9i2xnhWmtljn4I1FkR7SpakFl+WjFcWebWdHrJf+ATsjbUlFRSxPcHJrGxxM66uQ73Vqg6xoSIl8aKz3NXmAhECdaBnkxk2CZ+LjlXR+1UOTfN9vw6SpbS0Pn5v69Knd4WnLzS9xYegFBMYzUKEWgXo/G0/Vsx5B1k3l3TwNzG+nMCJ/NVJcvqRIVqUvhBIONH032E5lLbPNjj6lGKlEDBCCjCfJ3SkVnCv1Fno+VbZ45+VW0LUuKWuluChYYbT69I5Z49HLyNScBcsodgkShQg7+ghkoaScW/xKqsgugeVM8mQ/V1D6s+vkGzwv5zzHkRq5ib70/q9yg5xWsZBsWC/u6DXjcx04DetaNLngQc=; 5:mnzp2TlQ7E7oCI+VhmmvBH+v190BbxdGtgRrjQMknpefGxjT5nMjih1QE+Zs5cfhbHv4B3orgowQzlbmcA1JpwSF/S1kteZA+GJQVVvkth9w+/wjPA9vIPlTbAXHpoSUaVK/oCffTMQhRN4xudg+WnEpRlePp9O6+TtwZgxi+Z4=; 24:EvIJ8iJB6mdXT011wqV4EJ4TwdpmRTlr4UVucJ5r3H9Mdqa2NvpNhS1n2ThlGGNsqWtMZmBL+s/hKZxETPqVxia+mTNeiH4+0tdjNsdwwgM=; 7:vmEXEdjGD1a1cdf+hdb5V2cb79etJslPXCGOKPax4Z/Tb1ReH1WBGskmOirMXAgqvzWeoi2Pk3avXgUUwjuxib4lvKlW+zaO9+SqrciItnykCG5UKdkanVU21a43fB1TjHRCguImvT5G+NuIdY+cPubfB8ZPuC0C9wZfr45/b+8Nv1dciT7H9WWaF57/E1EpkaGkC8AIJwsROY4yJMe1sNThk/NgpJsENGx5ITMaaNNxwS6IcPyH7S/cmWUBs3P0 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2018 00:37:29.8735 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7f20bafd-7237-4ea0-86b9-08d5911f6ce8 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR07MB4223 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Intiyaz Basha Removing checks for netif_is_multiqueue. Configuring single queue will be a multiqueue netdev with one queues. Signed-off-by: Intiyaz Basha Acked-by: Derek Chickles Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_core.c | 18 ++--- drivers/net/ethernet/cavium/liquidio/lio_main.c | 93 +++++++--------------- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 55 ++++--------- .../net/ethernet/cavium/liquidio/octeon_network.h | 50 ++++-------- 4 files changed, 64 insertions(+), 152 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_core.c b/drivers/net/ethernet/cavium/liquidio/lio_core.c index 666cf7e..73e70e0 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_core.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_core.c @@ -377,20 +377,12 @@ static void lio_update_txq_status(struct octeon_device *oct, int iq_num) return; lio = GET_LIO(netdev); - if (netif_is_multiqueue(netdev)) { - if (__netif_subqueue_stopped(netdev, iq->q_index) && - lio->linfo.link.s.link_up && - (!octnet_iq_is_full(oct, iq_num))) { - netif_wake_subqueue(netdev, iq->q_index); - INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, iq_num, - tx_restart, 1); - } - } else if (netif_queue_stopped(netdev) && - lio->linfo.link.s.link_up && - (!octnet_iq_is_full(oct, lio->txq))) { - INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, lio->txq, + if (__netif_subqueue_stopped(netdev, iq->q_index) && + lio->linfo.link.s.link_up && + (!octnet_iq_is_full(oct, iq_num))) { + netif_wake_subqueue(netdev, iq->q_index); + INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, iq_num, tx_restart, 1); - netif_wake_queue(netdev); } } diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 41e992c..5ef9aa0 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -515,10 +515,7 @@ static void liquidio_deinit_pci(void) */ static inline void wake_q(struct net_device *netdev, int q) { - if (netif_is_multiqueue(netdev)) - netif_wake_subqueue(netdev, q); - else - netif_wake_queue(netdev); + netif_wake_subqueue(netdev, q); } /** @@ -528,10 +525,7 @@ static inline void wake_q(struct net_device *netdev, int q) */ static inline void stop_q(struct net_device *netdev, int q) { - if (netif_is_multiqueue(netdev)) - netif_stop_subqueue(netdev, q); - else - netif_stop_queue(netdev); + netif_stop_subqueue(netdev, q); } /** @@ -541,33 +535,24 @@ static inline void stop_q(struct net_device *netdev, int q) */ static inline int check_txq_status(struct lio *lio) { + int numqs = lio->netdev->num_tx_queues; int ret_val = 0; + int q, iq; - if (netif_is_multiqueue(lio->netdev)) { - int numqs = lio->netdev->num_tx_queues; - int q, iq = 0; - - /* check each sub-queue state */ - for (q = 0; q < numqs; q++) { - iq = lio->linfo.txpciq[q % - lio->oct_dev->num_iqs].s.q_no; - if (octnet_iq_is_full(lio->oct_dev, iq)) - continue; - if (__netif_subqueue_stopped(lio->netdev, q)) { - wake_q(lio->netdev, q); - INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, iq, - tx_restart, 1); - ret_val++; - } + /* check each sub-queue state */ + for (q = 0; q < numqs; q++) { + iq = lio->linfo.txpciq[q % + lio->oct_dev->num_iqs].s.q_no; + if (octnet_iq_is_full(lio->oct_dev, iq)) + continue; + if (__netif_subqueue_stopped(lio->netdev, q)) { + wake_q(lio->netdev, q); + INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, iq, + tx_restart, 1); + ret_val++; } - } else { - if (octnet_iq_is_full(lio->oct_dev, lio->txq)) - return 0; - wake_q(lio->netdev, lio->txq); - INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, lio->txq, - tx_restart, 1); - ret_val = 1; } + return ret_val; } @@ -1671,15 +1656,10 @@ static int octeon_pci_os_setup(struct octeon_device *oct) */ static inline int check_txq_state(struct lio *lio, struct sk_buff *skb) { - int q = 0, iq = 0; + int q, iq; - if (netif_is_multiqueue(lio->netdev)) { - q = skb->queue_mapping; - iq = lio->linfo.txpciq[(q % lio->oct_dev->num_iqs)].s.q_no; - } else { - iq = lio->txq; - q = iq; - } + q = skb->queue_mapping; + iq = lio->linfo.txpciq[(q % lio->oct_dev->num_iqs)].s.q_no; if (octnet_iq_is_full(lio->oct_dev, iq)) return 0; @@ -2568,14 +2548,10 @@ static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev) lio = GET_LIO(netdev); oct = lio->oct_dev; - if (netif_is_multiqueue(netdev)) { - q_idx = skb->queue_mapping; - q_idx = (q_idx % (lio->linfo.num_txpciq)); - tag = q_idx; - iq_no = lio->linfo.txpciq[q_idx].s.q_no; - } else { - iq_no = lio->txq; - } + q_idx = skb->queue_mapping; + q_idx = (q_idx % (lio->linfo.num_txpciq)); + tag = q_idx; + iq_no = lio->linfo.txpciq[q_idx].s.q_no; stats = &oct->instr_queue[iq_no]->stats; @@ -2606,23 +2582,14 @@ static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev) ndata.q_no = iq_no; - if (netif_is_multiqueue(netdev)) { - if (octnet_iq_is_full(oct, ndata.q_no)) { - /* defer sending if queue is full */ - netif_info(lio, tx_err, lio->netdev, "Transmit failed iq:%d full\n", - ndata.q_no); - stats->tx_iq_busy++; - return NETDEV_TX_BUSY; - } - } else { - if (octnet_iq_is_full(oct, lio->txq)) { - /* defer sending if queue is full */ - stats->tx_iq_busy++; - netif_info(lio, tx_err, lio->netdev, "Transmit failed iq:%d full\n", - lio->txq); - return NETDEV_TX_BUSY; - } + if (octnet_iq_is_full(oct, ndata.q_no)) { + /* defer sending if queue is full */ + netif_info(lio, tx_err, lio->netdev, "Transmit failed iq:%d full\n", + ndata.q_no); + stats->tx_iq_busy++; + return NETDEV_TX_BUSY; } + /* pr_info(" XMIT - valid Qs: %d, 1st Q no: %d, cpu: %d, q_no:%d\n", * lio->linfo.num_txpciq, lio->txq, cpu, ndata.q_no); */ diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index 57b6ee5..f46289d 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -291,10 +291,7 @@ static pci_ers_result_t liquidio_pcie_error_detected(struct pci_dev *pdev, */ static void wake_q(struct net_device *netdev, int q) { - if (netif_is_multiqueue(netdev)) - netif_wake_subqueue(netdev, q); - else - netif_wake_queue(netdev); + netif_wake_subqueue(netdev, q); } /** @@ -304,10 +301,7 @@ static void wake_q(struct net_device *netdev, int q) */ static void stop_q(struct net_device *netdev, int q) { - if (netif_is_multiqueue(netdev)) - netif_stop_subqueue(netdev, q); - else - netif_stop_queue(netdev); + netif_stop_subqueue(netdev, q); } /** @@ -986,15 +980,10 @@ static int octeon_pci_os_setup(struct octeon_device *oct) */ static int check_txq_state(struct lio *lio, struct sk_buff *skb) { - int q = 0, iq = 0; + int q, iq; - if (netif_is_multiqueue(lio->netdev)) { - q = skb->queue_mapping; - iq = lio->linfo.txpciq[q % lio->oct_dev->num_iqs].s.q_no; - } else { - iq = lio->txq; - q = iq; - } + q = skb->queue_mapping; + iq = lio->linfo.txpciq[q % lio->oct_dev->num_iqs].s.q_no; if (octnet_iq_is_full(lio->oct_dev, iq)) return 0; @@ -1635,14 +1624,10 @@ static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev) lio = GET_LIO(netdev); oct = lio->oct_dev; - if (netif_is_multiqueue(netdev)) { - q_idx = skb->queue_mapping; - q_idx = (q_idx % (lio->linfo.num_txpciq)); - tag = q_idx; - iq_no = lio->linfo.txpciq[q_idx].s.q_no; - } else { - iq_no = lio->txq; - } + q_idx = skb->queue_mapping; + q_idx = (q_idx % (lio->linfo.num_txpciq)); + tag = q_idx; + iq_no = lio->linfo.txpciq[q_idx].s.q_no; stats = &oct->instr_queue[iq_no]->stats; @@ -1671,22 +1656,12 @@ static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev) ndata.q_no = iq_no; - if (netif_is_multiqueue(netdev)) { - if (octnet_iq_is_full(oct, ndata.q_no)) { - /* defer sending if queue is full */ - netif_info(lio, tx_err, lio->netdev, "Transmit failed iq:%d full\n", - ndata.q_no); - stats->tx_iq_busy++; - return NETDEV_TX_BUSY; - } - } else { - if (octnet_iq_is_full(oct, lio->txq)) { - /* defer sending if queue is full */ - stats->tx_iq_busy++; - netif_info(lio, tx_err, lio->netdev, "Transmit failed iq:%d full\n", - ndata.q_no); - return NETDEV_TX_BUSY; - } + if (octnet_iq_is_full(oct, ndata.q_no)) { + /* defer sending if queue is full */ + netif_info(lio, tx_err, lio->netdev, "Transmit failed iq:%d full\n", + ndata.q_no); + stats->tx_iq_busy++; + return NETDEV_TX_BUSY; } ndata.datasize = skb->len; diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_network.h b/drivers/net/ethernet/cavium/liquidio/octeon_network.h index 72a581a..7922a69 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_network.h +++ b/drivers/net/ethernet/cavium/liquidio/octeon_network.h @@ -512,14 +512,10 @@ static inline int wait_for_pending_requests(struct octeon_device *oct) */ static inline void txqs_stop(struct net_device *netdev) { - if (netif_is_multiqueue(netdev)) { - int i; + int i; - for (i = 0; i < netdev->num_tx_queues; i++) - netif_stop_subqueue(netdev, i); - } else { - netif_stop_queue(netdev); - } + for (i = 0; i < netdev->num_tx_queues; i++) + netif_stop_subqueue(netdev, i); } /** @@ -529,24 +525,16 @@ static inline void txqs_stop(struct net_device *netdev) static inline void txqs_wake(struct net_device *netdev) { struct lio *lio = GET_LIO(netdev); + int i, qno; - if (netif_is_multiqueue(netdev)) { - int i; + for (i = 0; i < netdev->num_tx_queues; i++) { + qno = lio->linfo.txpciq[i % lio->oct_dev->num_iqs].s.q_no; - for (i = 0; i < netdev->num_tx_queues; i++) { - int qno = lio->linfo.txpciq[i % - lio->oct_dev->num_iqs].s.q_no; - - if (__netif_subqueue_stopped(netdev, i)) { - INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, qno, - tx_restart, 1); - netif_wake_subqueue(netdev, i); - } + if (__netif_subqueue_stopped(netdev, i)) { + INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, qno, + tx_restart, 1); + netif_wake_subqueue(netdev, i); } - } else { - INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, lio->txq, - tx_restart, 1); - netif_wake_queue(netdev); } } @@ -557,27 +545,17 @@ static inline void txqs_wake(struct net_device *netdev) static inline void txqs_start(struct net_device *netdev) { struct lio *lio = GET_LIO(netdev); + int i; if (lio->linfo.link.s.link_up) { - if (netif_is_multiqueue(netdev)) { - int i; - - for (i = 0; i < netdev->num_tx_queues; i++) - netif_start_subqueue(netdev, i); - } else { - netif_start_queue(netdev); - } + for (i = 0; i < netdev->num_tx_queues; i++) + netif_start_subqueue(netdev, i); } } static inline int skb_iq(struct lio *lio, struct sk_buff *skb) { - int q = 0; - - if (netif_is_multiqueue(lio->netdev)) - q = skb->queue_mapping % lio->linfo.num_txpciq; - - return q; + return skb->queue_mapping % lio->linfo.num_txpciq; } #endif From patchwork Sat Mar 24 00:37:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 890350 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=none (p=none dis=none) header.from=cavium.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="PObBgUPC"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 407M1w5dq2z9s0y for ; Sat, 24 Mar 2018 11:37:40 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752249AbeCXAhi (ORCPT ); Fri, 23 Mar 2018 20:37:38 -0400 Received: from mail-bn3nam01on0063.outbound.protection.outlook.com ([104.47.33.63]:36154 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752192AbeCXAhf (ORCPT ); Fri, 23 Mar 2018 20:37:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=uLNBC79Qma7Gypdu9sz0Ugpu2/Zt+TIVFKxqyxQ45Wg=; b=PObBgUPCAVgMbIgLm1KCDMMGQBaXwF+ARztv4WwfUhYMmB4loOmwsJqflp7DaAkDGAYvRH3NfU7fMy+k6h2yviBAdKC6UiHI0+msKOtyNe5dbJ0sHR3YLa+hFKRqamgSsomt3eA+GFv3ikhYo62CebD8dox9HyQQJZ6Az18Iduk= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; Received: from localhost (50.233.148.156) by SN6PR07MB4221.namprd07.prod.outlook.com (2603:10b6:805:62::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.588.14; Sat, 24 Mar 2018 00:37:33 +0000 Date: Fri, 23 Mar 2018 17:37:30 -0700 From: Felix Manlunas To: davem@davemloft.net Cc: netdev@vger.kernel.org, raghu.vatsavayi@cavium.com, derek.chickles@cavium.com, satananda.burla@cavium.com, intiyaz.basha@cavium.com Subject: [PATCH net-next 08/13] liquidio: Removed one line function stop_q Message-ID: <20180324003730.GA6553@felix-thinkpad.cavium.com> References: <20180324003618.GA6457@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180324003618.GA6457@felix-thinkpad.cavium.com> User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: CO1PR15CA0108.namprd15.prod.outlook.com (2603:10b6:101:21::28) To SN6PR07MB4221.namprd07.prod.outlook.com (2603:10b6:805:62::13) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 272f25a3-380c-4fb4-2c5e-08d5911f6eeb X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:SN6PR07MB4221; X-Microsoft-Exchange-Diagnostics: 1; SN6PR07MB4221; 3:/rKvG9myNONRbZzDDlYzrC/e8q285bxBfSsvVat4r5m7wppX8dqIubbC2nMxzbHFUJeVW62yvUs0+xU+2y8x46klYL/3Li+ETz4WIfw+0w/9oYjZQoWhAeBgCcJ9IZcPT+GLaBUGp7P/g4kkZ8Bm+fEyVJ4VGoWlegm6rJ8wZePxlZE19dj2G3AMGmJKNAaqremBLdXifiPJlO8ddlVFuw5JJQaHCK/dYAf6MjPNM2bcBY8BdeKNdhxoTty8VNDV; 25:+HyrS45pRvHDtuCyN/L23rU76Brgd27OYkcQ+gIZOStSRURYv3+cQWaZC0oleqTztzAjl+AXxcLyTuSA+qy+Co85T+kWatGPpgSX0ilC4po8TWWHmt/W8QN8Kwwfj89FQLfKFYC36A0yFHus/xvF/EfTb+UVpSr1aHOwPc9rgtXfks4oYcSnVznoyPr0wwlPQCod6HIyBMmeZQLLuV0HYTJZJPfyiE1OIb+iXRrdVoiKEk+wa5K7VAxzltOl7ol3bgsWzywpzpzuqp31xQkPEBIyJwDD17ueOAJpcv+8KHjNiJAwT13pCfNjd/v6ytrQ0zxZXXmE2DF5wPUPqULEPg==; 31:HIfaBvN/j/qXjoPKUUryQcRSAwCCFM39J4BdQ3POWzIxrxYuaNYAfbk3wft+MmN2ePwGKtw+SOITJQzVBUTM1xeAbyFEYSt1RvHLcfkDQo6tS0zM9LF99Hk+ZzsYyfE6OT+u6VCG8QeGJF2NE7O9FTzArJ6tVxAxwkNL5MxOqbZ5eLxqtRbIsRCZwF2aOT1HYScrK1jrOEJihy5nif96G8Rg4B6IsZimcuP8ulpkQKw= X-MS-TrafficTypeDiagnostic: SN6PR07MB4221: X-Microsoft-Exchange-Diagnostics: 1; SN6PR07MB4221; 20:mELvEcaAmWzT2tOeonm62Mn8u0m54Xf1Dnt8Ro+0wg4jX8DuM07LqDmRAfHGoSWzdm8udNS7egUZxlNfoOPHpKcNxWB9d07F9tUbOHtW2Ie4UwDF9FNRT6rBu1e5omXh41qEQo1ren2TcTlwQt4LGIlKZlg29FfNTAhBbppojUjjsaGB0lo3iz5YUr8FLLHxj+4WgV1XG2Jt0tf55iuTFDr84x/EI6CTDrNqNLkL7IKfOumyt1OZarczGna4neTygXCZv644SyWtexVJzhu4C0nBPS/t0XWUs6ozhkJHORaZyt1S61tFOQJ37RSHz3rZBCcQpDw3ntLIpz4JsnviIz65bbQWHL7UZNBmd28TiJZzu5mPa5tnAF7GHwkxZ/SBHZ0Ox1rQL1v5CzCQUKdxZhogFtsMKU9Q2FhZ57uqP6jCdCHeeb8Kdx1SQ7Dzu0UUS+GL18KroN9qZKjRYBoGxFxDr0o8Naeq+2/pLaWdFPGPxcNSA/tLTsHKdZ53rgdg; 4:0FOalCOoOKcZbtP5K9SKi6LmTfhvalspduSElmuqKzZoKf58jGrsDA2uuhRE2QgIG/rtvNo/uDZjQEYq3IPWKpk1QFyNmPHJpHF87/SjN2w8+79VzZzWD7x48lIVFHjkKZCTUv1wJpPd+rzqihKVpX3w0ix7Ljpg5kXimClfckky4CuynvS9vb3z0anXVNonT9XOfqk1fZwXUCHJNlEhED40/VNDGsNFp4FibG8P1JmfcEUdsbLtQUAkSMTJAkbIcOCus5LlJ5Y9UAxfoqj5qQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(10201501046)(3231221)(944501327)(52105095)(93006095)(93001095)(6041310)(20161123562045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011); SRVR:SN6PR07MB4221; BCL:0; PCL:0; RULEID:; SRVR:SN6PR07MB4221; X-Forefront-PRVS: 0621E7E436 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(39860400002)(346002)(376002)(366004)(39380400002)(396003)(199004)(189003)(59450400001)(316002)(11346002)(446003)(186003)(47776003)(6916009)(16586007)(16526019)(305945005)(7736002)(58126008)(66066001)(33656002)(2906002)(4326008)(386003)(25786009)(956004)(53936002)(1076002)(5660300001)(107886003)(76176011)(72206003)(76506005)(106356001)(52116002)(97736004)(50466002)(2361001)(2351001)(6486002)(86362001)(8676002)(81166006)(81156014)(26005)(6116002)(3846002)(105586002)(68736007)(8936002)(6496006)(478600001)(23726003)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN6PR07MB4221; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; SN6PR07MB4221; 23:WOJWcPEjMTBwEMqNKlHeaJHBiK1AGOe6cyMUm0i0bmtwYuNLe4/9XsCepbQ/oUa6HpumEuNRCr1keQiQ1Ax7dbkXDYqVDkdod41RIUvJ1DHytu0p612UWQE2QAVPAusO/4JbxZAD5/Z/2d+I6hDaubg2ZPIZ6nP2ZPoJ+2RBYCGJr/OduI1irbrj6aZOzJQvKVdkh9wuTdFw5L9f3ijEuZQc+hD0k0goAJsv3esr7MKyRSMp1l1De+L94v2h3yomItpPOLAnIHoj3a4cRo5+aD/DGT9CBI6jXdaoWxgZ0BWOaHyl/HuKXJz9A+rx1MPq4aEGP8IMX/SN5JI5MhO47PwDShVj02LhF+LM84Y4RuNVDs7IQZAepHcKn43UFirBwcqwXsCq7Q/EpTSj2Aq1+/YgJjYYUgj0ymwr25+EGx1WSAdsq7exHloYpv6M5WPjm9B7Lq6KmJ+nyXoYlwQUyf8zfBRUR2A5FJEiCG7Z1M+DJtUE4211RnsC8A7D8aXyBNuIjAvzP+jygBmdCDQC6kgM5XK8c/EVhtAFq3x8DXUzutdaiTYyb6pzuMuMnBSMlXxoD0Kkq3lTaldjj1hZdPifY3ycbb+Csdmw3tpq2qiSho74bNVpRy/rVSSawg71BuXbIFAmx04Pb8vtI+7tTSeEaqZWeDjU7Zcp0ZEJhCCzkEAIeZw6gc+xCJgm7QnVDl8D/UQ6DrOrHLtFcTP4lreDUuF3iyKLd760zOuEHR5iecAK/OVyGEWs2O6xjTEFL3pf2Nb3nMmGso998LMK24bniSVGQ+J5nV6bRUzrXLtWjbD9Jp0Yw2J2hdAPdtUUFEeWSiuKAYVxd/4K+KwBOj/XntLROeo9n98YQe4nA0mdxzbtHam76vBR6SbrrL8vPYXi21kFvTi1BxwGdlzL9AT2WVDF5Q/gJNK6KsNmgZu1A87GE+ZMwQ05HJZrxCMQKXBEtFghMGMo9sGRlWve0PYD0nOlkcGfPYQjEqmNr8r/BaWK1X3Fl0PhfxrYUju9o5bujXc52mISqOqyEVILpmdUKp3D9aVHzK253Lg4E+cRn2qgvhs489J3/3Yt6eoiBL8Wx1HGkNu+iC76C9x9yzjPzaglwYu7Go2z20OaCHBrscrXbJII80MVwtWtOw7ueAlDqBrYN4J0IeZZOMlRTCCRkwUOXPq8JhmY7DtNkqE8VO4Yix7mtUELTLdIgzpXsfi/MuZa2oJ/qSWHENZKWPa2wG0iRWfckSV2SrfXd8FbRY2Aro4aQ7n3VAowXiOn X-Microsoft-Antispam-Message-Info: xjKg5oB8xJ82p1a67ddXDkxmI9ImTZ84/gHSp8B4A0JtcdZgeG2NKWn1Fkub9Z6D69NjrJLrpAP1jCEcsPb1/9DV2eCl2sDaIRkG2g1/jmuLWLcijoEdQEUxgeYNMY1fYlj8V+bb0dEo3Wq7jQDHbLLrqwwflhX9uX+nguUoLI38qqS0YF46vYmyrVMH0Ato X-Microsoft-Exchange-Diagnostics: 1; SN6PR07MB4221; 6:Gema8raqmBHt/GKqCq2vTdq1Id1IdaSLc5uwXKh03QtXXF09NlgNDBKZPz4mBP5Wsm+rldful9sELGwmbxi5BwZQB/lHjvpMaaz0iJqwOmRPQnHDPtYdp+MC0gwoOLZyH4ZaTUbSnDwcxTINzQw4EreJ8FXEESu0dO1lGkNVOIEDs5ua6KyddFNRWJQKP9uA4CXe8xwoiMZYNozU0PD1PoPjncNcyF7F8Q+Y1bWCSW9EknlSL5DDqbZ5ZKDw8mnpvK32ZVus994SdClPtiWstTwa3zwCYHh8R7R+xRG4ytXiG+zs81qVFHv4j6DSdWdFu4RZL7NMaSGr69z+d4CqTSkoFTEt0+UVT/Cu8Z6Y39A=; 5:flTgWn30BynlO2zLJzquuD13cOEeWGMg6MnWjoYpYjf6CY0VBUoxs4OKYlR3xsWYVEjKkPe4FKukBhHhCFaSn8uW0lcAuK40YloWgkztHXai/h/ANDq9W1NQUYsowfH7P4uPlj5sCd86dhEhkofcYp5me9rAWMxNaECXQ5hXids=; 24:lwrdLyH3Dyv5MJY3Y9hmjQ0nNX1K1eF/NBn5FwRJX0gHPFDoHxDIQ5dSBLgOCCeEZ5ikRkFxKk5yDc1WLpMSmSdNiPrbTn/NXKhSCo7visg=; 7:dEv7O9/HDpCJ0luEqi0QWxWPVLHW1bGas1MXzgb+TY8wb8t6KF92CI5lSArZk0EwvSM3ibJGOAZPCL6W50ySPtIZFL/rW/N9JM05mADm6vQyvAM5Em3SEHTYVZaW1BS/sSNBDRK5Pp4WPsi1gWs4n+GwYRqrYk73pjpYWveb6R+vGaj9VCq4R0IpGfH+ihyQ3dF1L7dwJL8ARQPosCQaexqpn079nudGwyPY5wiMoDe4BnBFTwNLntbkFoDCFYG2 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2018 00:37:33.1994 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 272f25a3-380c-4fb4-2c5e-08d5911f6eeb X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR07MB4221 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Intiyaz Basha Removing one line function stop_q Signed-off-by: Intiyaz Basha Acked-by: Derek Chickles Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 12 +----------- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 12 +----------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 5ef9aa0..be16a1c 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -519,16 +519,6 @@ static inline void wake_q(struct net_device *netdev, int q) } /** - * \brief Stop a queue - * @param netdev network device - * @param q which queue to stop - */ -static inline void stop_q(struct net_device *netdev, int q) -{ - netif_stop_subqueue(netdev, q); -} - -/** * \brief Check Tx queue status, and take appropriate action * @param lio per-network private data * @returns 0 if full, number of queues woken up otherwise @@ -2745,7 +2735,7 @@ static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev) netif_info(lio, tx_queued, lio->netdev, "Transmit queued successfully\n"); if (status == IQ_SEND_STOP) - stop_q(netdev, q_idx); + netif_stop_subqueue(netdev, q_idx); netif_trans_update(netdev); diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index f46289d..3120aed 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -295,16 +295,6 @@ static void wake_q(struct net_device *netdev, int q) } /** - * \brief Stop a queue - * @param netdev network device - * @param q which queue to stop - */ -static void stop_q(struct net_device *netdev, int q) -{ - netif_stop_subqueue(netdev, q); -} - -/** * Remove the node at the head of the list. The list would be empty at * the end of this call if there are no more nodes in the list. */ @@ -1803,7 +1793,7 @@ static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev) if (status == IQ_SEND_STOP) { dev_err(&oct->pci_dev->dev, "Rcvd IQ_SEND_STOP signal; stopping IQ-%d\n", iq_no); - stop_q(netdev, q_idx); + netif_stop_subqueue(netdev, q_idx); } netif_trans_update(netdev); From patchwork Sat Mar 24 00:37:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 890356 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=none (p=none dis=none) header.from=cavium.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="G2dLk6wO"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 407M2W077Fz9s02 for ; Sat, 24 Mar 2018 11:38:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752387AbeCXAiI (ORCPT ); Fri, 23 Mar 2018 20:38:08 -0400 Received: from mail-bn3nam01on0064.outbound.protection.outlook.com ([104.47.33.64]:26336 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752232AbeCXAhi (ORCPT ); Fri, 23 Mar 2018 20:37:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=rZ/zj6q7EpJP78PpxDO5RACEywQJRZCD0Elxhzr0bz8=; b=G2dLk6wOn5xTUNuvZYUJ9Dcj1KmS8u1og9KrfX9Zm4JZMZzxk/1JAYzuWo8Et/AYbvY3YNYe1HKylevS0TVex13YCQ5ffN1kO4g3ukGpn3MNGM3o/EgqymQ/ubhVpB4hAPMmLM8shrwD4Lif5Cp8WHxXOQbOYoGq5ha8lrvFS+U= Received: from localhost (50.233.148.156) by BYAPR07MB4213.namprd07.prod.outlook.com (2603:10b6:a02:be::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.609.10; Sat, 24 Mar 2018 00:37:36 +0000 Date: Fri, 23 Mar 2018 17:37:33 -0700 From: Felix Manlunas To: davem@davemloft.net Cc: netdev@vger.kernel.org, raghu.vatsavayi@cavium.com, derek.chickles@cavium.com, satananda.burla@cavium.com, intiyaz.basha@cavium.com Subject: [PATCH net-next 09/13] liquidio: Removed one line function wake_q Message-ID: <20180324003733.GA6564@felix-thinkpad.cavium.com> References: <20180324003618.GA6457@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180324003618.GA6457@felix-thinkpad.cavium.com> User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: CO1PR15CA0092.namprd15.prod.outlook.com (2603:10b6:101:21::12) To BYAPR07MB4213.namprd07.prod.outlook.com (2603:10b6:a02:be::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d97afb7b-07c4-4438-9ec1-08d5911f70b7 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:BYAPR07MB4213; X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4213; 3:d/HhWIIgRTRpwai/8cHOECMBkZmjzbYnHznIopcND6H7VrWBOvTAdX9/kRvUxRIlw1ZYqiHsUvH0leAU+RlMH5O4fQNc61yRWZOoZDYSYziHPO9fWfwuck/O7Go8rbGO8Rpm415EgBYB7h8t8CfnAdipCPvg6tNv1UlPELgHPsJPX2iqDNOwZKRAr8i0hZRmeA70VCuMN1mKvEpsNjfwQ1Q6Rtr3ZRXR7crvzCE32A1LLsXmoOw9ba6HU40xuRTd; 25:xxNTsjj19uqVuc58jfT1BovrfZW2LKVnQPEyCEtSlZlWq7I74Dw7dltNZsaqGeWIOx3K96fNeaXlluXgHPIAcQpX6rl46WiHPJ0cYDQLnIzfIlBStZ/HvEQ5y95d2mFqtiLSdtyBOF0xzJ1PNlqpJWy2NKZm1ivzvAbpKWboHM6/eMiezaLjNsCHHyHrzqmSZ3JIJkXaWYGgIVljXdVeYhbToeTugdUc9FQCilsQxkxG1/tk5j+gRGqzC1P/4RIMeDUhxNZVKEpTJUrh3Ij9F+tPcenEjHtKa2dPoUb+0CReB5Jdl0uzb7Lc/KT5V4WfKQUu/Rvrom8SDfk7PgWXhw==; 31:aj8lyvtNAipankuiOVoBWfexf2faMssTMlbPKCYa5yqH0ep0gT8iczWHoHySWRG82wM7BGxG/69j6ay3/3YbrmIBcumxLqnmLPus6+H/nMLJFcZdbzgwAWtt+Z8qqf/9b2gPEVNqlWEP6cz5bHIxgzV3/4+sQPwApS44eegMycX0OoGbO7apGF9ysYF/fS2FEpk4puRJR8p+Z6TRt61HqbaiNlUJAVdlsT4tZpaq17I= X-MS-TrafficTypeDiagnostic: BYAPR07MB4213: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4213; 20:TeyCm52dFwWMiolay8zliU3JaH0EVa8LjV7s/Eh1xXjR+v9/+pnWUNF7VbEppI2vTIFdkldYfjc0M5I+itLZ2Zed2vzjnFQ2WMBzH9uhTdc5blzTfyQrFKU1otR5iaONlXEZId8JnwiEpiVp1HEq3TloILmS6/oNRNijKMZvcAwUc/eekNyhRXxhPVx7Zeo9e/Jit3cM0LEeoGhr2Sn+eJZSvjuoq89K7ltXijezlIznmBoB5aF0okeJhy//rARyXHJHSyoppOpUx+o+pIJhBSlWWRVK54zgpR4xa98sg3/DQ7445oiBOqLn8Sg+1hmloDPkAcQPEcS/6HJiQqtHYznR0zkaoHfpO+0JWCmpx2nZ+IdFkPGtJeFHjH2lXczSVC748NzZL03YAjuQz/rwd5f2FxxMAQSH8OtCEpuZKs/D8MBDN9M/fCgkqp79jX/it1gK2S4hMU5zsNxJw9o1TVBsGNFb1gD1DzSZ3QEHAvbx1QUa3qnyC8Zzrag/Fo/G; 4:53MI31yawGb9vIptfAn1HdhdmYK65FhpJpzThihoNV2NdRLd9oj3sncLMnaXSdBHkajAbwj0Z8r+uDaGwiXKBnYiSnI4gK6kiOBIw8xY0cE4tsChz+IkND7/Vdu2KA/eIDmr+MjlD0Td/6haDXukxRtbSef7LbbEi0AX1XNsEcV+1YeWru+OSeqP97LRvbgZBnIYjXbvbZzMHU8M+zp1mS+Y43aqttjQ6FGpQfi7GtgStZ30WQA8Oofe0lzVKmxXfcN3xRLZIbO25KwMRrQGfg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(10201501046)(3002001)(93006095)(93001095)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(6072148)(201708071742011); SRVR:BYAPR07MB4213; BCL:0; PCL:0; RULEID:; SRVR:BYAPR07MB4213; X-Forefront-PRVS: 0621E7E436 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(39860400002)(396003)(376002)(346002)(39380400002)(366004)(199004)(189003)(4326008)(186003)(68736007)(58126008)(16586007)(105586002)(106356001)(1076002)(25786009)(7736002)(16526019)(956004)(33656002)(5660300001)(47776003)(6116002)(316002)(66066001)(446003)(386003)(3846002)(2361001)(2351001)(478600001)(76506005)(6486002)(23726003)(8676002)(6666003)(11346002)(6916009)(107886003)(81166006)(2906002)(76176011)(8936002)(6496006)(50466002)(52116002)(53936002)(72206003)(26005)(97736004)(81156014)(305945005)(86362001)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR07MB4213; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4213; 23:EN/G/r+Ct23wrFM8MI+t8uDnrVry3KZ+l9eTofJx7sAzAJWF4PkQJkpfTWsgzLJuk0ck8Ql8TcTFF3usmj9MZtJQWPQ7GHmkJQ0IKFacUDuVF6ABhN/NtAqYe3xVhI3XdrcJ82ThCr+bFCpUQj/oORPcdiBK4ZFp8NhDOjCimCNtypl50PGOdJtnIlH+pRW/fjUALCsPmhu8V/NCv6tJtzXWuuBqB7upxn3IgLfB7rpxYbaf/VJXiwBZ1gkrWqbMB+Kl5VseDZIbW9Pl5XxAkaOIA8JWSgQYk9ZGJmP57TMIVy4xsNl26rjyI8hErk3ltaGMkxXW1ylN6l498U4fAttVtd9ct+p9QbFS61o1aZiOWbyeZ23uiDElY0ZaT9+CtC5ixgSKFGw+UNqCDpt0dgcZ/9tD+hAaoVHfmwZhmrLV+JAhNu3sSNcrK7P/SjRCsuWUWua3TUYsVEdkDfeeg8EubrmtA5KwfM4LZq92rU3vi8dajI0enOSds6koG5qBvIAXiFVtvL8nEgX+nWRmUyW1cUSBnim6CEJW6WWxmDv7Nkme6nBtePjeOrgUBijgdkruUqneJn9kN7zxaXqpXpUVYNuU7hWmWOlbBWXMmRHSnuGrv1lt5YpHcrSmobgc34CrLqCmOLr3TWUfe63BuTtGgqBQh5tLHfyc0l5eu+O0+5Q9hkssGeNyUGrsy2YfXCMXzrowHEyH3aSz3fgcs+Al7rb6E2f/5FWCtxisCAqPDqEXbNJwRYzaxU6Gd81wKBYQPi+5LW24U/WsbA/9vdIvMcgwCuptxvWXFmydf/WbAW+K2dJCpSUjulRYwvA5xsAwoXD1yiXEJpVUPT5htTb/5z76wEUH0KA6F1CdJ6JQ70InncTeza0KH3mnEFrbRLyhF36LVj4kOwGALnTAbtYyRwX8/1LIKOk48d1hV9VAxsKQkPCC4XU7cH411x8SfYd8ZdqdmpJbVL7KNGYkLxauJAokirTSQAEwyGUZbA/q7Ca8W++BGr+FnIm7xMpq+IrXtEkHRFRVYWTopLJwgswKwBVg836A0xN+YryZB3KsxGiIX850AgxCRbehvfU2Qi/ZJZ7f95Tq/SDop+jwqC30yMAbuSZXOzl59Wvn/ZYFJ1tuECsgNaR7ZqB/ZtOeSz7ODWOe9QKb9B5znAH6ZIIrHJDUZHCEQn9NVfuKVpxjni784i2nB6lPox7yNFQIH/bTOasjXegv86ny8Q1HP4v5knfD2N0k9dt9qLeb7cI= X-Microsoft-Antispam-Message-Info: oUsAroGGG5XviLgv8/wAE4Uj7tzsWvbSWwSDz6StK5/fZM5dS/BPNvU2qjwCyKtdVB8DP5EsNby5vQaSzBK2fVUJbKVqofs1bweISE260ZwApE6B2zg7iBEI2mKae2hsqrmr39onEPy8vaLlz++i9gbn/HERfLej6G1pAS+twCQIOoyPulsb1RI7EGagm5Pt X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4213; 6:T7yf7IOSpij+DCA9+UTNUTkHzu//g1xdXnqC+vpPu84xhADX6+TxNcq2niBcDe/7Gk3HYAFfOLDjEJWjH3ZuoM6cfQDvJ6p/XYT/cgHY+QQSxTkOkW8R6vuI1sakp+7Xy6fqcMTmNB67TVvnlTxFL9Ipxs/ioGHfqccoUdmCXWZwjD5YwFUh21ErcuZXE+3E5SOQ0VCjAggqCb4RwF6034HXorFLW3fHpCpUy72l3UyDX8OMR4NMt2UNENRGhPfHq590YQZObMOC2L/O0o1+MZaUhmHkl1zODi3edmZ3IzxUREJj05paNpTrPFF103/FIBzKzIoRHmedsT+FhaS0VbqrtHkCxqVJ8Pna1IOyB+DdFArHTgJo15P3U+5Bjr26sL6SPz/PWpd1bMXVlhpuaVZp4R+cNk/2q8imKAXiiwdOxCnvhTOmpDK8rle34uUxlqIgbbq7YHruPn4FaRN/XA==; 5:kxGrKTE1sUpT3euEdYim+c6EEiYP1y/rsuFYsuXoKVFguRaKlQph8sj8ReVk1+jpnH2BABoR6mW32t7Gc/biQMMuqrBadzAbA8Cf9xyqpK0mK5MNrIjWpsBf8GsA1E2dc0MH2TGqAbErLghdgUZRBi5vI77I2MdIOHOwqpRvkoA=; 24:1Fr0YGlAohdpLQUnbMNYzTB+3na2Anq73CNpT4AMQxj9mRU+4BSu9jvxSZECB3tOY4iVRHzO1bUlz/i/KDaIB96JFYTv4x4COGtgkcKS34Q= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4213; 7:wzYEOB0hTqQz/umAV+auOwomvk4MWfX/fb6KJO+H+zodJ/wYo4++5l4e2O0JFjUEO1F13fJWwsX0h0EGkEYA476wRHQlNU4ktGvNWBwbSjTxdY2aorQ+ASrsGMfZ5tOWzNC+u487sF9Gfl1tVR3MWzZsmkadCXVxuSaceDC8XraRCplJ57vl+u79Zb/hWiHti9fpRVgZmuKZt1JYK8B/aR8MzmZbi2eini3G5/HOOlZ3osQ3pW8P6ehVEQheJSGX X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2018 00:37:36.2638 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d97afb7b-07c4-4438-9ec1-08d5911f70b7 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR07MB4213 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Intiyaz Basha Removing one line function wake_q Signed-off-by: Intiyaz Basha Acked-by: Derek Chickles Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 14 ++------------ drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 12 +----------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index be16a1c..78f6794 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -509,16 +509,6 @@ static void liquidio_deinit_pci(void) } /** - * \brief Wake a queue - * @param netdev network device - * @param q which queue to wake - */ -static inline void wake_q(struct net_device *netdev, int q) -{ - netif_wake_subqueue(netdev, q); -} - -/** * \brief Check Tx queue status, and take appropriate action * @param lio per-network private data * @returns 0 if full, number of queues woken up otherwise @@ -536,7 +526,7 @@ static inline int check_txq_status(struct lio *lio) if (octnet_iq_is_full(lio->oct_dev, iq)) continue; if (__netif_subqueue_stopped(lio->netdev, q)) { - wake_q(lio->netdev, q); + netif_wake_subqueue(lio->netdev, q); INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, iq, tx_restart, 1); ret_val++; @@ -1656,7 +1646,7 @@ static inline int check_txq_state(struct lio *lio, struct sk_buff *skb) if (__netif_subqueue_stopped(lio->netdev, q)) { INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, iq, tx_restart, 1); - wake_q(lio->netdev, q); + netif_wake_subqueue(lio->netdev, q); } return 1; } diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index 3120aed..5ab0831 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -285,16 +285,6 @@ static pci_ers_result_t liquidio_pcie_error_detected(struct pci_dev *pdev, }; /** - * \brief Wake a queue - * @param netdev network device - * @param q which queue to wake - */ -static void wake_q(struct net_device *netdev, int q) -{ - netif_wake_subqueue(netdev, q); -} - -/** * Remove the node at the head of the list. The list would be empty at * the end of this call if there are no more nodes in the list. */ @@ -980,7 +970,7 @@ static int check_txq_state(struct lio *lio, struct sk_buff *skb) if (__netif_subqueue_stopped(lio->netdev, q)) { INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, iq, tx_restart, 1); - wake_q(lio->netdev, q); + netif_wake_subqueue(lio->netdev, q); } return 1; From patchwork Sat Mar 24 00:37:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 890351 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=none (p=none dis=none) header.from=cavium.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="Xc2vmCbM"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 407M230nqGz9s0y for ; Sat, 24 Mar 2018 11:37:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752299AbeCXAho (ORCPT ); Fri, 23 Mar 2018 20:37:44 -0400 Received: from mail-bn3nam01on0064.outbound.protection.outlook.com ([104.47.33.64]:26336 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752266AbeCXAhl (ORCPT ); Fri, 23 Mar 2018 20:37:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=E5Q3Zr6c1DN6eZiFv6lDuu5Fk2ttQl4SHYhhTHLA7s0=; b=Xc2vmCbMkYNKCzs7IOQJaaQOuKyuatzu5Zju98QqWa7mjWFKN1mQ3wdgLGmAa6oMj1F7hgczYGKGC7RJnCmGLgxCqAUevHzoIuZAOyygW1Z0E9ILPomJqqfizNOjxALvR8FsxvyoXJ8WygaIViYRaUnoSxZzAzmZLJVmNBXodn8= Received: from localhost (50.233.148.156) by BYAPR07MB4213.namprd07.prod.outlook.com (2603:10b6:a02:be::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.609.10; Sat, 24 Mar 2018 00:37:38 +0000 Date: Fri, 23 Mar 2018 17:37:36 -0700 From: Felix Manlunas To: davem@davemloft.net Cc: netdev@vger.kernel.org, raghu.vatsavayi@cavium.com, derek.chickles@cavium.com, satananda.burla@cavium.com, intiyaz.basha@cavium.com Subject: [PATCH net-next 10/13] liquidio: Function call skb_iq for deriving queue from skb Message-ID: <20180324003736.GA6575@felix-thinkpad.cavium.com> References: <20180324003618.GA6457@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180324003618.GA6457@felix-thinkpad.cavium.com> User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: CO1PR15CA0111.namprd15.prod.outlook.com (2603:10b6:101:21::31) To BYAPR07MB4213.namprd07.prod.outlook.com (2603:10b6:a02:be::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 750207b5-b781-4938-b5f2-08d5911f7232 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:BYAPR07MB4213; X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4213; 3:6DnXt8vg1DHyGQbVXHViNFA0WaRvQ81by+0X8N988UCh1QdPoOTbxwS94dR0RWiHl/MjNNamWSEPVhj2ujzlcNt9Lb6GfCVK8ZqBaHIDj0yOtrt6T0XoHUeK2gj0cQfKCSan87hPUUqnMBTqCcGk8/daLT+eOIwdRlrrFtGUyQxEMTfg/gX7nIh/z7sg1PrESq7733AF6pPW3v0GaFoGLoxljoXFaju4lCJ9RSBagBPsgGJhi1E6wcK7BjASrsdD; 25:QZ2TQw6QQwhXdCGO+9lCi4cyKHUcO/qHkHtvTiJuNceELaYdvAZVVPFqTKNTAfQxH7KM4jV4dsL6myu6YxcI2SBkNjeysA8qK1KEzZRlPm9lCY2SiqTa5w3wOFd+Fh0erK4Alrr/C8S2gdNTUaet8+VQnL8MhImhwCKH+XLhg3WUdGH4zyOQuM+mU0weI/B5B9WgEZgzgvGKzVOC2g+TFtrvCI6gnE8kDr/LwWq37ooEdi9G37zhc0UvnRhmnqUZ6iWyeND5f/8mEOcJXAv8/DITz+jtg/oNVxND08OOf38N+rAYQsu9wbVl/HRufnZF1s66fKXTMBwiLz2krtyAjg==; 31:QKjCuBpnkzglIZh4uvLFr5BptY9CfSYBmJw/vdNb3UuM/TV4H90KecQBcMeb62qYwVhFTarqdieBCQqkRaBU1mw8hplywWve31fP3QfUnH3vUZkMcBw5R3DXTlPWT+DU+ipFahm0z+0lxEHbA1kWDpLv/tk6U9CQiVQtEB0G2QhO/HZ2fK5KzUL5/WAYP8D4/JnPM0zCoz0IHlEIHR6Xy680wjiKNlkQt9wXGdoIbck= X-MS-TrafficTypeDiagnostic: BYAPR07MB4213: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4213; 20:jzbcNOI6Okt76N6UWcm4bWVm2pXKiiwDIB1V8nf9w12CQdet+lrcYFU5jAV8nnBz24nh6bhnAWq5Q2N4HVbxHG4cA+hVaPCC28/UDVq1IH+1wVGvJEPFA1B6V6fvn0SS8NHR5ReiNLtWL2zqtYThnzTOZAwjkOsFIEAzdFLHY9Iy6Guwhv4twKi20vvw75xGF8ZU/9QPIuhxsovO5SjVwqwF3Y7ozQzKTSfOYjkuJssrg4A4AdcDK9dO0FgChOmGrmuo977UKNe4ruas/6At021BHK6eW/fK2oX9SJFCcivHjDLlkpsIleZZ/BVv8m+0C7slInL4aodd6uM+qaNk7P1XtkxukT4RXLz6xaNrDi09MNR6zpQhYs3erlHeDHjksy6fL6OHsXlYCpucNmw2YnnKnGpkBoZGfQg616bQ9CGYQzKU+TiyJ6M5mzfbkaxDgiBFjvi0jDvJ7sM2qzI6wm3m02aDCJ/IyFwUaXh1NJF+tzsm5Tf0t2kT6HI5lVlf; 4:xG3x1KE50KpA7UpKgYI+rJ0fYCk54MrmPqSRIwPQzla3jlQcsyeo9hCDaX1vMLHzy3ZcK0FPEs1qIhUI8gINjdYqs6d/7+ctX1DvpEDZz+dsjxvXHPZgZfzVCriA98fNqp8i+QvFwqHs6o09r28MyZfbw4cobFPgH4+s6etKN11WnELT5w+enKkjYQwp8qeIs26dsS2Wzp7Whz5SRZ/C1yDvXWWrK+rQB9KS6elJTv1Cuxql74GlifRhkwupyF7w7Rha6Zzhfz0HV8MuwWzlFA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(10201501046)(3002001)(93006095)(93001095)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(6072148)(201708071742011); SRVR:BYAPR07MB4213; BCL:0; PCL:0; RULEID:; SRVR:BYAPR07MB4213; X-Forefront-PRVS: 0621E7E436 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(39860400002)(396003)(376002)(346002)(39380400002)(366004)(199004)(189003)(4326008)(186003)(68736007)(58126008)(16586007)(105586002)(106356001)(1076002)(25786009)(7736002)(16526019)(956004)(33656002)(5660300001)(47776003)(6116002)(316002)(66066001)(446003)(386003)(3846002)(2361001)(2351001)(478600001)(76506005)(6486002)(23726003)(8676002)(11346002)(6916009)(107886003)(81166006)(2906002)(76176011)(8936002)(6496006)(50466002)(52116002)(53936002)(72206003)(26005)(97736004)(81156014)(305945005)(86362001)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR07MB4213; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4213; 23:Uq2Mzf7ZSYsWlm2Degqq8ceTdgPpO24S6qk6cP4pbGdfxwxIUlO2p/Ej1D9aPH9pMOmJyPCfwLTCUMgniiKmaEsgG6gGHPl6I41XEHvYdKXQHy1Rnx9aFQZl2n+YzDFCsbHAk/VqeR+ddFKNzBCa6QGxMP5ynVZWalx6rjrm3RU29TjvhhaMlr/C3abtXSy9InpXoJnTkdnzPM3zcVjr1e6sHtvMhAKajClrG75DSBovj0j8n54Khx6Nqbf4MAEZTMH09nffZhgVYY1qMEh6pFT6lB/EESt8NnOcNZHp5FsUlBMY4O+xstF87WGZiCgdlBaGLTfDQpC6TicNEofW6SziRS/XkSloEdiHAzsh8t9KugiMlYAnJlcLAF9Vh7Q8QRgWpaIchV/HHeCuv1FKjTjbLTVuUbKg34FYICKd+AEAhfuCR5/aLStt/ylfUyZ1WBLOxAv/lZU6Xu1bMb8da9bMU/uZatlCYHrPPFFNkNkVpxyXedRzFndICpVzARgk2bgGAQAo3VA4YIfWebFjtmfdsFpxxy49P9fBx3+lZj8RnTC2aLSx3yEW2aBaVVetn8YvnYBHZCUB0tfJ7anPaRZb0/PvMuPUPmTioh8SsgNIceIQkZ2XywCpu8pjasZkr5QVPMyYTuHpUoe7QNRDGoGzzy3z0izVxVD2Uiv0/ev3mKQ7eY1Pxx/kzlv7QPpbc+F4uUKZrBYyvXwOc7aQiVVnYOULs7xYoXWhMMvzbpg7VksqB8aDi1Q+4N19UsRBl6VM1IHbgoi7iQZfbHS039cIp9X4X32m89CgbnJE57eJRzyuEJsCIQmVA99OI3UsibNH8OhojG4FP95GEBp4x+D7elm+QUXYVrGFxYZJdC54hZPVNpTvYmZnUzvebct3JxsaCMETp4fS1rmHDBC/Y9PCq1P0/PDoxnu7CyNsPcF7yedd2aWhfKTTB6hQUKYcNn5RBJnfxx4MTCNI+++UOcuPzZW50W9/IyP2KttNpfeelLd8QuX06iLk2Utih8N4sCf5sfQsSEgzwm6VZMmu5oFQfz7+KE8YmrzP6vBu6MTrXLJiybu006xPFvmLdXiH1FLiTwbAeR+hRgLsYC8jsq/16n0wXe7AGqgDUL/b0G9wxsUN1D16MnYRLCFsXjKCTUdVImW0ZJKlWsmAoJuKZTIou9R4ntOHAmVAOHj22n+TVdBcEFFFTTVIFLCAQMIh5Mg543ly5bNZB63EMsPupQ== X-Microsoft-Antispam-Message-Info: 40B5CaVSvrm85TCY2aCraH4Brq3kdR0D4lLt42/5dN5l1PncimF3XFhFyt6KnluJkz0nQuDUb1+ej2NURkIMUWm3n9dHGeMoDpIDa0P78b4YeqBywMfGUf241gPhtBDvZ4P5Wj3Dl4DfAicY4hXRnXknTIA2+nPZpZ1FD634L8PYLSFeKy36fM3S/Jyzqfdf X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4213; 6:jv9U7RpBD71Q1ifCcV4CSklB6CvQB0kQ4HpXaBKIyvBQoqpLS/ngyDYQdEFIQCl1p16OYXXUFoTIkAhxh1iCpcSglsHs6JCXeT9uJjNe0krXAw41NGzO+KAGDWvcrrQJ0mw7SiMi2iyVwU8ww0H8zM0YpYfiUm+lL8NCdGHPQbOFM6yUZM4rE2cvHZpBbii7WunbfIQUHCRUn2QgQj4ZpLr13HCVMNYCi0QZqIOX+x/T8qokQORjLJuJuGYTTjQuSTfvPcrbA2dYHVNPOUxMgyzOmI+V6IOvho7DM33nwFh2f7M0Z3tMtBHTW2fvYYM+nc//Ub7KCFM0TmxKPQVZ0oKty/lVYUU0LpBAMIwQW1rXO7UmytoXBq2Npr7WZNswGMcavma1MmGNm0pwj2QobJj6hC3l/5Ophn8/q3H0aZUNL38ZUF7gY9Sch6Sz1wKUFi4lED+bgbs4YdogNK3fug==; 5:RqpHFj/anxefLAaHz7nO9pjaJIx9LjGCTFzAHpKY9Meks1VG+HxECA0LFZrHwCqdH7N9gPFRodSuLiwhhgjge4DgQBVMSFjCrrgZpHeSDBnSXpt4LoeiOql4AI1ckpTt1/fUBkWEg0ky3BcfJjtfoAeEszLxnNChAOEkgGjjdcA=; 24:t+UfEQwwN5CsLWVEFDtOI6qPaOMAZE2SjuliJKjAEJ11UPp2BpfxdsCDZSyjmADsy/5B6qxHgkKMX8YS0ytGf/CpgH5Fsd0BkPrCBiQwdWA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4213; 7:j4e82gVdptxI3QuMVCEGAg6GSAUxJ/zQv25aeaNRhmPom2hcwZWnkBXPdKKu+2i61fIyasTy7f0w9zNsLXeXJUuB/eQr0FPLPNDbHzmDxBuM4M9YshjuGESTlK/ukYFroqSj+b8nJdbKqQpEZxSqJcbN5RhE4KsTc03VFjaq0G1dZRJk5FgoPp1fT+lrxrodzReiBBXY8Md/aHC2FECDB7x7KP8FjmMxJy1npCyPK8KM+JeUoUirWVhvmmjo9gbk X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2018 00:37:38.7639 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 750207b5-b781-4938-b5f2-08d5911f7232 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR07MB4213 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Intiyaz Basha Using skb_iq function for deriving queue from skb Signed-off-by: Intiyaz Basha Acked-by: Derek Chickles Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 3 +-- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 78f6794..2558a94 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -2528,8 +2528,7 @@ static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev) lio = GET_LIO(netdev); oct = lio->oct_dev; - q_idx = skb->queue_mapping; - q_idx = (q_idx % (lio->linfo.num_txpciq)); + q_idx = skb_iq(lio, skb); tag = q_idx; iq_no = lio->linfo.txpciq[q_idx].s.q_no; diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index 5ab0831..478c20a 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -1604,8 +1604,7 @@ static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev) lio = GET_LIO(netdev); oct = lio->oct_dev; - q_idx = skb->queue_mapping; - q_idx = (q_idx % (lio->linfo.num_txpciq)); + q_idx = skb_iq(lio, skb); tag = q_idx; iq_no = lio->linfo.txpciq[q_idx].s.q_no; From patchwork Sat Mar 24 00:37:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 890353 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=none (p=none dis=none) header.from=cavium.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="Pdv2kORi"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 407M2C2HZyz9s0y for ; Sat, 24 Mar 2018 11:37:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752325AbeCXAhw (ORCPT ); Fri, 23 Mar 2018 20:37:52 -0400 Received: from mail-bn3nam01on0058.outbound.protection.outlook.com ([104.47.33.58]:60333 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752192AbeCXAhm (ORCPT ); Fri, 23 Mar 2018 20:37:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=5Rixr3iRLir0kUoYEWYuSWFkMF+KxyhBzkiMBiq2+WY=; b=Pdv2kORiVrH/yqnFPEMFYfS8A/jZhNZmVoB78dXd1QisoK+E6ta7T/AYLLIb91fN9dZ0fvCrU+sMdPgkTVPVpSWZA1Y+XS8U5SPRDi4a50DWDWyGvb82uQr1nRHZLODWcmLADosFShwZ5MUZpYx6H9vnP1ZREWwmBQKjQ5wwGdg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; Received: from localhost (50.233.148.156) by DM6PR07MB4217.namprd07.prod.outlook.com (2603:10b6:5:bd::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.609.10; Sat, 24 Mar 2018 00:37:41 +0000 Date: Fri, 23 Mar 2018 17:37:39 -0700 From: Felix Manlunas To: davem@davemloft.net Cc: netdev@vger.kernel.org, raghu.vatsavayi@cavium.com, derek.chickles@cavium.com, satananda.burla@cavium.com, intiyaz.basha@cavium.com Subject: [PATCH net-next 11/13] liquidio: Renamed txqs_wake to wake_txqs Message-ID: <20180324003739.GA6586@felix-thinkpad.cavium.com> References: <20180324003618.GA6457@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180324003618.GA6457@felix-thinkpad.cavium.com> User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: BYAPR03CA0014.namprd03.prod.outlook.com (2603:10b6:a02:a8::27) To DM6PR07MB4217.namprd07.prod.outlook.com (2603:10b6:5:bd::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 65b38b42-988b-4c70-5511-08d5911f73a8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM6PR07MB4217; X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4217; 3:bZr7NQYkUb81iZuZntzjRNBqtSmubQhS2sMOVAx53gCslkWb6VT84LI/uwrZruW68jkCKjwZoSUMs9XQ/l3TGksx9MhbuWHYHuY5/3/1/VhQIo0x3crEAiETgEY3FnTUzB9jpiemKYwHHWpmwGc8dQS8FMaNZe0n6FKPfdUxXjsfB0b0m9yyMjnBvyiy5bTv8qNz3JoYIX8LaHFvs5Ax/SoSsx5xekVlaTAuiIRTIXubsbESi0qmuYE9T5GXuqML; 25:55s+iA6EKYERx46LuH3Ae2FxLGUQyDxBlE8dxVX5MJ/HI262+Gv9TNFUBTwBaVITzdXFbD8ECW5SYjYHeITBoftpdZqx0S19q8ue9OyM5xtBm/QGZMdaFkb/KB5hhiTyeuGwVnWPuznwOVc23khEk+gvOr7kA0ivcHdeDeR/1D+tYd5m4m1Iix5MOKMKoQABnA8Hjp0Ed+HOkgdTGidVD5/+rQeJFVVGk+A+EN1DOjID7ZNlHGlF/4i+YQWnOoQCYJ/Cy2Gv5HKhseoocsmd0BH7UnmccmaWadjGG+/CrMzMUvF1PbItsXJt1KgQG+Ri8Htu0Hc1i4Pq8482oIXvQA==; 31:+Ugqxbe7+O231Gx22dgVgxFe0cCtnE6AqGGka6DpRRhhpFGVLuZTeL26KOCkMBQwiiEv9iVk84xdHOGN2X8dN338rhynbHP7A0QcKnZFP6NU2el6oatxvCeS35HZZ2S5efZPcYnuECZMRWelxIOf62hYy1KojYUDw2VQbaSG8jxs6AfYr4gM2viWUdsTAIXh/S7Is/eZNqeY56w+7FGyjuy5tyte4CM4o2YMzZcPZfM= X-MS-TrafficTypeDiagnostic: DM6PR07MB4217: X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4217; 20:dpuvKj7K1z2ezDSNDBr5IdtBeSDuaDdmZ2DLVG8p/QWRTcFGjF++xepNU9qfydiB9qwjtNpDJPF61BcqYQ7rvQvcOmFd+P1QZUUmh3wP9S+9lRx6GDAtmItufimwISYo/OzseFYy6o43LBb5xEZowGWMSrIK1aSN20MaNBv8cmrNT8RK0I791IlUC+H/1HagpiaJ5dmg0M28MtIIg3X3BEhQKtWF7tDvmNgpOsRWxLia+yq1JOaQCFKdk595+/4U2BHUZGMBS7y+duflB8BWW8oYmKTIWvNdm5og8KRnfO5PDQ+iwuZy12QccnJm/iOdKZTYO29XqEZxeuYXsBxCB3cyYJrVbFsdmXobsxBZhW6iItelZMGmq3ufn9TApb3MWZQzDMAi8WrPliytiesCJkNEPSTYCsw2jdky1jz/cw+6JsbxJo1uOz4qZ+F1pR/XybO2mEZOu56XRWKvhSR0ekNlsQlap7towUJaWWM2PNOwVIcVAJc9BWqRCWAMdISz; 4:+8ge/SuQI7qXV1FcacB/BIJGIxY2J50pJWUGEVEFu67n7wf1+OdYo1vJ58xT4vVQl7dt1W7kWE8PZ9VlXDBmPbyk6F7aFpUSBx5ZaYvZm9GV0uKGKOjKDzo1sndxNw87BTco0d/JDfDGMY+6HOt49aaL9//TS84kNZN1QAYXRB6iOQnT7rpTB2lD7UfReq17yMavw1UfQSULovTvyK9aveDGgpUXL6J1qEG5u3sUUr6gNf89ZFzjSSLsoX9OhxfFU/MbTXv8hLKyui/g8EW1tg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501327)(52105095)(93006095)(93001095)(10201501046)(3002001)(6041310)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:DM6PR07MB4217; BCL:0; PCL:0; RULEID:; SRVR:DM6PR07MB4217; X-Forefront-PRVS: 0621E7E436 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(39850400004)(366004)(346002)(376002)(396003)(39380400002)(189003)(199004)(81156014)(81166006)(25786009)(106356001)(6916009)(2361001)(386003)(2351001)(33656002)(76506005)(105586002)(7736002)(5660300001)(956004)(8676002)(2906002)(305945005)(186003)(4326008)(52116002)(53936002)(6496006)(446003)(11346002)(575784001)(16526019)(107886003)(68736007)(86362001)(478600001)(316002)(26005)(72206003)(47776003)(59450400001)(50466002)(3846002)(1076002)(6486002)(76176011)(6116002)(23726003)(16586007)(8936002)(66066001)(58126008)(97736004)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR07MB4217; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4217; 23:4yh4v6QwKilJPMWQzjot6FoXt/Yu3ay7AG29j7wIRq/RrpyJhsWWgTBM2URFrdjw1CWWDGi72Zpc9ttd6qEG/74ROeQpaFJMZAh/hqNNU94pTc95WiGX8lvCSO484/Sib0T0sPd7ZZTRNAlMo2AUpeck/i/hqh/gsb4PhnaoU7LQEkNdAeCUqomKvEwP3JFKgQDz0aB5z+O7yDut6Cn4MA7FNA9kG/KEkWF5yafGP27/HjThsm2Lnti5aDsPtyJCdYg7K5cdjDuBcJmp4VuPmAnDsQZIOSxf2NFyNsXRXdb9PrSXXST0aCcjYa/o0DCATe3tbYR4bRJa9Vm3j1HJdZSW2rdd05uEGpoz7UaseBMdryTkW4R4EipzWjwEVuaBRUWB8f+4IlgAjA/cdO8C5J9pKXO6wDIN9zxw/Mh3qAX48MMZDkBqnR3CO9kVJGQ7qKT8UYQGdQPwkrFbYSZCsN4VK3OW8Kedrjmb0/QObJ9/TvfkyRs6aTVqwuGaleTXlLqxVO7kTcyaegOzyFFu6I4yW6lRzcsbgfNd8Tb3fZx05/aR5XUc4cGx4wVFZj13tyFzaWfL5lYo3/XCA49rqbtYBTqvUGB9zoekp2ITlKNr3gEl08P0LsyIidJGiqtRBsIGBennkP6tCwI+Tc+JxxlmGsIlrEPzbk637nITpIoLoBcM4Rtlkl2rJooEt+AqABqntRxbZCYc8EIEt3hCR/p+O20/RjWhvDN/U/L6+YEy+kEjG7YRE49SizZZRjYTkJm/YtV9n91MI3kTx3OK6z3BFvbjdAwHFf4HQPI1YXD6U4gP+fwZL33wgsWf8iZy0XTHhgXU5PSr11IuSH7mLaaD/SDAnHbBEZzHWKsf7wR+Ho7WvQovWZq4GglW3kenvwPt+5tvQR7CBoCniKybWDea8tR1D2vvL4MckvK3s/JglbHtBy7dNtBksAaLMVj8Kk6RLKdNUGabeGH1Z3wLOhrOlcHycpXOhD89S6uuvVfK/LRFCbFWLjL+CEUIsZ6C+WBy5cfXVdBlwk3CkLn9WPrDabB4Qql6egglv4WsI+Ay6ma3M5XM3wLn/mQeFjpBcf76JQXoc3z2u6gRcSEEQ85lwC4senSCkH/ec/Gw6a+VDBvaT0rnVIK4h04YsvXAjezHmxtydqHqrt4SsuIlqRc7RzYiKJP7teiQfdW1REQc2xknFWKzTxBaMz0LXZw/rusx8niFHl2Milo/RK9LY8G4yUZKLYe+7WHOCz3ck9s7jBSfNQcWMOESmhYrrU07JZBRpXlxunD15OXL8+plmA== X-Microsoft-Antispam-Message-Info: +UhmhI5u8gmYJRBmQ8TgWqbtnKs4ynUwmsqHWY32TMmkV05MUUY3KqmCIQJVHYrrPOVpOIPZqbWZdN/smyWj56Lgx7M4NPrg0jBlqrP7wCWOketbh/M3oEOO+SLcR1COFmN0Pq6aVHmtjQszc+vw/c8VfoQdEwu6BB98wZYXvqwuSLy28mbtcJVd/XbvEkQY X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4217; 6:mX0HcvQtpwyMzzOh6XsNEHYx+KsCg3SQoc59A+/qWp0XNOwJAJUTN1m9Hc8R+4klb4dOBGLtoH3c4Ap+P1//UlZuVxhKB6GrvaDOq3hiBd//mNS8loco0C9EMOv08DzpQhfgRH5TQjhg0zAEfvJKKQsAVdzxXC50NndxwIbFIEYeLocVApeUVLyW7XjkUINMgYK8ygoR2jsaisMwq9zpTicROjvhKB36r+7mWmHUzjt+EEUlH1xxNfdJNXK6iq521a8D/evI5x7WBoYQWuwCH9djr4zh8aVpYSTaIHSNR0RlRUbLSpftuMlHmg1RJ94atrlMyya1TeySv3q/HV+T902S2u4/2bvGAXddQndjjvByjeTbwBNU1kIMzDA85Wy15ppH44m5qmtELZi5Lf3rYEWiB8AyQiKfu7f4mBFIZrn49aPW4k0WJy8yf9Vx48sR3onesnIPXEqsFEHdjXKNvg==; 5:Pi0yS1pphrQ5VS6YJuGjadb30V8Uf2f1Z4vYKmYtxwnchtxwKmAt2PY9BDHkK8/AooiJ2oDsXrMNIfoCowdN3aRObD3709aJVMlzc7ro3LV48CmPR3N/Ztjv79tyggAFdLJEFnhzYhKlw2RGrgAwQo49lKosWGVbkSfU4YObLqI=; 24:5osD23ZJki/O4KLAyC6TwhsIQ779rfOkfsHv+M6EsEqhfV5l8vZ068BovD4vyr8F7o2Ptk/1+o3e0K5KZG+ZwiIyRhtBR3ah/VWxa8ufYmk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4217; 7:o0MCRT3V1bQV/to1l0/K+AIPI1GoPUZvsUANOFjOTT3hiAXOQyjM13CG2RFcjjuAczFb+RhPbI1qHHlRk5sxneaQcRFJTIRcRMJ1azUkPhTJgNkY5v0QCQT6KA6hpIG/mFTI8A5It4+PyKFGzkVOcUW4/9y7IaTeumkK7klGcTnZuVYGnMkQuWwZNCj4WC0p92wP1skbk4oWdAMgGlme/+ljCAGgTawcWQ1fszpyaPV1pDgRVudOfKDjUsEsv9+x X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2018 00:37:41.1968 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 65b38b42-988b-4c70-5511-08d5911f73a8 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR07MB4217 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Intiyaz Basha For consistency renaming txqs_wake to wake_txqs Signed-off-by: Intiyaz Basha Acked-by: Derek Chickles Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 4 ++-- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 4 ++-- drivers/net/ethernet/cavium/liquidio/octeon_network.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 2558a94..8b0a080 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -777,7 +777,7 @@ static inline void update_link_status(struct net_device *netdev, if (lio->linfo.link.s.link_up) { dev_dbg(&oct->pci_dev->dev, "%s: link_up", __func__); netif_carrier_on(netdev); - txqs_wake(netdev); + wake_txqs(netdev); } else { dev_dbg(&oct->pci_dev->dev, "%s: link_off", __func__); netif_carrier_off(netdev); @@ -2763,7 +2763,7 @@ static void liquidio_tx_timeout(struct net_device *netdev) "Transmit timeout tx_dropped:%ld, waking up queues now!!\n", netdev->stats.tx_dropped); netif_trans_update(netdev); - txqs_wake(netdev); + wake_txqs(netdev); } static int liquidio_vlan_rx_add_vid(struct net_device *netdev, diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index 478c20a..288096b 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -515,7 +515,7 @@ static void update_link_status(struct net_device *netdev, if (lio->linfo.link.s.link_up) { netif_carrier_on(netdev); - txqs_wake(netdev); + wake_txqs(netdev); } else { netif_carrier_off(netdev); txqs_stop(netdev); @@ -1822,7 +1822,7 @@ static void liquidio_tx_timeout(struct net_device *netdev) "Transmit timeout tx_dropped:%ld, waking up queues now!!\n", netdev->stats.tx_dropped); netif_trans_update(netdev); - txqs_wake(netdev); + wake_txqs(netdev); } static int diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_network.h b/drivers/net/ethernet/cavium/liquidio/octeon_network.h index 7922a69..3cbc65a 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_network.h +++ b/drivers/net/ethernet/cavium/liquidio/octeon_network.h @@ -522,7 +522,7 @@ static inline void txqs_stop(struct net_device *netdev) * \brief Wake Tx queues * @param netdev network device */ -static inline void txqs_wake(struct net_device *netdev) +static inline void wake_txqs(struct net_device *netdev) { struct lio *lio = GET_LIO(netdev); int i, qno; From patchwork Sat Mar 24 00:37:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 890352 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=none (p=none dis=none) header.from=cavium.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="H5Wx8B89"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 407M2B0Qh0z9s0y for ; Sat, 24 Mar 2018 11:37:54 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752319AbeCXAhv (ORCPT ); Fri, 23 Mar 2018 20:37:51 -0400 Received: from mail-cys01nam02on0068.outbound.protection.outlook.com ([104.47.37.68]:8096 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752266AbeCXAhp (ORCPT ); Fri, 23 Mar 2018 20:37:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Fvczh12GBxVajJhHy2/ZaALPcLrJn6lLxmK9z1OfrKA=; b=H5Wx8B89s9jrtCKhbtVC/3J0aNDk2zxmMJ7H35DoNWrqTfuKV4taKafhB/WO3fGwJSQ22gaMhoQXRqZPsYrPQ2tLOVGgau9P95+oTS91FW05SFuCzcqfxQbCA+1qVguAPizjHY4lXtVMEYTnBmYzz/moLeEs2xc5FeBPaPDSpos= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; Received: from localhost (50.233.148.156) by DM6PR07MB4220.namprd07.prod.outlook.com (2603:10b6:5:bd::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.609.10; Sat, 24 Mar 2018 00:37:44 +0000 Date: Fri, 23 Mar 2018 17:37:41 -0700 From: Felix Manlunas To: davem@davemloft.net Cc: netdev@vger.kernel.org, raghu.vatsavayi@cavium.com, derek.chickles@cavium.com, satananda.burla@cavium.com, intiyaz.basha@cavium.com Subject: [PATCH net-next 12/13] liquidio: Renamed txqs_stop to stop_txqs Message-ID: <20180324003741.GA6597@felix-thinkpad.cavium.com> References: <20180324003618.GA6457@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180324003618.GA6457@felix-thinkpad.cavium.com> User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: CO2PR04CA0063.namprd04.prod.outlook.com (2603:10b6:102:1::31) To DM6PR07MB4220.namprd07.prod.outlook.com (2603:10b6:5:bd::29) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ed9e7daf-f9a2-4a6f-45ce-08d5911f759e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM6PR07MB4220; X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 3:oLXmShyi61vH0a26NO/dr7xOSN+9CJISb07YViTuxkuGdN12bm/QOaBLsboDPaIVgqfABSAuPPVHYxFuGV0tSox9OgVejcIzFasx1ctvOEzscXvv2HVRU9mGF52VVRdqL4yz5uYXt7SHuBS355EQA4o2jNXCtiL+W8DgJPwh2MIx5BNjLV9vqnRfOPFgURtgI5v8+4K5SVjV6D8DXEIJu6Zy8lRX82dN63BKoFVDh4DzJztQ9/mBZUn31nWbfYpJ; 25:URi8Hjkb9PXXCcVZEhE5dEjJyjZKU3GD70HXFDM9mdNAckAJ8L2Vlms0Bm14X7TT0gLp0OxlI8xRGAz2MGpw4TS5nq6lixqQjGgyXDvaEn9tTG+n5XstHaCKHTzZGLnMO1iKycPUEwEYw4IPdpoAqqVuVQbGZ0LxcoFjo47pNS5TeSuJTWA1qbmiQb9agMEQbLVNkHRbsI+W81AShKRqKof4Ca+6C+wYEw+5vTWRH7dkxo3bPKBNvCDPJMsi2EKLjCVcru+Km3cpaMqr09/Uth7441ib6Ox3FvToZngrVShedAAslKIuDtifRWAs6yXjtdreSAj38pNPNvjccInDGQ==; 31:zVD3Ty2AnSqiWWM3lHFW9OTXx/61ibRThi/DufXaH5yyzAFggiPb4eEOWGgt4TXi/yiSqyaevT4jXDb/D6lHluR41eNXYjjjN+s2+F+FTHC8i+p0ALhY9j2TbhJh1H2M/mF5cl2oWtSKivIcvn1bhfhHIGY6nHmf1albJPtIThaKk57fr13NUwwY8yQeogLgVWo6dJbJuGBtPQD5jhbB+W7yc/SH9SJR5ZI4ofsUYRw= X-MS-TrafficTypeDiagnostic: DM6PR07MB4220: X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 20:k4c7/q5Dp7dhgCfJ3w8Bf1Jc8WnZjq0/pZm98lP6onCRQcdIe1NR0+eqZ/7waykVBg0KO2mXEoC4cMUWydFtKpteSXWE2X24tPfh2Vys+6oY7pI5WYEXZDYO/0IOausMaaKcveaTrxL+BmWz0gwLRpVqjqMsOYK4BPX0tK3/i0NGmHDufZ1AXbsuY39rKbNChgIIFHz+6VALuBz5snTtvXAOBvwCDMF+Yh6V3yQ1GphHJtmXTCgf1+tmwu4EuvDCgnU7OMJ09Gw938BjDVQjLyUBs6LLAJGGriLEvqWYLHXgHAiTgB21bZjFHhC6JSmSa1GYb7VY/oGKH1Rg0rxT6M6c9HKMf7C/p5ANUVNlu44S7q48T+aCFfjI7j2NpLb1qqQGaaYS1ct/Cr4htac1XUNPazz9ldUxGhYDyg8L/anD6JsnFgY5VOVzgZrVkJTQE3Y00gwwxLc7btMlTlQptvyEnuDjjyUEIFuMsGw6nk9v/6wsX7G9cxgRzzGkzNfh; 4:IiQRlbDl4uMi4BKAHZiybeWB6R2s52j0X0FUQiEVrxavJGK7BgQFlOmlI8d1pTsDyZfmQu+TXaz01JB1xBmNrLHzBo3pePrfgmF2NMQoJAoRQbQ16LABLQEBBqasWRS790quoI334MeNVpuw6mwvPuidcgPzM3ciHSPTOoCtCQe74mTHOwvheN9qcOwZswLLN1Y80o+smapx0cCZkzTFnGvmreotYmF13d300Se79TADLruTCHwuEpEZnm+OakM5rga1D4yN+tQObEtITVFXhQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(3231221)(944501327)(52105095)(6041310)(20161123564045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:DM6PR07MB4220; BCL:0; PCL:0; RULEID:; SRVR:DM6PR07MB4220; X-Forefront-PRVS: 0621E7E436 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(366004)(396003)(39380400002)(376002)(346002)(39850400004)(199004)(189003)(6496006)(446003)(66066001)(386003)(2906002)(1076002)(478600001)(47776003)(3846002)(52116002)(6116002)(23726003)(72206003)(59450400001)(50466002)(16586007)(6666003)(11346002)(316002)(956004)(97736004)(76176011)(58126008)(575784001)(86362001)(305945005)(8676002)(16526019)(5660300001)(2361001)(7736002)(8936002)(68736007)(186003)(6916009)(81156014)(2351001)(25786009)(76506005)(81166006)(26005)(107886003)(33656002)(6486002)(105586002)(4326008)(106356001)(53936002)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR07MB4220; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 23:aviARbVy30La9XsE6wW5CiDmSkj+eRWcwGeSgfC1JtBRqu2qTy0LCB+Oqgl6qNRz2h+3Bd0kDvJ35zkILroxYKqnuIbbG8rJ0xtvSYo3j0r2+aShwQM9nY+/JjJCRPpPEQFia3RuG64uTEmME0lWpeJWW38xqDnlTpruQm9iOU/yF04Yon08gC9jp6Ctcg8vyp45Geg2U1CCOC4Avj/jjstyufjlSrMPEWp/vVss1WHo79pMW/E64X/ZB5qFr+dxgNGEG0B529fx2/UQdt0elloW3NnornLL/wAuN65wYF52CMUc5kw4P3iV1IBfnZGfqJTwqWwaMzPW4+y8vwhHftLvsYSBFjv4Ksb9IJEL+HEJIrugHYommcCicvFASkVoJy7gCYu8jBP6p0fzllf71NPAj52Uu5q1W9d80TtL6kPZBoZFEnadUb9CQbcgBqJkkYogPrtXY3QfEZWCb3Dlhm1+UdwnYgmYzf24s7b+EgpNRIQbQdAL34ZGzjSlaKN93eFw1HywQ7/qMLn6xGx9PT6HytYWBOL7PaIN7GE7Qnk6Z2IEqyAFiYKyJ6VwzxAAkJPsmgjU5XkvdKE3tXBqZV7jY+KrmP613qr1/cH9oYkkrBapCbsLkFDOXKrNQGZYDZ+G1wkubKNUCgnDHrOaGV62/ZZZRzcbycay7Jht2+GMbQBd6IB7E7kn54FmiRDlJJLtj1hyrfKpEMoISKB9l7u40MJBImCcgAJQfsxpI5qx0ifD6N9MemnZQ/4V2e+uzYLqsFOXwuv6oNRzOZKcYF0p1hJc5QG8iMJc0NebnZR8sLNlLEhDnInnI9s7aiWmffD3IBhqeBu9Vq5+zfd0UO3JbesGXsy0GP/HRe80EK12Hw3BEqczq/ez9C3XVzBuaALBWW95Ov3uDAT+jYlk22TYtvwK9SHFsKSMzL4K1OOJFeHRakgIloAJQgg/no0K88kdXlMVAXBI/REW8oF+v0InGjudTCdO8iaAvFAvCQwndbEXogAYXZ14kDOpJUa4bc4VI7PkfcUHntiUUd+63hAi55dElf2asFKnCLOTaf74njSFj4bezDZP1kyDlWwy5Q+Zb75kt8zHgRampn0seyKeCn9dmI0LwoW3TD80mueb7wYiGKJEV90kxU1KYXtcOdg5MWF4Rpsr8nWFS7VKfO+bmwTNpdjY2eHrUMSmQrqtNdLAFNU0tBf5FTRp6GYciBODV2xFC7SjVDBr456Y2ItdA9tAXDToaUCRgcBwHNjuA73gklx0dnijvRHkinMo4yS+fnQV+38gh0/Mnmj87i92a0s6fAL9/xWoaZm0aZU= X-Microsoft-Antispam-Message-Info: w14qLn8poCtAiUcpuAStYhmbL+WWIENwsG+KnRURUqxQhTeQsL4XR67vENZddq1tI2Fg4pI+PJMecosrO7sqxsDPXCLH7TwgC8bn8M4nLcO6nxpFRWfiRyLw3c/Y2MPnprodebntALlIABITnsTmsjTlc4QYBEwMsf/q45PnjZXu8o4cJXzhyUZ5+44hxmpz X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 6:NubWpLTy2ck3QOCDnBXwKhHUsrOkyYr5nFmycJ0jxcUX4fErzgmYdM2FGdx3gJKQe0aY7caI/0p01faeRMOrsiT/oMnt5n5j1+9VlvhLmr7b8NCQeYm5Aecu5GmkjQxAdnvE7lyAsT3qVUQXXVlI2SthpUXGsGAwRmPAWlIRZyx7FkhY0dlP9MaZDq78waMwjnY/7GwbzMMMqhA7ZLpZwz5m1LTEZnpjURVvkZ1ooUEBGj2QUsdOaudnrzg2j4NBVNmNr9XV+0AsBc3EJDhyMpnZkEJzqabLpgxrW0JkNv1+ZMNdH+q/ET/hAc/ZsrMiWiHIzIiwF3e+umomdN9HD3IPXbeAevX49RHy164bJbX+qOr0sWsejLGyCRS3YoqJS/Nh5pVpSLoqy1Jmag04pgGYTEdbj23XvFYjNB/JzK01J4XsMLxycXEg/v5yZSRyN7+1zX61Qe8cl3mOTGfPOA==; 5:83JcPTzhG9hEIIeyWl38pNgDRXUsnds4YNlu/GemLeFcwT7D4ZW3HzzKSwcR+a6qkmPLZlNXYMd3pnZFIPxApDjTAPEzpmBIlsjKvcRR4RlLqHN2WXdPHTkncBHgaLVNqoFmk5i0zh87/KyrXLLQWQBX0emfKPobdKrPBM4yWvE=; 24:0W9CEsVVvXTwGmD9YIL6uHOkMM+5A4x6/H+i+Hu98CMdDv4Op9hztT4NcRcssUSD+UvTLJQRvGgO9QxrpJQauNcqDnBmdYgQV/MtURKPET4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 7:K7fwACOR1vN2n2W80KLyB5YOBwdjMkZ7/PhKEAtamjknOcSuMZXA2+U/Si4fRVzXToogqj1a05+YnUcjwwXi8Ic9NkLG6xf8dFXIaWOvkgE6819thZvB3ftoCtFTr+IOmqAU2g0aLLJCqlxGvgT3PNmWK//su0wx8+RfNJq5Y/yth2NtIP50F/28SVGaKhXwsLVgmDjIGqaF4HwurdsFAXJuc7chYqeGTTRZISdY9SwghOLMedjpdZPtYAKdWxtJ X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2018 00:37:44.4863 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ed9e7daf-f9a2-4a6f-45ce-08d5911f759e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR07MB4220 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Intiyaz Basha For consistency renaming txqs_stop to stop_txqs Signed-off-by: Intiyaz Basha Acked-by: Derek Chickles Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 4 ++-- drivers/net/ethernet/cavium/liquidio/octeon_network.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 8b0a080..54fd315 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -781,7 +781,7 @@ static inline void update_link_status(struct net_device *netdev, } else { dev_dbg(&oct->pci_dev->dev, "%s: link_off", __func__); netif_carrier_off(netdev); - txqs_stop(netdev); + stop_txqs(netdev); } if (lio->linfo.link.s.mtu != current_max_mtu) { netif_info(lio, probe, lio->netdev, "Max MTU changed from %d to %d\n", diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index 288096b..4d7a0ae 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -518,7 +518,7 @@ static void update_link_status(struct net_device *netdev, wake_txqs(netdev); } else { netif_carrier_off(netdev); - txqs_stop(netdev); + stop_txqs(netdev); } if (lio->linfo.link.s.mtu != current_max_mtu) { @@ -1186,7 +1186,7 @@ static int liquidio_stop(struct net_device *netdev) ifstate_reset(lio, LIO_IFSTATE_RUNNING); - txqs_stop(netdev); + stop_txqs(netdev); dev_info(&oct->pci_dev->dev, "%s interface is stopped\n", netdev->name); diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_network.h b/drivers/net/ethernet/cavium/liquidio/octeon_network.h index 3cbc65a..1b4c85a 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_network.h +++ b/drivers/net/ethernet/cavium/liquidio/octeon_network.h @@ -510,7 +510,7 @@ static inline int wait_for_pending_requests(struct octeon_device *oct) * \brief Stop Tx queues * @param netdev network device */ -static inline void txqs_stop(struct net_device *netdev) +static inline void stop_txqs(struct net_device *netdev) { int i; From patchwork Sat Mar 24 00:37:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 890354 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=none (p=none dis=none) header.from=cavium.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="gXHmIc2M"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 407M2L55KKz9s0y for ; Sat, 24 Mar 2018 11:38:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752346AbeCXAiA (ORCPT ); Fri, 23 Mar 2018 20:38:00 -0400 Received: from mail-sn1nam02on0069.outbound.protection.outlook.com ([104.47.36.69]:22304 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752307AbeCXAhu (ORCPT ); Fri, 23 Mar 2018 20:37:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Dnb24qL7AUU+5O7vcgq5Oi87qYicVN1bhuaS+7WZB8Y=; b=gXHmIc2MQuO4WD9EomiHMfopEfXew5qoutLstNretAU/yxvC92xV1fZRkQeL9d472DTovYpZN8NceHia8kn9r5CK0i7aLBCK1SpLAFlFL1NnOstNPR0bLKgawqHdRBY8hKS1aXCrX342G2kzICuLycyGEZc6KPyvwwSfb6wjhGs= Received: from localhost (50.233.148.156) by DM6PR07MB4218.namprd07.prod.outlook.com (2603:10b6:5:bd::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.609.10; Sat, 24 Mar 2018 00:37:49 +0000 Date: Fri, 23 Mar 2018 17:37:44 -0700 From: Felix Manlunas To: davem@davemloft.net Cc: netdev@vger.kernel.org, raghu.vatsavayi@cavium.com, derek.chickles@cavium.com, satananda.burla@cavium.com, intiyaz.basha@cavium.com Subject: [PATCH net-next 13/13] liquidio: Renamed txqs_start to start_txqs Message-ID: <20180324003744.GA6608@felix-thinkpad.cavium.com> References: <20180324003618.GA6457@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180324003618.GA6457@felix-thinkpad.cavium.com> User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: CO2PR04CA0108.namprd04.prod.outlook.com (2603:10b6:104:6::34) To DM6PR07MB4218.namprd07.prod.outlook.com (2603:10b6:5:bd::27) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5e080a97-c907-4838-4993-08d5911f785f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM6PR07MB4218; X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4218; 3:I03TaLMi+rzhzLTcLXOmF4NIOHrz5NgqiJy/g7Rww1MSkVpQwHR6aOCUdWMGDnMo/+vZF+Zbu53ZPxAovrumnI1ZryxQcLsRJDKcrBLVXNYzie0AvT+fod6rO6sfhIF229VJLeHdnQororZcI/nlzHx+ucHuqkPKABRujYAdRLcN+XtxrBN/D5OJPhk4VVn41+5aOU7UmHqRUspI7aAYwhX1igj69l12z+JYV5/h0OJtdhIymKI39f1aTiqTsTal; 25:qdoveSCPyfT9l4bvitQqCCZb7orwx3CJmK8rMvMfsLuW5b226Ud0Y/qxA5UfiAUPDmBCfoGlO04op89zsJYlIYp8oEm+bTZBKPoYNpykD/tyLmnREtmKH61l41Ce2HOf3k6qrXfiRocngN4rlimq1xjCzI0l4oOYQVC7kFefnUGrLN7qUy3W+ZKORiqReBS9wxuj6Sqzf3uDURiFbFB7L4ZIZ/21arscoZbiUEuW56OjkEoqUDQ+et7AKxJKOWcC7ESoA3VF6Xa9+QmlkhqcnvO6lTd0h4iCVdZ0DRdqxWdi+8wPIR3S8h0viRUjYAHVJ1Q5xcl5JuYiR+kNK8rLPw==; 31:PXP1aXEEqX0cW/eU7or5AgKUkfRUJY0I2WboLPNOY/m3l916twzNyPiy+9r3eZFV3SUvQRMI8aQCXRULfKgENgaKgPxK6usZ2w1pcW8E62RphFpbCmGjsRsLsrZbdMJ1n3VjLG0hN5yuiAiLlSPeov+nul9LpOj09OGQlhAP7GaI5n5YXzG3G69x4CMyStSqfv5Q5B/XjM7Hl54BrfRvSC1ABWW4G++E4EAABtpz5PU= X-MS-TrafficTypeDiagnostic: DM6PR07MB4218: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4218; 20:ZWaCg1LqmjsiS4FLlmxl/XC9hDZqOMpupcyo7nLHPU1j3WPJ+fe+hLwhhVe41aaEOZQQK0q05WzSSGHyWGQjNGvYOU/CxuRjfqbhVxA6ZCoTHPd0zp1s4woXWCLAaNfgkNzhAGsTqWA4Wwno1agIMha3XmSWhpg9aaFHOf5l+5AurZaRs6I2FkvkMDb9w2OJEOMnW3YqWZOx1LDCDRmw9Q7YmEyTxqK0kEjngdK7MQZdo5oSPpfi5x5S4NmaaSzZ8pV+JEv6RsrqNJmzpzIiBLZZ/WBm/flnYsTArgN20tYau+JA2CGFo5CO/sq0PnYQThKAhdKiivmWTgQsgLr/31SecbraVPe7sYUy2Mh2TpKPkJfJNwOZynASYJTw7mHj9VLvhptWVCGbkJ9I4So5cMkDQS5mcU0/EY5PtvONjPhwdTuv450WB9Y6lTp0XKm92BiEuUUR/HxX32/SrG6Huk01qfuaAqfKN6/dWo3gJm/T5+Ys0hWSrxv0BQQNUQ3c; 4:1dVuInPQouyLfapBbb8spweaB3jjsWpcsA3e/KDk7BGqCFHvINNEgTN6l8t377+o54Vynh4kWRH7Wf+cn69+PrMmlv+FXITTL/WxWgoqSmlb6cEvH04gLjOEx3kbH29am+Bz2GQgXp8J5eMz8w/K6Urbm4YjWmD8TO8EhytlmUJWh/xUcG2rNwOpyB49TxNFi7s1LO2l7pW9opTUm0UbPqXqVm8GnDHwtXGm4xJKwhnG+6ukLQq24DrSP8osp0pnG67hh1RZ6ka1RIYJcNiR6Q== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501327)(52105095)(93006095)(93001095)(10201501046)(3002001)(6041310)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:DM6PR07MB4218; BCL:0; PCL:0; RULEID:; SRVR:DM6PR07MB4218; X-Forefront-PRVS: 0621E7E436 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(346002)(376002)(396003)(39860400002)(39380400002)(366004)(199004)(189003)(478600001)(6666003)(5660300001)(25786009)(386003)(16526019)(186003)(316002)(97736004)(52116002)(11346002)(76176011)(16586007)(956004)(47776003)(6496006)(6916009)(72206003)(446003)(6486002)(81156014)(53936002)(106356001)(107886003)(50466002)(86362001)(575784001)(8936002)(33656002)(4326008)(26005)(2361001)(81166006)(2906002)(2351001)(8676002)(68736007)(105586002)(3846002)(7736002)(1076002)(305945005)(66066001)(76506005)(58126008)(23726003)(6116002)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR07MB4218; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4218; 23:xL3DDiSMlZFAiNKVpr+5JTEieiGYqTAa+DgF5P9jLjWlDEkICuvcXs+QjNHs0Di/Zlh8UtLI3dkPHy3YML70jGjyom5lxtbd+BOKAqd6mjwzBN4FYYRDzRvJZunfYdbnL5WMDDNyHVqZuQVnM/3sBN5KVxV+2glhh+ov7yKqwOKxfrscdnhcSQRe/xEHl6qJtLEaOtAmtcWUYxQcN4frBshvvK0OmH9bDyl0o0V8qGagDOOG9FeB9kSNuMAkUe+I15qovn7FCcy8cpMX1tqBQWXqSB3qz1Kc6P5vdPs+ZS2WDNJOilrq9Bpp3GpVsGmhromi8hQTw4xnK3Jv4tnCK5Rk635ZIeTYquSYhE9z/ryRw/bxrKV904/TAhiGhd2RfLZNvWRUBvSk4dvjonlGPfkeCOv41YCZiJhY+ufJeNk96yo7sm2YdyXHJyZ2dmotTf78wDexoJFjN6WAWf/MLzj2jR4MKfTS7MFyJVKPqnMwp8XDy1GXwSL9LjUx3mS8yaCDoSTyJqtljiSapebvhLCyQab7YzEiNarlhGLCcquqHgyuayTxDEAuuxTDdQKgl86aJI7KD+cxi8cHiIQj10eFvJlXHB8Pndnf+vrwhTbIHpww/ZttJIJonm5OmBZxRv7HX1btGRq0paauefS/fXt8SsSeU8HkeIEhz/qKwmsx6Fn1lZG9dSvaUkm7+xUSEmdYKmPCVOaDiYLG9IQh3L1/PVqSurDQk/cmPQRFzoLCBJMmow8G0UIPyrm5atV+th9PbGzzgueWZ70eoNDaS10sLYsEIXGg6WcSlPVcpy9/G9r94kmMfj+8hp1j2VFp5XLgitQ7nth3+EY51VRtqRVSsxUT9gIhJ/Rbdgi3W0AixF0Br2wXzMc85WDwx9zX7uaS6ZeuUYk4I9//timmizjnJBQaRmitGsqX1FpcoFJH7aeAFOuJlWp/Nfp61ngOF4DmWPT67smXaj6J9RRUdrfR0H764mzH3RTglo+ZW4pZwoAzCdyOFf4G+WlfF9VR9Oh5LS6n0RmIB8pNJTtkpf0Cwvz41DZDnPuyEbQejg0DVSBkC+JalVNG3RUKWwPS3uob555/rwEo+tmTyZH1to0fS4oxAGSVgnkCNITsQ7rRWMg2tenNzw2kjG44D4Of7L9fxXOei2GqzofpwvCEnvzj4i2xeHFwQnUCqrOkIlfMcat1v0WOToB8m+s340x/U8c/jcN7mYLOZHGaShL5A8aewOB3FTJzTMCktzV7IEqcbxGMwvRxWiS7JgovMNBR X-Microsoft-Antispam-Message-Info: 8BRJtPplrpzBUZAXz0n2JyoTictBUAELBkej0fxmsP7KD3MFlSk2yG2kZeq7bIQfy0gk+eHfN7JNDtLGhRev3ajb5mh7UAeIAwxuPaGU+QnFLOd6bVEjyNW+yRcRTu3sG1eAjvlG0uGVz5ZB8UAcqQgkO+dAxTNhs1cLBJzlCrPe5IbNggH/u2vUQS/4SZaY X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4218; 6:kJXRM0eYmGMmEkWG/wqtVpJP92tr84AfgrkGR32UbespdTmKICEiYXFqWswGmpB0F0ERF08Z6DKu1Dp7KllfnHQkjIbd1pytEPHrG5WXL/OYy2qn2cxqKDCOh1fZ6jqGhSsswpDi9jmYyVWUbcivcygLMXP1wvYsjnUL8AQSEjpDCqm3zaOK80DUmXtwv6bJEoDE9UUQDY3qPzcu56ab1Of4DyZI+1ZCVDg2cdGZWGbPE80SYJzAJvskZQPtZS6bnmJu4N7ATWg6r4oMGyEpXIfD/7hV7Y6BUN8XSpS1MatYryer5LCiJph1cA9Wm80B0uINIfZ6WkUNaSJ2ZHBJJ5dulli63R1zQxtFzU0QxJEkVCctjOrWUhV+lPCI+o8JBC/8sz3FeV/LRNusouaq5jJA7K0Qd6mo7MjmfUMQzOnF1K8zRPbcARZb3Gam/DRpuAkGV7/+pOowzzAra90unA==; 5:Fs69u9fVRrgkbAWBf2rKzkamG+5vSEQaW6J3dCFPCn1P0/npD4fUn29vgKfvKzZvET5WjJuAigO48WA5HCdgJZr3w33LEp/w2k0Qn6Nnsq48pm4caDn53cj407edHDOKc4rvnL3jqF21oRqcUzGawwjj901DnCVes/WRoXoOdCM=; 24:H1zlsYoplY4Iii10nTIQT4vNYeS/4cYH5uAOF+XREvZhLy2eqq0mXfMqmTL0/Ullsu+CsJZeA+2+VWzYvfQKlWBsKyqFNglJfTl36OFKfDs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4218; 7:jQgbs094DZSGKUqELVD3PF+K1dERUdWg3o8UpUPV+7WE8iRLBaq7hz42DHVuy+pPsHvb0pEcbe8F99usUVzrYM3BXq6fti6VNEwDMp+r17ibjN/AX9ihGoWingzbpLd0qWkcuTQ1hVi7Qr18c4t3YGAdUYQP5q0+2XB7IrTu2AbmXFAJ5XrbV0kJgA/eSWM8kwrIJECDIHLcTkVFwyXccCjCUnzuNHEQhEMHRhhRsK4oZzLhYyyi7odbE1K2+h3f X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2018 00:37:49.0442 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5e080a97-c907-4838-4993-08d5911f785f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR07MB4218 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Intiyaz Basha For consistency renaming txqs_start to start_txqs Signed-off-by: Intiyaz Basha Acked-by: Derek Chickles Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 2 +- drivers/net/ethernet/cavium/liquidio/octeon_network.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 54fd315..ba3ca02 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -2086,7 +2086,7 @@ static int liquidio_open(struct net_device *netdev) return -1; } - txqs_start(netdev); + start_txqs(netdev); /* tell Octeon to start forwarding packets to host */ send_rx_ctrl_cmd(lio, 1); diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index 4d7a0ae..d5f5c9a 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -1144,7 +1144,7 @@ static int liquidio_open(struct net_device *netdev) lio->intf_open = 1; netif_info(lio, ifup, lio->netdev, "Interface Open, ready for traffic\n"); - txqs_start(netdev); + start_txqs(netdev); /* tell Octeon to start forwarding packets to host */ send_rx_ctrl_cmd(lio, 1); diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_network.h b/drivers/net/ethernet/cavium/liquidio/octeon_network.h index 1b4c85a..8782206 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_network.h +++ b/drivers/net/ethernet/cavium/liquidio/octeon_network.h @@ -542,7 +542,7 @@ static inline void wake_txqs(struct net_device *netdev) * \brief Start Tx queues * @param netdev network device */ -static inline void txqs_start(struct net_device *netdev) +static inline void start_txqs(struct net_device *netdev) { struct lio *lio = GET_LIO(netdev); int i;