From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 43D7E4320F; Fri, 27 Oct 2023 05:01:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 408E140F16; Fri, 27 Oct 2023 05:00:37 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2135.outbound.protection.outlook.com [40.107.220.135]) by mails.dpdk.org (Postfix) with ESMTP id ED13B42831 for ; Fri, 27 Oct 2023 05:00:34 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JEXNRuuV8a3cAmmruDLLu/2r1VXPaysJ0v7f/2HqdKwwOfoHU3j3TkOhZRNy/9quZsX9oYbl5DsHo5achR5V6mEitkKgFfPItNb1rLSpc7KDvJeINIPcyyRNkqRSzM4YQeVdg7UoO10qTwk9Kq600JpDiQiKxwrYTCwI0eEFbB+OrOYMz3o/UYwEvdKJbvYmT8kNo1Ku4EymbUzlMMJCt+SdtfBn0qp5UkBP2y3xTj+i2IWkEE8V0U5uZ96YA8uLi+r0Ggg3olRmT05fahTSjdZXbvGJxiP1vTP/oOSrtIcHQZg8V3x3rkzpdb0NUlRtOzXa+67nymkrK5vp8MUqHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=E+Y2v4545WdH0I5Jn+ygzlalMWSTo3Rrl8LD6x3juNA=; b=GIBMhfVcndoLVzK1XibFrvRyaPwSAJE7tvc7aY0JuxfzEq2kAQHPkKyVFFE/Ww5VdxO7OR1BQabnVPlmXvM+RSfFM7vhQ45WPeoz6+VfZ8eMNNHJG+agesZtsOSXS5rRnwTTfGYDYYRTowqSTsqfLaR25/aF01yVzxEc1kT1KWxsR1xCRbgcUKZjWgLMEgwjn85jZlFmuuRXvodWe2JuxicIjN2aPoZDnYhr+IRURM5IvXkZbuKLjV7rSpPiYhcDk6ca9HjK2PJdMAHPpFH3gQ/MGhQZal8V/XNpLGuKQ3pY2zEadPVSamuNuh9mjldaOcLGfE6Zikr+1BMSdd4sVw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=E+Y2v4545WdH0I5Jn+ygzlalMWSTo3Rrl8LD6x3juNA=; b=uSZfG06cqFNufesdF0Rgo9cIZHrwRU4Q5VbCNr/6hmo6HXWo8RIllGB+JjoTeSPGrPy+GWYf79kIiETAOgyduppgKxkuT8YkBuNBgHsqSrsGBkpX1/PWpdshnHEACTdXEOWkG/Dt/GNLbQtmf2lZaU9tGGuWarrFJaVAa2GK4P8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by DM6PR13MB4493.namprd13.prod.outlook.com (2603:10b6:5:1b9::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Fri, 27 Oct 2023 03:00:30 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b%6]) with mapi id 15.20.6933.022; Fri, 27 Oct 2023 03:00:29 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH v4 03/24] net/nfp: rename net common module Date: Fri, 27 Oct 2023 10:59:40 +0800 Message-Id: <20231027030001.602639-4-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231027030001.602639-1-chaoyong.he@corigine.com> References: <20231026064324.177531-1-chaoyong.he@corigine.com> <20231027030001.602639-1-chaoyong.he@corigine.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: BYAPR08CA0065.namprd08.prod.outlook.com (2603:10b6:a03:117::42) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DM6PR13MB4493:EE_ X-MS-Office365-Filtering-Correlation-Id: 3903f46d-e46a-4566-3922-08dbd698e0ab X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MolITu/zSXHEY+OxP/NctRbeBNlLFdVw1pnzuqX6d0uQR7SL7RK22na0ORr+cqucn2qi/cDU56LfUlFrd8bE9pcjTjbgmaAWbDgh86qBndq+GiFELOh3igIgkQfQ9wOU17JCmqQCY/SbWid6nFsZcDV4d+jvEU8OMpnA3e60wYCBcGWSVVRGtm6pc28weTN65SpGPvQM6m5trK6krLxQFzrelsL0EOm0L3Pv1CKeHpg/YsLIQXcRUKFBVSyADWOiHVVhOadVYlZVLUQH9u6eFlE2nu789tLJ5+A1EBH9wCWYUsVZw0rzqmNkHYhn39xoJTLRkANVaA9ISutwGckalqs4HizoCYlna0xJ1IVRXC2ETOCjZt3dVhwHDbsP3JJXSrQlD7RzBkLsOGp38kS3HLjeoIe2S/1Nr9dsKnKNzldUT9s/oNfpdETij4Cja3Pdj3GlsP9I+p6RlW1PrDjf5mSc4sqjNcKSPO4Ni7KAa5iK3H8ykvzoYqe4KGe0UX7XsVagIvOu6P75pSxqo345Wy6bJPvrDnoT1QFnhqKSJ5KnvCvOB1cRacS5FSIK09ECjpNsEcthdGMuGQ2mKNcr+j8FvsxmNTwD+OAURnwGArEjQM6jYq1TCQ1FLuC1S5/NQbyWHktVaP8tPKmUiLyc32pd9l8dbUVFB0QH4JKd1Po= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(396003)(136003)(366004)(346002)(376002)(39840400004)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(38350700005)(83380400001)(4326008)(52116002)(2906002)(38100700002)(107886003)(44832011)(8936002)(26005)(2616005)(1076003)(36756003)(8676002)(54906003)(6666004)(5660300002)(66476007)(6916009)(6506007)(316002)(6486002)(6512007)(41300700001)(66556008)(66946007)(86362001)(478600001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?TYQ+h9NEjbP42F4OUx7Rre66ub9kTzPqH6sxvLcgpcFkzmBW+ec09zBbZ2rb?= =?us-ascii?Q?QwtzMzSZt1rdIyZmPmGaSD2ogwZVtHiaYkn7j2KGFeh9Fkb8TfpOzjLra7D1?= =?us-ascii?Q?swXpBLTTUh7qCflHIPu0rvCtM2SqK6EKqOu2Ey2jg0s0pUapKJFB1qMU3P6P?= =?us-ascii?Q?NXw8luJqJ23TcRu4NfdXPouKwY3gINfA329ylRnZy7yxpx93SY3xx/WPurfF?= =?us-ascii?Q?vIi6YAzMV7AHIMlgcnTaKLqE1BNfIvCt6Iz9HLPr1dZv+8fFl8g2zEudf+Ma?= =?us-ascii?Q?cBIMYJKHBY3LYZ3jyBPG0uzqe/GQYljbvsMxLkU/8S6mz4Gtp/y5yvqGOlwz?= =?us-ascii?Q?WU+XDU6iMqE2maSeN5dGtzeB9uelsWUdjYdswkiA5u/6IvmOFhQRVJM5lJWJ?= =?us-ascii?Q?8BnrGbcOP5psDVImp3BeDZekqN04KmJmQ8LKTfXroX2Yvnsfm8u/xUHzFCIc?= =?us-ascii?Q?l2+tNFTw1w9nbZWPFTH0iOdlOf/LMVplwl1g3kkkoaUbmKwsm2iPPaboLk3k?= =?us-ascii?Q?W5imnXhf7G9sBUNdOLzshsbPJfLkz8Drmovu0pPbxXvhrM13WZY8OoIwrwGD?= =?us-ascii?Q?/SzgqR1LXnQT6GiHV92uLZ486Uz+KfzhWbfOC+fi2GsxacYBObC8yUq60fei?= =?us-ascii?Q?1WGM/NI45Rs5RBDfyErdaHgnF+VTYfvueHGmP6x0fGYeAB7XhYFw1mLs840I?= =?us-ascii?Q?e00E5BYPOW/lEwc6l4oQ9x7eavX6x9FNnNL0rCzwOM+8dApAd0OV5lcg+n/w?= =?us-ascii?Q?qii7VaR+gMiyk8yncJ/E4SVQDfn6+XQAoZ6ia9Q2X5AcKOdSFuziJAhb8WCp?= =?us-ascii?Q?9iBrCdRx2MAAhqFwEB/XjfUiuhHu3gfhjr1M9B6cY0q8j/xjy6yba+6gPbEI?= =?us-ascii?Q?JKa6E4PopK2TgTlSuVFaeQNrd41PGeW456fPkURuBoO/Md+ViMUYBojpQSJX?= =?us-ascii?Q?3sxEL6xMGKxOj2Sg1XHztfcSdQ1v+iDm875ebStBsvFhsb539toc5/lzZdIX?= =?us-ascii?Q?Kyug6N+Hb7CE68tT1wvRQYfbxfV7u4RfE9e1YxO3Ym4ScU1kA62cXKu7x1SB?= =?us-ascii?Q?28nZWVHG8cVc7rilFXJ1n3TmFxllOCpLT1BUVMv+Hfr/6gds4bQiuWn5Nc6g?= =?us-ascii?Q?z/Cj+8P7qQIg/ZaTb2j+BzEQi9Z400J2BZ3zlNZcKc0VJV6LV4re172jvnr9?= =?us-ascii?Q?KIIrlyPRapSFkRUXnpsTNZNr1qCFEZoBQ3+eKmIb0X4Kr7WB5CpzcPQ2iVvo?= =?us-ascii?Q?BMNRGqBRfvngP0VfhZ/9IVsRz8xf0HWWtEz//lwLEc42T+Eoc5fwTnzOevmW?= =?us-ascii?Q?7TxI+tjVxznIW2DfQPYu11pdBnigLHoXRYaw1jdVA249VXIn2zvB4RVCMJ0r?= =?us-ascii?Q?XDiI5pFiZUectBHpcxcdmGlnkyGRblJBuTe0/DeA1nf6HCuR1yivtFhhCLXQ?= =?us-ascii?Q?1KvUCzrVRNBML7FZYF+EQDDnfDt4+TcpUrWCDo6DyDN6vpAIs3i2QzXtBdF4?= =?us-ascii?Q?S+9OgkCuXXiym8eLe8T8nCoWjwZU6PO9BJblOGH6f4E8vYUZviizbbzRATf5?= =?us-ascii?Q?oKktnU4uB43aLYYtFfEQb7AWIFmvWTofqXw9Kyk8WgglNWCux9wY0Nw1PzKh?= =?us-ascii?Q?0g=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3903f46d-e46a-4566-3922-08dbd698e0ab X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2023 03:00:29.8805 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: scupIXC8OIWVIxixSJ8Ergyx2nlMPrfiz4EWjg37FUXOkFNvvf4Yuu4CoXB1PrcBmFhx29NGzuq3YmGOeTs3LSVaD3JhrWEf3xTTH+4tWUs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB4493 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Rename the 'nfp_common' module into 'nfp_net_common' module, because which is more suitable and we will add 'nfp_common' module in the 'drivers/common/nfp' directory. Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/flower/nfp_flower.h | 2 +- drivers/net/nfp/meson.build | 2 +- drivers/net/nfp/nfp_cpp_bridge.h | 2 +- drivers/net/nfp/nfp_ctrl.c | 2 +- drivers/net/nfp/nfp_ethdev_vf.c | 2 +- drivers/net/nfp/nfp_flow.h | 2 +- drivers/net/nfp/nfp_ipsec.c | 2 +- drivers/net/nfp/{nfp_common.c => nfp_net_common.c} | 2 +- drivers/net/nfp/{nfp_common.h => nfp_net_common.h} | 6 +++--- 9 files changed, 11 insertions(+), 11 deletions(-) rename drivers/net/nfp/{nfp_common.c => nfp_net_common.c} (99%) rename drivers/net/nfp/{nfp_common.h => nfp_net_common.h} (99%) diff --git a/drivers/net/nfp/flower/nfp_flower.h b/drivers/net/nfp/flower/nfp_flower.h index b7ea830209..7d442e3cb2 100644 --- a/drivers/net/nfp/flower/nfp_flower.h +++ b/drivers/net/nfp/flower/nfp_flower.h @@ -6,7 +6,7 @@ #ifndef __NFP_FLOWER_H__ #define __NFP_FLOWER_H__ -#include "../nfp_common.h" +#include "../nfp_net_common.h" /* Extra features bitmap. */ #define NFP_FL_FEATS_GENEVE RTE_BIT64(0) diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build index 4702f1cdf4..4b4c587d5d 100644 --- a/drivers/net/nfp/meson.build +++ b/drivers/net/nfp/meson.build @@ -28,7 +28,6 @@ sources = files( 'nfpcore/nfp_rtsym.c', 'nfpcore/nfp_target.c', 'nfpcore/nfp6000_pcie.c', - 'nfp_common.c', 'nfp_cpp_bridge.c', 'nfp_ctrl.c', 'nfp_ethdev.c', @@ -37,6 +36,7 @@ sources = files( 'nfp_ipsec.c', 'nfp_logs.c', 'nfp_mtr.c', + 'nfp_net_common.c', 'nfp_rxtx.c', ) diff --git a/drivers/net/nfp/nfp_cpp_bridge.h b/drivers/net/nfp/nfp_cpp_bridge.h index a1103e85e4..bf975ce7ba 100644 --- a/drivers/net/nfp/nfp_cpp_bridge.h +++ b/drivers/net/nfp/nfp_cpp_bridge.h @@ -6,7 +6,7 @@ #ifndef __NFP_CPP_BRIDGE_H__ #define __NFP_CPP_BRIDGE_H__ -#include "nfp_common.h" +#include "nfp_net_common.h" int nfp_enable_cpp_service(struct nfp_pf_dev *pf_dev); int nfp_map_service(uint32_t service_id); diff --git a/drivers/net/nfp/nfp_ctrl.c b/drivers/net/nfp/nfp_ctrl.c index 6fc8cffd2e..a95e35c9a5 100644 --- a/drivers/net/nfp/nfp_ctrl.c +++ b/drivers/net/nfp/nfp_ctrl.c @@ -9,8 +9,8 @@ #include "nfpcore/nfp_platform.h" -#include "nfp_common.h" #include "nfp_logs.h" +#include "nfp_net_common.h" static void nfp_net_tlv_caps_reset(struct nfp_net_tlv_caps *caps) diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c index b9d7a7c5c0..51c474275e 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -12,8 +12,8 @@ #include "nfdk/nfp_nfdk.h" #include "nfpcore/nfp_cpp.h" -#include "nfp_common.h" #include "nfp_logs.h" +#include "nfp_net_common.h" static void nfp_netvf_read_mac(struct nfp_net_hw *hw) diff --git a/drivers/net/nfp/nfp_flow.h b/drivers/net/nfp/nfp_flow.h index aeb24458f3..09e5b30dd8 100644 --- a/drivers/net/nfp/nfp_flow.h +++ b/drivers/net/nfp/nfp_flow.h @@ -6,7 +6,7 @@ #ifndef __NFP_FLOW_H__ #define __NFP_FLOW_H__ -#include "nfp_common.h" +#include "nfp_net_common.h" /* The firmware expects lengths in units of long words */ #define NFP_FL_LW_SIZ 2 diff --git a/drivers/net/nfp/nfp_ipsec.c b/drivers/net/nfp/nfp_ipsec.c index a76ba2a91d..f137e4b50c 100644 --- a/drivers/net/nfp/nfp_ipsec.c +++ b/drivers/net/nfp/nfp_ipsec.c @@ -12,9 +12,9 @@ #include #include -#include "nfp_common.h" #include "nfp_ctrl.h" #include "nfp_logs.h" +#include "nfp_net_common.h" #include "nfp_rxtx.h" #define NFP_UDP_ESP_PORT 4500 diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_net_common.c similarity index 99% rename from drivers/net/nfp/nfp_common.c rename to drivers/net/nfp/nfp_net_common.c index 2d4a7635ab..189f81bbb6 100644 --- a/drivers/net/nfp/nfp_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -5,7 +5,7 @@ * Small portions derived from code Copyright(c) 2010-2015 Intel Corporation. */ -#include "nfp_common.h" +#include "nfp_net_common.h" #include diff --git a/drivers/net/nfp/nfp_common.h b/drivers/net/nfp/nfp_net_common.h similarity index 99% rename from drivers/net/nfp/nfp_common.h rename to drivers/net/nfp/nfp_net_common.h index c7f467e33c..cf08df4618 100644 --- a/drivers/net/nfp/nfp_common.h +++ b/drivers/net/nfp/nfp_net_common.h @@ -3,8 +3,8 @@ * All rights reserved. */ -#ifndef __NFP_COMMON_H__ -#define __NFP_COMMON_H__ +#ifndef __NFP_NET_COMMON_H__ +#define __NFP_NET_COMMON_H__ #include #include @@ -451,4 +451,4 @@ bool nfp_net_is_valid_nfd_version(struct nfp_net_fw_ver version); #define NFP_PRIV_TO_APP_FW_FLOWER(app_fw_priv)\ ((struct nfp_app_fw_flower *)app_fw_priv) -#endif /* __NFP_COMMON_H__ */ +#endif /* __NFP_NET_COMMON_H__ */ -- 2.39.1