From patchwork Tue Oct 24 02:28:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133208 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DACE2431EB; Tue, 24 Oct 2023 04:30:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C72E440DFB; Tue, 24 Oct 2023 04:29:47 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2094.outbound.protection.outlook.com [40.107.93.94]) by mails.dpdk.org (Postfix) with ESMTP id AE0364014F for ; Tue, 24 Oct 2023 04:29:44 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XgdxTHjRVAvv1zyxGtchAAtOikprayp4iu2XN9f5e8zPcr/AVIxm8HxFZOa2L9yARRsGJEx8Q8MJgLx6kA7nzJjUCQrVs53kwb/P7bTtESF5bucZtzyv3GDEOBK3YOT2avfNNtTg4R8jv9xfkipXYCuzNo+ipIHqwYWjDfrCPQ+tJRJ7i2ZevcBeeCXYgsZzz6XT0UnsNmkmnX/h8Rcab5jhE8XF+qYB1lRYzL8AzXaVq2+AxYSgwlfVccCQ7An1drM55S/Ij31suqogbAikRXwYcEXI8Qaq45Lo6yDlZ1I1vgjuwyAryKgb0a/ckxmnEYDju1E9Y83OWPJaFt9wng== 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=aRnoc5wP5+BGmoVJxSkWB1DrWqm4OiuS2L2n6/bpjzQ=; b=Fe7sTW0j8yJolIpVi3hHs4/PMXJ/Nkq6mMWkhJh4P+CzAhinh4L/OvofPI1gOQOe+7uJP6bpeyz5XYzaJVT6/kKBZBBXbPzArnjIqvLRBH5rL7/Z4FaJx3X+cFSIkrBA5EjOzOi9N9jR7jbYRco67/oC6n9ygDYEjFoQQoBNnEs90jIWsY0wCONhxYIK6B5Vs0TTa3/n6fsHATAQHYV55EacUexREGYG96OF9tSYb7BFqtrAKSq7447piTUttdFjYBW04VZ5IcdWUG12ciQV8qEMhsW0wZUrfX47WSt0vnAKMlDcVdZMjevg0yNuSdm8LqAmKLiDwAj0GqHAHyiuww== 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=aRnoc5wP5+BGmoVJxSkWB1DrWqm4OiuS2L2n6/bpjzQ=; b=BlhN4UehZxXmx67w+PZmSH+2e5w2YsR2gKYmGRCSMIs/9zdCyaI7UpRvHFKvlZqy5OmpzoOVrBGLT5gU0rWUxn67mH2CPsXAzsu4TdR8wzWGMcb6Krkn1jdpTrajdFtygIqEl0I/haBmkNjfb6aPOjSlZ0v2zguQswIekRz+juI= 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 BLAPR13MB4691.namprd13.prod.outlook.com (2603:10b6:208:306::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Tue, 24 Oct 2023 02:29:42 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::142e:d47c:7320:8a9d]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::142e:d47c:7320:8a9d%4]) with mapi id 15.20.6907.021; Tue, 24 Oct 2023 02:29:42 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH v2 03/25] net/nfp: rename common module name Date: Tue, 24 Oct 2023 10:28:27 +0800 Message-Id: <20231024022849.3092506-4-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231024022849.3092506-1-chaoyong.he@corigine.com> References: <20231017054545.1692509-1-chaoyong.he@corigine.com> <20231024022849.3092506-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BYAPR04CA0015.namprd04.prod.outlook.com (2603:10b6:a03:40::28) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|BLAPR13MB4691:EE_ X-MS-Office365-Filtering-Correlation-Id: 66d9d321-3eba-4f4f-42b9-08dbd439147c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pq/ViWLDyrrU8rPcHZysXjGENAUhrfrRG2YYb4+hGZxxObpaChQSswGOvXcUjCInYjticTTf/CCNpnBbLe+0Ss1+UJt+dT5CK0kTPSShKtBqAxXePacyrwnz6QyA1P3TRgUBikjDOXSuBVADtWo8MVbV56wYH6NOOI2v4kCExOTg9+BZv21KLKfdcBeGPv6cT8wvBXurg9y3ABBMw+84dFN40IOw7Sh4zOHIkVG0Pcc4sEuCVvELyWMof1VCz7L6OIH6nIjSWs3DUjMdZXDgs/xz796bGliIHCK4Vo80wVQ6zQDenXyiwI70k7XFqWEo/YpBwz/0blpBFi87pvKhl2qAuVzLUJTpcjhbQYY8A48p8kAuTrU0FyGLpWpPhf3fjeKJFXsJ5LHchRCIr0wEmESwUDkaWvYbfsld7yXloyv1167ppBX4r6ablWPh39m/h11CR+2bakhLm5xJSO7OC9t8hnxI1MNaH26qlrrpPtF8OmDDuxGpYb7XL/SqZDM7C+lzCro4MbSTVpK0/ugNxZ7oaPuo7YC3fgcjFxYufbgainJYVjca30Nr1wvGTR9el2jHXqXrCWemPFSDc6WcgIbMaf6JHT3g5koe0FgdQt7GChJa+GOHQIrvO2aE87KdzR0ZSgYxF9ePxrNfAEbX1lWdxCk93cQpokwggkn4e84= 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)(39830400003)(366004)(376002)(346002)(396003)(136003)(230922051799003)(186009)(451199024)(1800799009)(64100799003)(83380400001)(38350700005)(2906002)(4326008)(8936002)(36756003)(44832011)(8676002)(26005)(52116002)(107886003)(2616005)(1076003)(38100700002)(6506007)(6666004)(6512007)(316002)(6916009)(478600001)(6486002)(5660300002)(66476007)(86362001)(54906003)(41300700001)(66946007)(66556008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: o2FT4/ywp1T+/xWrKcyi3YDGaQV14Fn30HmNcHc8NamcOaS1ErVr8gve3PHJjUlZ2dor72Uq0mSsiqfNiY9cKdhhylmbbCqf6N16Orz95ktzoFIF7rvRvrwTMX46y3DrliH08Py0r/3p4PoxZuqd/7mTpskJGRb4d3gje/NPO2Xx4/r0bitjCSKayEy+Lavq9IhAmHHXvpQrrmx2wGVpW/Pw5ZHP7uJjAm0/Bx/0SkOXQBCnMtB1WpgZR3uhsb8NTpPheaKmLHlKWQ+01zVyoe2FwMAMT5EApEdBvTiQ3FJM60Q4zOpm24a7F3KSBxC/rS/SeyVj+ttn6S1BHqULAY2bJ3QRXLX+UWbu4qCpV32nObSQr8lnNFd2UqrHynI5kdNB4izoU1Lxz/s/W7gE8EDnwgsMyHzgGD8ng4M0vOokji6BDgYCja1VhEdlmSSWymcYifP8w3VYQ9zGwhKWwrtMfaJJD+D9u+wQWFfH8Y94MVb98+J1YVhgxiznqxhMB38to5gVLbpa1Sko97HWK9tjA6L9e62m82GURc19UWEwdrwrssN5aiHckd8KKyes1we5dROINzgb6QQ2CuZ8f2VgC8e4ms+DmNsGjwAWygQ5E7PgJlSwDLKm89R2SwXFuCBfI1YWYIODER06FinvszvF0dZi6AWksf0iBRZh8TeAvA1hvFszjgBo97ok6APjScrOQ8k407XpvO3ZK5UQot2WR89zNGj3QyHqATEsxvR3h6D+YOyBlhAa9s2A4Vb8WvYYB5X1dzfHu+QPY+pwi8odVbGUnwmlGaPA7xtnPLQV98L+ZOIPW6N64miGTPEomY1XBfsOKTq5fY9+opNtLNgxbzFPOmiZYKvCi4tIxzGvIOV/R0PxBpUYq5T3TkD4XTXk85xP0+jEGZmAhvHaPAhksHoR+l0PGh4m4aMDhtbCX2qMqupfeWdn3NIf078JyWwXo1sAdM+wXYN2VBqBEuKZNZV0EA0OSNKIHAZKlR91hrhOoVPI+foH7FMohKV9m5Yz9tZqWXxRC2TQbBd9szGnD6HxORNl1ONDo6L7jahoJ6gseCUEifZXwpYawe3QdhhkakYPwsaoODsp3oFvAP1VRr7F4bM5Ty9ULueubkcSZ/BTIvOZeXbuORnlyelBsN0Z6jbn9obymXqbuwwAWktEcn3gSdz57UU/9QVZEbvfOb61+AhHMPZqpyodtQbbJCNag20VtFwsiSTL06fDhgRHCgI5aal9bjcztLWWzg0TiPsmyZ7KHF4LIRo9kwEsjW+vdkdaL2Kx3+q+ddKsVlXWzYWntwLVlWj138wQvNdp0kYtfvqQz7xuOI15nZ+wEz2v1H5J7hw84e3IEmZoyD9Uuz8m6YlgxCcHfpV6jD/1l0mJQbfBkhpgLxBNOCdNiA4oDkiBfEv4GbNAd7yLHN0DZGY1YhX0ySyQCc000yk1uyA31MwoN/sghVV/jBad87tcR6pfLYn2lBf9paXVnB9K5e0gQLAuL7dpuTfeehJm/Z3A18QsAQWDOmSmxNaCUbVrtWX/iMb9rJeCPCeW1M/brpeqdVV+vZsxbvcey6stSBrjtIwsQXUKXasVfQE7wg94siFatimFawhvhnurMQ== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 66d9d321-3eba-4f4f-42b9-08dbd439147c X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Oct 2023 02:29:42.7728 (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: 0vvMOz3W1PpZd1A3loZv2LMIpTpz5M+3zEmaLJt3hTno2uzoyy4jtmFy21jtw9Ovuuh9VPvFf+rA5Mexsxi78io9D2SzGX8+uLlARzpCi6I= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR13MB4691 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 f8581403fa..40748ccc98 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__ */