From patchwork Fri Aug 18 18:35:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 803370 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="HqqSZoSL"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xYsFq1tkpz9t1t for ; Sat, 19 Aug 2017 04:35:11 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751537AbdHRSfJ (ORCPT ); Fri, 18 Aug 2017 14:35:09 -0400 Received: from mail-bl2nam02on0044.outbound.protection.outlook.com ([104.47.38.44]:51808 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750987AbdHRSfH (ORCPT ); Fri, 18 Aug 2017 14:35:07 -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=UeN2nDFlSpuFkBoLwkyvMhGLJLdLiglFbwIOSuqMraY=; b=HqqSZoSLjb0AMzXsV/VcVpabvZCLZpZSQ8R3YZEbmBYxkIJ0fOd+HxCb41QPoZU6KFy5MM4J7R/TVIKC7wg2TEeQdJzPRZKh96GvUgSfxMmuXrR8T8Dmk/8ldReisjaQHK8p/FWivuXJA2H+MFwmrpHZz81iIlkLrn0pnslw+I4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; Received: from localhost (50.233.148.156) by MWHPR07MB3182.namprd07.prod.outlook.com (10.172.96.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1341.21; Fri, 18 Aug 2017 18:35:04 +0000 Date: Fri, 18 Aug 2017 11:35:17 -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 net-next 1/2] liquidio: move macro definition to a proper place Message-ID: <20170818183517.GA4513@felix-thinkpad.cavium.com> References: <20170818183432.GA4487@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20170818183432.GA4487@felix-thinkpad.cavium.com> User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: MWHPR1701CA0019.namprd17.prod.outlook.com (10.172.58.29) To MWHPR07MB3182.namprd07.prod.outlook.com (10.172.96.140) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a3adcb77-0a55-4346-2692-08d4e667d849 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:MWHPR07MB3182; X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3182; 3:f8nfnYIvfkUgwpT9Iqn4pkWvT4n44rhB695N44Us+x4owKig08gBEp/HQePVkQGq/GdWUFGCmbYPk/pvi2tnbzm++j7fFDSdM2SROgnXQnOCJjc3bl19TVJLRQqfe6F00fuWLjP1YEnvHMRrXKIB89PfzR0byFMo9/MLm1pozZ7KCCFVvsVo7XxDrfWdXh8o0L63V3MZ4mJaL81dAKjVBYrxXxXb/Re5BLbrlhtWg8+8/gxSHcF8UQxiSo7TFugN; 25:xLlipy1ACexvilAdpHc849m0ZuZKJ0CXY+D5sS27SeOuoAkcDoyFDHq8g6YLT8kOqOD7joUz+mOCKrJz6cAbgQrl8lfJzPYNijGb79G4V+jbm+zjzNm4wth0xqzYd3r3uyPpnReaX1IMgzQ57oXJ0Ss3fMWfagr9ELb+HYgmNvblSc2ewtOnYK6YNjw9TqHjs2K1pXyH+n5QndXQ+W/l6YujaQAFcyETzZhscu1sEOaE+j2hFSx9UWX4jy+dhuEJCnJFC74jq3Vo3BByMgVcFkhJ6lheHKuyAGJ7DkgNXN4vYr5m3tZzxNYBTpcNPT3cyB8JxCuWVW/5Lz24KAH2uw==; 31:u125RLTAwgumUZ3TrtKnWKywQifvCpbqpjc9ejlfm6GsTqnexpULDQkWbQm9qEnXOGepVofVYJTZDvFMEE6PqxwYruTfJODQDN9tY1BQkHWNutvPbRF8i6sY+/ITlIj3b1/5/OsMh3CcqpKwtz6leTlUO9lRSs56gD+lWJfm6YiSkdLFIpXZQq70Ovz8TkUFSCCOFs9IOXz1LfBCZq4nb7cQVmqVr2V094UN3uURcLw= X-MS-TrafficTypeDiagnostic: MWHPR07MB3182: X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3182; 20:UmThwOqLQKLApZfkjNxiATU8B0885DS7fmeoeq/XKTkmf4hTp+y3FAmN33qydJZqAIKsUqSMuSA4jnzwsCaXZHQm9H+/tD2xxTtdL91KCQ5sg7OW0QoSqcEfd3hJv+XRdM0WkvU4xQhieoUvQOh6kaENJNtCZ2zUNaMWNFoKiDSzVCPWUUwXSIwNv7JqzddNbQfcmiMcfDqOpeMMQMUof1QESSJVO16W5KQTdP0jaNi8lKr071P83zrNecAAYTGEmBESTW0EOy0AO2FpzERf9/q9h17UBVS2EQvQcMy3+O6Xoj/R6izLA6aPVzEZ2HTfcjb1lA7ObYJOvkWShvs881xJJdHxzjuX56uU56uUV3DVknPUUQ63oPxNFnqgAjcJNd2IITVbr0DURKM+eLO8DG/fXq3ssU9J/tF0teJ/Qyyklqpg9M1c69ezRMwzDUefhtNiPBqg2+1o6rSo4o08q+y7cQPFMjGQGApXBVB+n3mZ+8cORtpFh115Dbf3oFeU; 4:w1jesrSXS6QUPAj9H3mJgOqlUHUVDCnefmJAoD09zU73v5fUFo7i0+xi8I+Hpygrwl7wBUOUE9ENtYCdXZ0ZTNZZTAmf2zmox395auSUr2jyxsDQTdj1PZfOukqejsnUjzU3/5cBREUlZxTesYaBHFniza8YywHR+6Ju1qDaHe1ub80e4Er5nvkoVhRuz+3HN9028B1hUV8VtcbxT3RPyP+ghEGSN+70lFnzaL+pbNWx6pxCAxmtVoC8nt3yYKf6 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)(8121501046)(5005006)(100000703101)(100105400095)(93006095)(93001095)(10201501046)(3002001)(6041248)(20161123564025)(20161123560025)(20161123558100)(20161123555025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR07MB3182; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR07MB3182; X-Forefront-PRVS: 040359335D X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(7370300001)(6009001)(6069001)(199003)(189002)(81166006)(6916009)(6666003)(2950100002)(7350300001)(54356999)(76176999)(50986999)(81156014)(101416001)(33656002)(5660300001)(8676002)(478600001)(53936002)(305945005)(47776003)(6496005)(42186005)(6116002)(1076002)(105586002)(7736002)(76506005)(23726003)(106356001)(66066001)(110136004)(2361001)(2351001)(3846002)(6486002)(72206003)(68736007)(4326008)(107886003)(86362001)(50466002)(189998001)(83506001)(25786009)(4001350100001)(97736004)(2906002)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR07MB3182; 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: =?us-ascii?Q?1; MWHPR07MB3182; 23:L8G7pz56Lz0FcEC6cfhSxoZoXCbeazeK2qPf7bW5Z?= =?us-ascii?Q?WaOaP7EzjLDuRhIM11/kVtWB3mbAJ3I52GnAmY2/sNoJ+R8LFQ6Cmv0ZQ4ui?= =?us-ascii?Q?vFNcXfu35d9sB83q84cosinon+2Kg0lxOGGR3ogdHt938NvzccOSmErOcNpo?= =?us-ascii?Q?Ed/JJjoOOjbY91gui2/HybQ4krWq+DNBMTD59RMRqxuxaI0i4sI4m4DDrhDU?= =?us-ascii?Q?7GDV/VZpZJd0xc3qRZ49vBkO4BQtHPPIF7Uh7ODivl4M98ZF4aNv1isk3JVB?= =?us-ascii?Q?6Y+4r6ya5v3kQi62ST7npm9scHpR2jZawDG5F0vbmDvvjvV+5OqKTsvrugqQ?= =?us-ascii?Q?HYirT3/S4y81klwsUa3gAg8Rkk3/fbwlGKY6XGbqiv1FR015V/TudMWKnRwa?= =?us-ascii?Q?row0n9A0NUIQ1cgjv4gNZ7MLFESSYnzfQffpjI1yY5q6Pl1FjrabkU+7GSDg?= =?us-ascii?Q?e/YHDflNkzOMFn+qmJxRMbZqQ9lESJpa5daYsD8X6OVjRtYMsgf343JdLI2+?= =?us-ascii?Q?tNazNfr79mdT1LA0RoPtCDOefginZlWWevNHN2wq7RDvSGDyOt+YiDwLEKRh?= =?us-ascii?Q?j5W+/aTZXPs4FwxeqtScDBchHGF1aFVCW36pn1ejdMirWGtOjEtILChxZgPe?= =?us-ascii?Q?+A49qZzWjh8sSTI2ht5NCmsX6ISm9i24cCYsSFP1ROwGTqeY41KN3jfcI5VS?= =?us-ascii?Q?ROlFe7/vyvOzkTTrwpu75NHl/IJDYC3/B+6DeJpjq3ggX0yoc2H+BOhIdn6i?= =?us-ascii?Q?jLS2E+j3iBZh44ORiXasQKWgF/8cFlGiQwdLqe2mKZgXCsJcZ81nLv7ZylGw?= =?us-ascii?Q?hb27BD8vGTtOLQ+a+bBASAHYepuEBjoxFHHCL/H2smJSWCh4/255QR8iMRqx?= =?us-ascii?Q?wjlMqgb0jo+W8TnMKQAGikYDEbZtzZb0U0sgw8dutluiAPmYjKgUCXE5+CEu?= =?us-ascii?Q?KFvbmwmwAu4cMCzMK+5o6hxQ4/JbHXDcMUZ9lzrhB0CBFz0efndYSPyeOrEQ?= =?us-ascii?Q?UGZZuRe8hwYW3EHfLNgqwPAdZ4OOH9K4wYd5dKTNEcZ/g3B8HBM30ug4lYEu?= =?us-ascii?Q?w15rCMqlyD8OELhfdI/3SN39J7EQJcVQjU1ttfns1r0iBkg+M1X/OHr5M+M4?= =?us-ascii?Q?0ENnI9doAfBFLfxeC7jv96TZWZL0+Z12D0ArmPknhm3kF1j4n7eHjmjWAhm8?= =?us-ascii?Q?AMqEHApaNnQ6DET1zZANoi9WndPgblkg50jhzhXcs2wZ76OtpKZ9JEXjg=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3182; 6:b+q0ERkCvtqLR7PTOS7bFGAoe680bvY+UPLZfryixnnOrOGO//od7OyC9+8n9Xt6BE/Lg1eeS9hQI/MWw8120aKeb9wjMRI1MvRbU1afqJLZWTixWauziKxCs/gtxYMGo7ugeTCMOiFPZQXPUP5dOytFY21hlRiIEiq+Ia+vj8QwQ7sqAeazvEkyUf1PfgVmJbQvK4VYbi/YzvgEcIDYRd701Z83ItI0f6dnw0KDyKV3rM/OUODwS5HdKQA8VgGHNOkcjLi5um2aqbd2J43VlvysGYG7lJpZy4Zgw5fNvArRPWcEe0T5BWHUx0UJ4OkNnX8QInjyNftv8TMOYUToTw==; 5:ygLd/sUUmHlhaVyw45976Lp0DPwW58Nf8+cteEIuRN2mXXlfKNnmC/MteK7AbjIXoX8Ps36n5KTgoE8cv9Puj6ef26w/0ai4kws5z2E1Sp+fQP86qR9CT6MFecR/zFJHbwvS59u5a/B7LAqA9sq14w==; 24:rsieJSacIIU4mQMKmSBa608DNlOrZuUDLusIsuISpz4beNSZdBjg1SVE4RvhDuNbFBLQkkRqaly8VMxqh1wozjE+a1lr78j2CPpQDfhr5i4=; 7:SqoM8DTMsTNiCBAmj8JeTXX6t8QW3KEXqcpIba8vT1GMC85i8r1JxNMJKxwguY7id1ieWfM4dvbIFW0D75diBSuKsAVINoj7qLL4723akRisPpliVNuV59ecVi8RoBUVn0Kn+Ux47OUUV6t2kDt3LjtTgdyOGXQYutuoBRf2/l6lGbwljaXDKWrDagwUA18t6SM54tWFH0pHrx91UT2ueFS5j25a5vO+cMgulstJpus= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2017 18:35:04.9681 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR07MB3182 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 18d2955..a2274e6 100644 --- a/drivers/net/ethernet/cavium/liquidio/liquidio_common.h +++ b/drivers/net/ethernet/cavium/liquidio/liquidio_common.h @@ -238,6 +238,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