From patchwork Sat Apr 28 06:32:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 906050 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="RWNMzUfP"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Y1Fv3gBkz9s06 for ; Sat, 28 Apr 2018 16:33:07 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933431AbeD1GdA (ORCPT ); Sat, 28 Apr 2018 02:33:00 -0400 Received: from mail-cys01nam02on0062.outbound.protection.outlook.com ([104.47.37.62]:48127 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932841AbeD1Gc4 (ORCPT ); Sat, 28 Apr 2018 02:32:56 -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=AzNavNa+OB94rEVcB7xBAmIL+uugVk60KEOLSmeY9fM=; b=RWNMzUfP6f08Owk4LDNfVQsQCPFTI/Cpawv0zM8Vez1ZcKdWMO6rZ/2jBsplvRJ/UWNvyoNqggGCKVCa3IzVFRdv45KyV/K+sm08G2zC+0sIqMqMUFg/rmjHH/vILN/0pggV6/H8pIqwxhIeKGrihF/B5QDeUAoEj+EYaXWqfvY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; Received: from localhost (50.233.148.156) by BN7PR07MB4210.namprd07.prod.outlook.com (2603:10b6:406:b2::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.715.18; Sat, 28 Apr 2018 06:32:54 +0000 Date: Fri, 27 Apr 2018 23:32:51 -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, felix.manlunas@cavium.com, intiyaz.basha@cavium.com Subject: [PATCH V2 net-next 4/6] liquidio: Moved common definition octnic_gather to octeon_network.h Message-ID: <20180428063251.GA3280@felix-thinkpad.cavium.com> References: <20180428063204.GA3229@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180428063204.GA3229@felix-thinkpad.cavium.com> User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: CO1PR15CA0109.namprd15.prod.outlook.com (2603:10b6:101:21::29) To BN7PR07MB4210.namprd07.prod.outlook.com (2603:10b6:406:b2::12) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:BN7PR07MB4210; X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4210; 3:cIpvgo4E1Q2XBuamJBi8H9hgnJnkq6Xn43FCnJoPxnLwac76BxB+AyLOrUF6W5UV/IshRmI/G8yJiNPb3od37vfldhN72iIN03/34iPDl6XkmJVTGq7MCa5orpt0G5hdKCL+HJw5haL9M2ssG/yqbQs8cIgL0cmCj+qx5XJNxYuHqyAlbRdFuMInVeUganLe4l69h5uC6YWH/+Kdm+4l2OlK1prnvu6jTxmXiPK8v4T1QsSSzIJwlZ18vQlR+uET; 25:tlpHJlifnVlmTMyvMpnJZOyLBu3OuNQ79w9raj16Vhdmn6I/9lfqekrencLfVpUOAocqRVM8WRljc6SDNeYvUU35PybCE5nJtB17Ss9ufw7Zcg+YzH1RpSwe0E4FIGNKsW/7r7gwydsFFMqfQiKqlQRmSCh+UmGgXKHaDx4+Ri+qJR7mjfv18NXXRERqI/ZyQrpD1d/2td/N3/PeO+ikk5Mc2D4EoGzc+59vkv5OsybVQRQnaqdRj2qeulNaaJO8eHkYNeekTOIxZqnfTKgK1DOgND8GrvtFzhaknvcHb4yR/c/rQc8G++/Zh4bFavg96nct81y7+fyS9wvMWEvMVA==; 31:Xf+83kip3tPX+CZWFWpEN+vgguHWlPHhlumV8CMzGLfoXeqASpUz8vv/Alp7xJUr+8hpi+g1fGThEcvLKUK2qXxDWMIFCI/l02BO085+PGPTzOX/FcgnomRlA+GJzpDPl2PpwG89dvcQBdBqRMVIr3my69o15urKI37zO6mEk0dQ4PA7+GTNxHtmm/Lx7XeQCSFdBFSan9Fmou5eJ3F9QidGrc9iZJUamTYEdMffuNE= X-MS-TrafficTypeDiagnostic: BN7PR07MB4210: X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4210; 20:koQAtkttYAEXz3IK7gMaiqDU31Eso7LHjDTGy5ueNV4VebtBjYCzu59q1upMdARFLYoRp89QcQLQ2re9hwymGhCkIOnjIS2bXvi/7I3tEZMYrx9JiZqYHABnr9wIvECjlkMlIyeGo7AxaqPcgT42KGaXTDe8J7tC54K8QXwVfbqkhmLqoqnd2SqSSI/gbgBdhkoUORCpBwKykq9bOUPu+zsQA2/u5DZ8hJNlVH/zfL1yI9q/9saHAJnGbLqx5I5k8RUJj9vjP/z0Ct1agbZMdPl1lzxDthhCk022fdPpwEhZiA4paky+zr9gboiIdgdoj2LaMDjeoy/ecSnVTWtvlc7wz/tU6I7ilw6PH6itVq3zFTQ/upce+VPZLXJy3A0mFbCRs6AKYm/TNeelvzvRQXGYpjciqDPm00rFVlvXvU5oTXOTXMNVqnaDHSRwzqodOu3V7Du3LS2O9KPxkw1AGDciXzm1oamJAjVwpcRkapEoqC5wUfsA2vSCS9a3HVV2; 4:ZRJ31zx9qFxUCCgjQclJJznwWnRnxtrN4ENrlKIkrgsgRkU0QlovpFAuYBLbjAajdepDiUVuC6Wb1M+ljvCVtnUk5hTjnIwaHam7xu8hHHqVKzJ/2GpS7rIiCkH03Nw9mtXNJatGkc6mIS+5Gvq4IKIsDXIk7r+XqUEZtC21iLgSk2Dg+QF5t9MvCoczOq+Ejt7/LJxSjABIwZG1Zp41DjZyRTbXztD0LnjuVp/wP0hMT1jo2Q5CzrxKt3joARyOFl+nRM/PZvZrFCqua/tnIw== 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)(93006095)(93001095)(10201501046)(3231254)(944501410)(52105095)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123560045)(20161123558120)(6072148)(201708071742011); SRVR:BN7PR07MB4210; BCL:0; PCL:0; RULEID:; SRVR:BN7PR07MB4210; X-Forefront-PRVS: 0656A4403B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(396003)(346002)(376002)(39380400002)(39860400002)(366004)(189003)(199004)(575784001)(97736004)(68736007)(33656002)(2906002)(2361001)(6486002)(16586007)(316002)(6916009)(107886003)(6666003)(86362001)(50466002)(2351001)(58126008)(105586002)(5660300001)(8676002)(106356001)(186003)(81156014)(53936002)(16526019)(81166006)(1076002)(76176011)(6496006)(25786009)(386003)(26005)(6116002)(76506005)(8936002)(52116002)(72206003)(305945005)(66066001)(478600001)(47776003)(476003)(7736002)(956004)(3846002)(486006)(446003)(11346002)(23726003)(44832011)(4326008)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN7PR07MB4210; H:localhost; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4210; 23:AMrjbiIegB87LetMOO1P6aBZjR7XtXBD1ncA48sqis6VevuWYMV7qMbfvH7fDFvdXsfEjf7WJjeQi33YJqdXG7iQHYZUn4eMZ1DLpcTzARxQ/xb5zjzW1UyXNl1rZq/YQrUAD6yMO74BH7g9SuI1Ysnk6ci3TC0YS5Y2wv66Nq56OA1M+J64WgC8m2Ea0vMEhdm9T74YXtT5DN7+kZw+k3ezcyH+JRJd2SGsqx7ad/S5gCCo7PJ0jpIyco6aRmkhIeXfXsQtvnr0Tf3DpPJMsH+JeeyZ/kMqpE5LkYef2sGwcVaVzCFiz49KYVfrJxUQMfC50LQ4xVZ5yBiy3OEU+cmIQy9+Po/a1LHbEsJ9xflLH8FAUpqXtgJi9JsKmWWMYNHHmA02ps0akF3VpCFrHfkypr93msS1wn8GFGu3FxMB6Xjoas3eM8uKPkjqIgQdM4evpBBuCqFPT9qaSJaY0VZIZMoE7ovTco3HMhCRvcFse8I4bPRX8dx2aI0qJGhSaVcwasgCMkVSRA3ZX8SyyBouL+ccZPGG6KMEMgSNhtJQ16nHJ2RLJqvhHrA9Am28hUSyG0/mjf840QqdAxJ/UsBzeLToXCupffT/7DnpwMlJMraBPlRwgbxfrVEJwMlCJ5+h32AUxEqeep4nbpPwv/g8/e/1ZyMLYeHnOJL7Ae16LA1GlHL+lYsScilMXwn3sRshX904rOwjqZiIILYzclI+DbjPjBM+eHP/ElZLUXTeAZt9aHy4wvf753ZjA2EiSPqgWp0Fowbmt1HJ5fXSiAQ6j4qZWvtlk51tFJCoPjuvQW193cZiHzHicekON1AnhMjbR7M47Wzt9YqD1JAUwJQ+xVw6/4GJI3AieCOYg/7B6Jk2vqC+9llj2w6zuxoMffe7Zj6yjbmvDMfKvXMS7VfSstcbZg8HmGalypAgO/M1MxylgzZugw7p8SRT3tDNtebyBfuhZ3FaUVRBzDR/CqqbO/5PISlel0VADGYOJF2SbJ7lXZ1vdP/T21P/FJuizt0sGpRo0cHip+YgWbSQpDbtIFaKlMFUXqe7XszdDUxKY2Y7LCj7bAGGS9fvV94mx36wbloe9Xg8CtCbuAp1dW250Tj0/U7v8ate0M8H9W57DcvpBU6NEl0AYKugZzLE/cB6HEZtkoInd8GqxPv7zsuV88eXopROV6T411sCmybfo5KjZ+X9ekvF5dOryAmOZnRruxw9BHTBaf/Um/nJCzQajFrRuNtPzoRYyB3Q6ipRjM23Y1vBXAoz6x/aBOKV6uLuI0YuOiVw6UvR0Up3oexXAnUpl3Nvx6Mogbg8//QEpSnDlEGS9jO7RBxWqpWJ X-Microsoft-Antispam-Message-Info: i665mIXKC7phwC/9Y77ZewyS/os7zje4Ta2bz8BHeQP+yKFeVgt/atIwFeIJSuRe1ysTb0YufSmAm7S4vH5SomGc4nk1iLq1ReK3E7C77cPbNvD4sEY8PsqE18WSWUlaQHeDbW6vdFu4p2IN150+SoCX85/7uRq8Jrniie12oQBHaYPoblHtT8T/xuBuFWlN X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4210; 6:uvkjLMygXwP9S674c2xf4yStMgi7gyMYglS8SxRjCQyZHqyPQC9cfrJAnCkl2JPoeKmEgmExNxj86nq26F0ctNYukCfTvOHTrTf1btpZqkUxLeYIVoiViHurOUY68MAEVIfHGhE2TKfii1qv/J+ZoVS+bUehd8hJkzpczOFlAxVoCoz7BOwu+LG9Z0LdmkHS+wIiAFWH631jRQAeZHEFBy7AGDrIcz22RmAwjNRWWPU7pDF4DxirFzgvpq32QPqHj5hCUq6qKFrjAPWA76+ilTJw48pkcUeH6PgWdu0QcCPBBOA/QIsHFDjcjeqAmV62ZJnfCRFnerQ8ukEBrHzcx+UPV1hkukYyWjBYAuZkNEgot6jVy15p/JfhnyQTP0fPOCPq+05VshPsz3CKgDpsTcXpWvmUetx3V7USkfXsCtYtrfh0RHlWDGgXZ/A4KJFA3c4DMddflrRRYp6DKtFBwA==; 5:ebnqRr4aBX740hi4V2woou8ze53EntPjdaKzQ4OI4CpSu8/2YgZ0KS4/yQMFX0D6y97O2HRvELWrIDJEYzWUXdtpQBXwqkTTlwdZD/1luWJara8EXq9nWjppELlHH/6fJSak+RJvXSAxI2HZVcAh4eYKEaWAslRUFf5mJq3szBU=; 24:iP+dAR7ehuUWMtEjfyzUlC4sW+qYwjvpX2twQyFCzGiPOyOJdMB+HxtsOQHnudnsq4kcF0Zp8vmpiKPB6dikOF3XvD7EAkbTCccQfjIWTVY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4210; 7:XvTnDc1wPUEfzqqhggwL5DWDY6weba0OyFUypvIte7AXNeoquyhK7oQHtyl5Esu/Pjw8HRXGk4ZcgQlqz0gUtwexh62KALcOVOQhhCkT/ntvclZ5NKba62qYBrct5/pJW1AlnJbKPccSzM5wZSrYzCUf4ZDET2rsK++QAXpuhdUR0Eia6VJbeyRE+pOhyE5lbc3jElGzLy5EBcYbIdJ+eDHB+WNFwf3UHKvUpH3cP6Ezh2ifDnlDNPLz/92TIYGN X-MS-Office365-Filtering-Correlation-Id: b7d47ae7-33a6-4a75-04cb-08d5acd1e018 X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2018 06:32:54.8262 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b7d47ae7-33a6-4a75-04cb-08d5acd1e018 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR07MB4210 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Intiyaz Basha Moving common definition octnic_gather 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 | 21 --------------------- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 18 ------------------ .../net/ethernet/cavium/liquidio/octeon_network.h | 21 +++++++++++++++++++++ 3 files changed, 21 insertions(+), 39 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index afe22b2..c0bd489 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -144,27 +144,6 @@ union tx_info { #define OCTNIC_GSO_MAX_SIZE \ (CN23XX_DEFAULT_INPUT_JABBER - OCTNIC_GSO_MAX_HEADER_SIZE) -/** Structure of a node in list of gather components maintained by - * NIC driver for each network device. - */ -struct octnic_gather { - /** List manipulation. Next and prev pointers. */ - struct list_head list; - - /** Size of the gather component at sg in bytes. */ - int sg_size; - - /** Number of bytes that sg was adjusted to make it 8B-aligned. */ - int adjust; - - /** Gather component that can accommodate max sized fragment list - * received from the IP layer. - */ - struct octeon_sg_entry *sg; - - dma_addr_t sg_dma_ptr; -}; - struct handshake { struct completion init; struct completion started; diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index dac2d29..8151d11 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -75,24 +75,6 @@ union tx_info { #define OCTNIC_GSO_MAX_SIZE \ (CN23XX_DEFAULT_INPUT_JABBER - OCTNIC_GSO_MAX_HEADER_SIZE) -struct octnic_gather { - /* List manipulation. Next and prev pointers. */ - struct list_head list; - - /* Size of the gather component at sg in bytes. */ - int sg_size; - - /* Number of bytes that sg was adjusted to make it 8B-aligned. */ - int adjust; - - /* Gather component that can accommodate max sized fragment list - * received from the IP layer. - */ - struct octeon_sg_entry *sg; - - dma_addr_t sg_dma_ptr; -}; - static int liquidio_vf_probe(struct pci_dev *pdev, const struct pci_device_id *ent); static void liquidio_vf_remove(struct pci_dev *pdev); diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_network.h b/drivers/net/ethernet/cavium/liquidio/octeon_network.h index 60db303..26961e1 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_network.h +++ b/drivers/net/ethernet/cavium/liquidio/octeon_network.h @@ -47,6 +47,27 @@ struct liquidio_if_cfg_resp { u64 status; }; +/* Structure of a node in list of gather components maintained by + * NIC driver for each network device. + */ +struct octnic_gather { + /* List manipulation. Next and prev pointers. */ + struct list_head list; + + /* Size of the gather component at sg in bytes. */ + int sg_size; + + /* Number of bytes that sg was adjusted to make it 8B-aligned. */ + int adjust; + + /* Gather component that can accommodate max sized fragment list + * received from the IP layer. + */ + struct octeon_sg_entry *sg; + + dma_addr_t sg_dma_ptr; +}; + struct oct_nic_stats_resp { u64 rh; struct oct_link_stats stats;