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); + } } }