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