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