From patchwork Wed Apr 25 18:23: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: 904657 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="c99lH/OL"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40WT9T2kMZz9s0v for ; Thu, 26 Apr 2018 04:23:57 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756475AbeDYSXz (ORCPT ); Wed, 25 Apr 2018 14:23:55 -0400 Received: from mail-by2nam01on0079.outbound.protection.outlook.com ([104.47.34.79]:30432 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756156AbeDYSXr (ORCPT ); Wed, 25 Apr 2018 14:23:47 -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=c99lH/OLefI+9aLUZxDNF5/jeKKoC5S4VxKhkKkncGobbBuRROY4DBjci1UUCVTuQT69if2JI+ALMQZKAnsBkEUv4/6M4t0ZD30rjTo3u8TOILJvjZSyMut0C2fhPHiVDVMvQSjvfboaaaxvik+mdegsgdZTd7FNpG0W2qlvDz8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; Received: from localhost (50.233.148.156) by DM6PR07MB4219.namprd07.prod.outlook.com (2603:10b6:5:bd::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.696.13; Wed, 25 Apr 2018 18:23:46 +0000 Date: Wed, 25 Apr 2018 11:23: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, felix.manlunas@cavium.com, intiyaz.basha@cavium.com Subject: [PATCH net-next 4/6] liquidio: Moved common definition octnic_gather to octeon_network.h Message-ID: <20180425182344.GA13889@felix-thinkpad.cavium.com> References: <20180425182301.GA13840@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180425182301.GA13840@felix-thinkpad.cavium.com> User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: BYAPR02CA0016.namprd02.prod.outlook.com (2603:10b6:a02:ee::29) To DM6PR07MB4219.namprd07.prod.outlook.com (2603:10b6:5:bd::28) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM6PR07MB4219; X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4219; 3:LyH+8u+sv2uUrYactBvfYEZDLVuX2WBeQnPZ+rbe8wQtzJzWaPw8k9DCeiZeKniwMNWUuZsqrkgmBF7bWapJZ74A/PTNjuBROh8mWZeyTU2tBIshcEXY/xHu9q4stGOWlNjYUHlGvqYiuvbpz1VdGIhie1ivCOx4qTKlg3poN6jlz5bsPDTgdum37ISUKrn9dAdcIsxnAwYZOSFKx3nQ2D6Zifvn2a4ONwbeBqm98z0j5PuOtWNkZnKGDPaXahUh; 25:S6pkf63kYEP8hCb73ufZLZ7qJorbBi7WqxKGGxg14P+B85Ob2AT3vovwriwK3Z5vqr4+9NB6e545mh5rJtGVfVYQD3J7livGoiuxgWAIhA0EGkYbeTQBOPTwFIn/AUsIEInJLi+sDZOqHT9hh80w6uVdG6UOsy74YQtq/RQDYEXlEMwHgu1ECRbMOA+Azt5OVQJJdvyE0fovQVGMunHPKHMpjjAuQX7e5ykVntUdDn/ZWhys3IIYhF+QIQ02MnwhMDDuiHjYeNya7dzNeKZU9ksIwVO7RGegI2o5Bi7PVjY8ZswqCCkigG6eaDd4okJOscQYSQsRFuxE7dEv2unKkg==; 31:8RUN760QqS+xXo2UuFpkJHxO12BAPJCzSZeTA5LVcUnM0aDHEe6v5HNsZE6wPhOANU3sqvB+NfUDtcbH5NAaJQxHhU5jtG4Vg2o6kwMXH7SQDQvUUiY3fkclc7ZHpoUx/VzFZ7ACkuEJm1i5A/kKgaHWDmkcLHUiMzykpdWRrDRpq4ztdaSIXTw1U6BQaibSh1+AZhWmrn7Xf5lPD/lukCj0++y1FNYa3SMS47MJZ08= X-MS-TrafficTypeDiagnostic: DM6PR07MB4219: X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4219; 20:RrkeZ3bmrWhCq4GYf6eVNeWMaZRU/W+sIxDAwUH417hTc80oidofuMTNMHvxURbhlY/DXlrMHkGyhzVtErMSWjm3J19rPO0Wj7NTXpMGsX11o+NcNqZ9uzmfKBliRMzCGKw40h79/4sMsVecxsbY4Jy7eI0jtVi9csfcO+6XtumySb7TivPI/iOgU+iTFAx/aY0ETDKFCC4ud1YQzzmEOlNMWpHEzlXcb2khksttM5G2b5w3gd5Nq8WzRtYDiLa+rGEn+xL+onnDgbz+dBuWttNf8edooIIySel+cgqp/gfWGVqJmNrv4SmLrET031VDkZVxjrCWaKJbtbO9zVFADTv8LfOORpKQ9PjYxjxgA0dTvZp0SlwyLKofivw34cWEi35K0+mjFzQrSb0rmvUMOm5aj3gVBZfzSIoVAD3kcBP6UO0+ySPw0Yb2kbIBKT8exp0Fs7j9s5O0EZ5cFKClGFLgGScBxK/A4F08YfhkSqqbI6Ho4J5NOv4ZPnRMpZLL; 4:En79sGjF6r1RxW6AYgVyxelMqd/PjTbyCPTZqbeWpc0c2H+i4Immmv4g6rYJ8DeCzo3lcwK9aJ6W6hH9JE/ClK3vQh0GNvzz96Xxn/RRU2EHvjIiI1XLD0WV0eGoVh4VQrbdkRYy+XaIluVPJ9XrN3lpBCKAf8GEeCiMg1EdJ6Kx1CkHfVmBFk/4zdr3ZOskKyaoktJqLDxyJetIBdu5saF0Huw9wMirO7nwvfJteHkm7/b8mNDGdiq50eJax2JK11eI3acIKh3DQXfsa81a9Q== 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)(10201501046)(3002001)(3231232)(944501410)(52105095)(93006095)(93001095)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6072148)(201708071742011); SRVR:DM6PR07MB4219; BCL:0; PCL:0; RULEID:; SRVR:DM6PR07MB4219; X-Forefront-PRVS: 06530126A4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(39850400004)(366004)(346002)(396003)(376002)(39380400002)(189003)(199004)(2361001)(68736007)(25786009)(44832011)(386003)(6916009)(76176011)(305945005)(7736002)(52116002)(53936002)(486006)(1076002)(2351001)(446003)(66066001)(50466002)(26005)(11346002)(33656002)(186003)(3846002)(6486002)(6496006)(23726003)(956004)(47776003)(6116002)(476003)(81166006)(81156014)(575784001)(86362001)(5660300001)(8676002)(316002)(97736004)(58126008)(16586007)(4326008)(106356001)(16526019)(107886003)(2906002)(8936002)(105586002)(76506005)(478600001)(72206003)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR07MB4219; 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; DM6PR07MB4219; 23:SHukNkJvnyWCxp6TG7lqnQFF+72oY+Q6lrOdukeKMXRYa6MtWEgFTaCzsTB5AHWGgkcK/l5RmPKxkSc+Q8jdLHCeFAOmJlcFIy1+RTyRaf/nEdP3JBUt1qHiW3ICTfVXlXzP+pmGzGYP66aj4ITKhLQGb7JCqIJu0lXkXaDVtNK/SSOfxdqqNlfQHI3ng6Y2VhTKVZXnzVkgiChwLI+80wrpLpZBiLsJQYHoeIbZijjKHQhAkK1MKi41gGxxW3Md8IMwmjkLbmRPvGWYgQMP7jAFo7wMn8Yr4pao4ElyCcmzao4Qy8D+tf+OnX5/uucjsV1OT3ezJwVCPRWsZXOLMrUDBeHC+SvQth4CehJXXW3ISlvm1Dh5tLEi9lNeYIlP27A998FSc6MqRvuByALRK3Z6p7G8rjJSPFhvFHXHshZutfDfnohebZpGEoDXPZiQiWjH+RbBgoYo5t17jbu7/+n86RbkLn+xNgoJSFKkiptukdXKL1j8XevhbxNEBmymUJFVF68K6tuprZMq1eubFBqRQ+qlZm5PRE1qzFoRc1wmouVEYimluaaifm3lIhiroPxsm79vKIPeVUyz4vja3rC4EvlRgITOKqoKDq/Yn+cseEdLPgxExomM533EHng0MtyjijUIo6dEr/8CDu2FIblqOz1VhxiIpL4nTQBnigDuheJK856b3bWFkBiTGptHOO4ScaodzJbpjylaNUqV11Z+BMWLVlgbx9KXpPQYE+ewPg0XdxF5RuT1AChkoWBeq01A4bABW5bNP7a1DpK594DI+mP8g+aA6sJd6sij38pPNQ1J9kmlo/GXanSm5ND8tzkxVklG2IefxwBxaUEQkNHHby1aFkuYXVGMdMkK+VuuR99jQJuRstSym02WF7QuOqgqpyDeORfmHTH5/b4Z9xJxI6IsIj8T0pF3JUd7gLpLj40+GeBaB1+hdsxH5t8DhP1ymivQPI2q9IbvJwIldpiD+1kjOgv2EW10zvOY1tedPATXuJ+kBgF10zVm3SZbrC/8E8dgfKH9c9mtNxLlPkSXyp8bH0YpxGP3K1lDFkoSPknf858EUJvI1fMkNjzF79ZRxnMB45zXoFSfZGMYsuYtoYqG9axlJfpiGwHkP/nYTb0zuzmh3k6hje3FnhFsptAU9CQR/ozZrsjoWZlqVSE3XbLotK+zwJjcCO1oeT2FisiLIrwKGxvhpSNrxXmjptZ94mlgjxGj+OCFV/OKtibE+SDwDBamIUT2SwqDxJlDmWQrElz3HXtK0LMPKiLUuVz8zreUCjEp2YhhbgCK7K6q85qya7vOecLdpbjyO74= X-Microsoft-Antispam-Message-Info: uk+0VMx5rX19APbeq9/9Jg4KHzBUFu2rtBy8t/8rYwXZ9+3g6iyctD6iqbMtvSdpxZIzMdyn8HE5g9e37Lqh0ArFuArXAaTeE8Z11eDf3bF376Jb/93vbFfpYG9fFyD4Si0s8IwNGDUzVgdfw6eZ0UboFsWzrSpS69tjHzmoxouG1SFYX04JJfWnpF62/qaa X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4219; 6:T5nBO1WV2hTZO/mMqSRvbbIFXGmz6H8k9DmsSsapkerpFmLsd64xiVWqfbKDarzKUPo1dGPBjUqarDeJuXKMqzGfNZWUwtNAvqPwpNa60y0fOtiRiDvGYq0eICwqdOfUeCWTXUpFvkt8R8umbXZx0zhP1PAY1MTDT/yHN0Tot4/E4oXgSyzF6AWR2NwKRNdQwIvopZzB3MEw9SiDkueYxP9DuKrFpqHKqNdzpXED8whuwpkCkCbLEPHGcH7Citzb9vbiCiqvBdAsd0tk67RzQL/e+QnjlBYZ353o9AjTCLqTCJ/xbBGR4BbGd7vTSXHl495j+HO6H1Kjbm34ybzAnUsTKspBeskibZLCE8ffPbCnn6065+/Gr5vQR3sBI41RzmeYtXdSj/FzU4rWMdiQVYxpvYhhPcOd9SJTlN2xmYmYS+DX3O4RtZJVC+uzcHx34FfAjqOW7fMtmVOTrkx9iA==; 5:5+ZcqfHHjnzuabmzDnBrE0PY1ilFBQiAICMRN9LLfJBvAp3qV1cwNiqHTnt8HV9yvGEGbkbFkxqwkRk8npcQsxcnI3EMi5pnnorXhac9HOP+ErOMmajpd8P/nvg2gxeOnsQuy7xvZFlclXujEWOjB5F+eB3Akds2/fboKlQy0wo=; 24:kMOwJJ+NWDubc4278wDjPYTuDOPlpocQQqXNCz6s9NBlNNkvblyckTK8hIoC85rBt+jl+9FYGvWr6A1/zy2cuvm4MblB5jwjGFBDPf9mGcI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4219; 7:oeDCy9wAiWHVb2rpj86KV6d1ueZQbdZj5zsrGsmtsjGCtjxbim0GrrPOBdrA9mKXt3jVvQ0H5AkZwQuTE4PwQI4/ELgjB2EWjKV9cfu8eNf98FGUa0h9wHQMgGHpJsMX+gotzFYYk2etHaCumZOo0uvExckAF2U39ma39Thj4T2zRVcp647OO/T6Rr+hxeoMjJAaayCMNdvXL8dOYB1hrJ88s6ulXpu+TQoAB7YwBk+UTqn/bmPDEJtOK8rrVkz9 X-MS-Office365-Filtering-Correlation-Id: fcb22023-bb2f-466a-19a4-08d5aad9aef4 X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2018 18:23:46.1713 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fcb22023-bb2f-466a-19a4-08d5aad9aef4 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR07MB4219 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;