From patchwork Mon Aug 21 19:35:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 804141 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="L93w0MF6"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xbkS92fVVz9sRW for ; Tue, 22 Aug 2017 05:35:37 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753665AbdHUTff (ORCPT ); Mon, 21 Aug 2017 15:35:35 -0400 Received: from mail-by2nam01on0057.outbound.protection.outlook.com ([104.47.34.57]:59436 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753492AbdHUTfe (ORCPT ); Mon, 21 Aug 2017 15:35:34 -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=fUJYspobUBdd/O5OUpgfZXV7M3OcUmz3wOQQtntVfW8=; b=L93w0MF6DiKv7dmjx2Oz2I7awxdVlEAGHdN+WvoOft4/vjcZb8wuIkVrAMKKs7WXEEgqcNpbXseO8TxBVLzPi9tTloL2r68PMFFaW2WEPgMHetHooLhrzYcCsXd+h2AJ0iN8DhvfnI8D4R4VO8Alo1fn8y58ZkQa+kuJa6FTSzw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; Received: from localhost (50.233.148.156) by CY4PR07MB3173.namprd07.prod.outlook.com (10.172.115.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1362.18; Mon, 21 Aug 2017 19:35:31 +0000 Date: Mon, 21 Aug 2017 12:35: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, veerasenareddy.burru@cavium.com Subject: [PATCH V2 net-next 1/2] liquidio: move macro definition to a proper place Message-ID: <20170821193556.GA6118@felix-thinkpad.cavium.com> References: <20170821193527.GA6102@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20170821193527.GA6102@felix-thinkpad.cavium.com> User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: MWHPR14CA0046.namprd14.prod.outlook.com (10.171.142.160) To CY4PR07MB3173.namprd07.prod.outlook.com (10.172.115.139) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9b865b9e-3524-44b5-e505-08d4e8cbc934 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY4PR07MB3173; X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3173; 3:gXarQwqdaxQyO4r642h1X+jVMIGZ8HLSoQYHZqc4p/4zpEhrffH1BvvoVcuIHef5TYeAfzi3z1WRFk+pLgtjCAvGsNtcHB3mZE4NKAesMyP2GAkxYKy1XDmDDPE6ils4+9UHQxmL8i0c9yPOKPux/xtlleJ0PKZVFUMu5NXU1KG6ppQw6Y6oL6rzB3pYYGCX0TmMeXh+PxByGM039/Oz8soZPQnuF6qKkr4EEkOQROqj07fKcLTlnmSkBo7/FpSc; 25:FwLVR6eDSb+i4J6Yy5p+DtBnIEpJOhD/G6yoRKHHRSAbzZk1s0Re/bCyL2l9GEjPIzJ28Y+aZRL9axHj8kY7WgaUyYPemPB8stjc9ef6hYY+4jprudTLQh2yNasc0J4qhckn+RP0AX5EmvRDZBd8sQd1V00wOQHQqjtPGkvXBdcm8hgaJ7RhbsQYDFxnRXPo90mqxPmanF1ekiB4Q0jI1dfXLp7yqPIUvNBKIAFMMQz3OeLwPLeIHN12NJWrmH2QFaHfP+jwghTRYCdtyt1xJ59G7P3cU4ghhvgpLwhdi9Nk1/8WEqeGMY/2fKE0tM19avd9RB2XWUgV++RNCed4mQ==; 31:Eqw/QwBxjgBo4ztuaXy/OqwujaXOajCreehnTUKHda06HwLNaizeuixUUpLR223j5Pu1N9MUnZS9UVWSDw459Ya47d4R5GbsRFPc/4Gafcd+CYKXuKJbO8jGNyaX3byI/ln9XF+Ou28HetsYc6W6I7Z7yL37r1bWhFa+Bqy/rDeFNv80xlYJW/PDdAwLkO+WMS3bpeQvtMFi7slaQA0sforWGpJ9kCDIeXYYB/SBZVs= X-MS-TrafficTypeDiagnostic: CY4PR07MB3173: X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3173; 20:j6x4wrmvHpCm42nwLrzixP06H9mwq9rt9AMaOJdN4yK78mI87hSnDArb/RBbMkIek1sU6u0jzH+s3M/2kk47nu2KMZpbDEd04eE2myD3ffCPC0UlMtoa+lQjSkXPNVRC0aR1TQHk1utY2t8BfN4mU2JXRaFBdrKXlfovV36OOclbBTR68T1GgOfDO+Rw3M2l4kXvjiQcqjANhtYOXLjf10iDRT76INhV2ZEL1b8cGWPPSSmumcqUMXDQm+rzkkVZ4uBEK56I3UG7wwGGukHh4ouyb10t78b3icQIMJlH0QQjaHrDAFgJj+5dMHZK4Z9bDkkhB2GEgIVJ+keY0tO2ylz83DrEJX69nMwAg1YT2+dNGi8NnafdiiYklwZ+kzVLjuOr/rJ4lcm/Zjg0YME/iWyxMwdN7VEPB7NCXBagWqMUmSRlwZqURwl17Fm+zrymiCFa8WkSJhTNmMy44aA979UtsGxy+Y8AmRsCmmr3omUGU2cBUqJjfcruXwCZjCAV; 4:QFJm1uR7rfZFQ4GGMwl2yiHso2ixn54XS2MSx5HTnnwLedHkj/ziYG2NJ4XC03mbBWwQgjISRynBZsrQzuQXvuXn4ykttWzQDJTLOO4ef3iagtEEEtG2QJPuW5d4+gZ00nkKMnRSmko2KmgxFE0EqMJcsRpbB5sHp5p1PThzdh91jCuNl79J7EigmERa0ES+RH0iZSRI+ncNEOmT6JnGbXldhhQ/BRz+Qc1L7i0KjGQSOfJFfyWIj8Cq/FcYg5Ai X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(100000703101)(100105400095)(3002001)(6041248)(20161123555025)(20161123562025)(20161123558100)(20161123564025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR07MB3173; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR07MB3173; X-Forefront-PRVS: 040655413E X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(7370300001)(6069001)(6009001)(189002)(199003)(2361001)(76176999)(305945005)(4001350100001)(97736004)(6916009)(54356999)(50986999)(7736002)(105586002)(6666003)(42186005)(76506005)(50466002)(2950100002)(6486002)(81156014)(101416001)(8676002)(2351001)(81166006)(7350300001)(106356001)(33656002)(1076002)(53936002)(47776003)(110136004)(107886003)(83506001)(68736007)(6496005)(6116002)(2906002)(23726003)(72206003)(3846002)(66066001)(4326008)(86362001)(25786009)(189998001)(478600001)(5660300001)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR07MB3173; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR07MB3173; 23:FbtzXGyYWl2ESNMdpbCq98jqdEZiqsD6R74rXsQh7?= =?us-ascii?Q?2IfV2wVl04rh95j/PZkIT9wvHQtb2ZOz5mJQy8ZmKpTig3Qs8sOmLBsNElES?= =?us-ascii?Q?1noUo1ROI1+elPE7PvJ8GBz8ec0D2U5u6HTI+skZ2SVMSvY8/7c8T0KMxHmW?= =?us-ascii?Q?a2ZjF4jdEddSSuHtTzLegxkk8RBjc85v8LKuAWTj3CHWUH8cPRsSDbCqMDP4?= =?us-ascii?Q?1/Fv13DGGGv3/RHPkYXF+Jgt+s21hJ2MyaA8taSEvaUd8Fue0GoQP+X7gOAx?= =?us-ascii?Q?pztd4N2JZpjEKjLBmwfUJRhmdP5ZCjAJaRP+5VOpc9E5XdA++O4GtwB7GqeL?= =?us-ascii?Q?c3nE7gGWapI8Y5fzaN4xtuRAQOEaw1QFLmMf1ZGCORPRWxnF0sdNBewpstcY?= =?us-ascii?Q?DSNJZrON2rWkQA67lmcToOVqU4Ws5VTgGL3nclALN5XGv4jzrgVldhdGMQNk?= =?us-ascii?Q?27KJlVr2IksSmqQoJkp/lwpvTgX7S1ugczu1pKnoxDobwCe3hKjtqomIxFsp?= =?us-ascii?Q?zJh1tpCTGju+u8T/zvfGYeNxw6YnwNxmL5oDfHiiZDUGULIgicIbne5Y3tnz?= =?us-ascii?Q?hm3nR1FbaNmS6JCG4VLFBUHBm/GjkoP53pXayjdbbsAtRZn8arI7ZUOSMvxT?= =?us-ascii?Q?7mDKR5Ljbd40/j4cv1w6XBMql8GpQFl41OiqHGYcJ2iI/FSqgBx86LkMHJzG?= =?us-ascii?Q?jhge4KWVfAgo4HoSlr8a2u8fVaHG+Hz1g2s5sZEGzYs57+4nlbUljFsOROTE?= =?us-ascii?Q?yGviszFyY7nYuoOA3Cfm7u6I+lb9FfDufgLs63eWxyFLZF2APdfXWS62nbZD?= =?us-ascii?Q?igaiZvg/EyBIU9tlujOmqXBVRf8G9nfmLtatMd4Sh1mhruVzAjjzpejQNxN+?= =?us-ascii?Q?yidNgZG2Tlv0j0n0Hd3YMIT7r9T2j0pVKD1MVsDv9uG35Oz2TIumJOCBA3pm?= =?us-ascii?Q?w/w8lv3thiSkBTqVulDW5gS38jxBBc/vDXoEePFnZcmCy2ON2slo0jR0Pc45?= =?us-ascii?Q?7RzNa+ujXJfE6UlnMtFOf++lUnbzYRy+s7B1uyObjaVX8tQS4/djIHzOtdAB?= =?us-ascii?Q?Z5KjKfqqkhhBxnwPIZ7F/CK0mG/VJdRAWSF0boTLQn7k3zmzF8O4N01vjOWj?= =?us-ascii?Q?wBlQvOp4DFlTg3ib4p3b5RgEQtootEf7q+2KmpdggTIk8+QVJrxo2iKVkcr0?= =?us-ascii?Q?GBFyVNFLAFoQjzW2z5mOYnZ7UIAWGY9STWxmT7d5i0lEyoIomdBCbLrjg=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3173; 6:CR4HkpYpolu+WA+zUIyEEQI35xaGCI8Md+X7j643myz3/SGhmzD2llVq5enmirJGwFUBrJg5790IUdVnDT6mdBE7oVviyn7qllD/jiIfyuTBb3rZocPoIxBRwmC0VX38BenwnMFF4lbdkLjjYzgqRHa8AQ5OIrBBfZlHc/+0qYC9Eup+Vj0vrHY2nlc+bFbDiLHxcbVVpgZ0tozOA6badHxi/3Fgx5REFaNecy0q1uyH5APUdL6+7pSYUow0ZSF2QcxMZKAs/qRZEjN0n6NyiWvOo6OPbEKkFJksdqIFH3chot+bSUl+UQUXwedHqtqjJ1MBBcWCwPJZgdGIPwZvYQ==; 5:Cps99bk5wA9bn/usD4G6VgXpKeDz6NeE6iF0UpZ0x0p7QbByCxfEUCDXhTVSoTjDAu3RdZ/SM5rKn9nCBJxNlxY/OWku6Iw/2wHFkesDu+cCjDEyJwD7mP+faC3XYR3FHdw8aY6m9s4P+6cbPmbDJQ==; 24:L1zctbXNXPo2lXY3pk6WRhXhzwnDSNM9aUyl2wj8AN6KCPipH76e845jD1mbDlz4cYRnHd+BKV/HY5HmTRsXRc9JKa/9W4FiJ7jcx32TSkw=; 7:EMSi4s+VxznbI1Hvc3ofv51hCqI4RgbZREydKGfszQrqMrrls4JAEjBr46VQKklI1sWZl1JWb3O69mkLm9aWRf2tEFzaei8mH2NVT4UY/KfVwDl9vWTpU8b9VbNVDfUYxQWcny2sAmO8v6qxy5qHCvj84XNQX+BFYy+BW8tgX8B3jKYOhI3ANCP7FXbsPVnzYvAIzzDpTod2lZ8nBWqkDwyD14KS+g+ImX+3biiyEwk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2017 19:35:31.6333 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR07MB3173 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Veerasenareddy Burru The macro LIO_CMD_WAIT_TM is not specific to the PF driver; it can be used by the VF driver too, so move its definition from a PF-specific header file to one that's common to PF and VF. Signed-off-by: Veerasenareddy Burru Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h | 2 -- drivers/net/ethernet/cavium/liquidio/liquidio_common.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h b/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h index dee6046..2aba524 100644 --- a/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h +++ b/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h @@ -24,8 +24,6 @@ #include "cn23xx_pf_regs.h" -#define LIO_CMD_WAIT_TM 100 - /* Register address and configuration for a CN23XX devices. * If device specific changes need to be made then add a struct to include * device specific fields as shown in the commented section diff --git a/drivers/net/ethernet/cavium/liquidio/liquidio_common.h b/drivers/net/ethernet/cavium/liquidio/liquidio_common.h index 906e30a..d0076c1 100644 --- a/drivers/net/ethernet/cavium/liquidio/liquidio_common.h +++ b/drivers/net/ethernet/cavium/liquidio/liquidio_common.h @@ -237,6 +237,8 @@ static inline void add_sg_size(struct octeon_sg_entry *sg_entry, #define OCTNET_CMD_VLAN_FILTER_ENABLE 0x1 #define OCTNET_CMD_VLAN_FILTER_DISABLE 0x0 +#define LIO_CMD_WAIT_TM 100 + /* RX(packets coming from wire) Checksum verification flags */ /* TCP/UDP csum */ #define CNNIC_L4SUM_VERIFIED 0x1