From patchwork Thu Oct 26 06:43:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133343 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 3710A43204; Thu, 26 Oct 2023 08:44:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3984740A77; Thu, 26 Oct 2023 08:43:55 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2108.outbound.protection.outlook.com [40.107.244.108]) by mails.dpdk.org (Postfix) with ESMTP id 5F5EE40A72 for ; Thu, 26 Oct 2023 08:43:51 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SAAKaMynU/nsckHEyVr8Rbrf+0iyOEy83A4WIYjHBXdc5gX2mogMPlJkkhD5nAivfbUytgpYgy2ZQmJhpbniWd6y3ZZUFD8G8oDa6ervBBfYZA82pUWu+VKagK7c1QYyulx5aWKOhi8KjGA9fxk6+RmpWHjCEKYOakU/PxZHYx5uL8mIU0g9LQvOZz5IrWzUxUvfbx2lUzF7wnCXzhLbGaTcAk8mulafE/C+saLNlAZQetfElOVPsQIbgj/FCy3c3EMJmawmWB26IgEWtvj9JyrJzYeUrmrLQC7SJ6sCKyu+EUXY33pIwRwPFD7sGYebAr/ZYvOx105EnNxPEWi51Q== 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=MNy9ZLCfaZQEhc4PxsepY4/4lJHORgLqz7yPWlBKl0eQpmmgIuTweuXH8xPAYN7hoUiJAwQ55yQdxYHyHNtruqlgNHtGHiN8ULv0R0FZK3z+RK1ylAWkAqVECo1I+T2GmudCQh3dhIPv6NNfEuZCCuccbttp/3aLGayh7Kzs9dAQXu5wgC72uxCe8p0EYfmE9oXM7rAQWTU//nZoPog+4gReAQVt8aYWlBoPk8Yj8ivXVak0Megaz6xoi2Ndk2yr5JbTq8ICZadAASdkFAEOY12J8qfQHa7wGxMPcoaXpErzeK990w7fOHS1gOAXHGZ8eFjHJVSGpkaMVLOdT2HzoA== 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=qUGQ+Q7lCIyz88MKblFP3ZXJ1FHpIiINzgBVB2AixZLIWzvKfcZwGnAtFdlh1YFOrwpVZ4qWS24kFsJ8P3hCN7bz6tmKASqD4B3mju/5O0di38VQSvdsetv4uRUf4Fk01rbTMzZBH93Kcv4gdkn3G6RdcIVnsz44gmuOY25KV0Q= 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 SJ0PR13MB5965.namprd13.prod.outlook.com (2603:10b6:a03:43d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Thu, 26 Oct 2023 06:43:49 +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; Thu, 26 Oct 2023 06:43:49 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH v3 03/25] net/nfp: rename common module name Date: Thu, 26 Oct 2023 14:43:02 +0800 Message-Id: <20231026064324.177531-4-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231026064324.177531-1-chaoyong.he@corigine.com> References: <20231024022849.3092506-1-chaoyong.he@corigine.com> <20231026064324.177531-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BYAPR07CA0034.namprd07.prod.outlook.com (2603:10b6:a02:bc::47) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SJ0PR13MB5965:EE_ X-MS-Office365-Filtering-Correlation-Id: a419047b-d4d9-4fb4-d50c-08dbd5eee946 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5ZPW0qTSvnQWc4+DSOgjAA6ixSRebC9bZnDl94QfWhWMpwv2/A07+iLINPznGZt8VAM2ib/NRAEykv9Iy9nt4tZKQUksBkjEsAyZxKlyHrrBqQsm4HplXjfvB7CUDOyly9FruFklbRyhfEkEthb/FcOTBNQHXixenQgBQCYVvXTzYE4n8cReOsHO9OWqZWbd5/PGUswgdf8E42Pe8cc7gHTBDhCLWbuX+RAYUYGMlWA4WwGJcWIOzXpF+raCqWvZYBCIQ6Rat3YE9b5zAMiAXkM8vqdiG6J06LreaFnllK+RvJ3Pcf2BaN+LuC2OKy5WuNKuO7wK3ku3E0aVCNzeHTL5Hgm6+3Qd7WvYTqXrqpMDre3VE7z68KpDmx099+TL3a7uVvpaY5ERojm29/EON3FqLR5LN7cU9FeDL0kj/K1WwfDPGbBuJvNSMEHaKNz3/X0BFVsSDLM6aixfRPbMI4vPPnYASYUjE9XTd0B4BrLAocRS/TzOsqtDcoGILwD3aMpF8sZTwDfPcbM76pMM4I3NPysT2gfUljtOYAJyOhWQ2SJOVk3/UBUoH8bN+MRdy7hrL4rha4HbAagwWAHvrHKQAz9aYfqnKQE+0extzs2VmTK+xO7sEPiEUv2s5L6hfbh00vzxoafOQrxp+wKm8CvPxInlcSuCZXtL+mGQEsI= 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)(346002)(39830400003)(136003)(366004)(376002)(396003)(230922051799003)(64100799003)(186009)(1800799009)(451199024)(6512007)(478600001)(6506007)(52116002)(2616005)(8676002)(83380400001)(107886003)(41300700001)(26005)(1076003)(6486002)(5660300002)(6666004)(44832011)(6916009)(316002)(66556008)(54906003)(66476007)(66946007)(2906002)(4326008)(8936002)(38350700005)(38100700002)(86362001)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /t1FW/VHTbLMtyAxsZkZsiS6sAVEr/BqOWSPSkWCD3xBvIs9NiwCSxTgmXwx8jQKIymf72JhcZ6TRqwoWoU+TjMBNfwxLrI3R4i9R8hBHR7yoQkkO28IIjTemypr7XRtfirjN/VA/AAlbgJUwfZZcmwv2AtrmWmZx2CRwonZvJHWlMDbvn3uU3AFI4anV35NUuVUX2/C52RpO+Yj21pX6VsbEBrX7eIqJHj4CxlkOmUUKUKHxbOQrsh2Tr5HGipDy9tRR0ZvsS+8ibMVOEMgCZ4K9tJRYn5+/bmwuv6U7qI0pDowI5dkj0wIYfcZ3QTSE/eihN7EInSuLVAtZV/ESC8TNhMpIwM3fSVE44flpzN4CclzR3l0mgxIsxhAxIu5i/AOEhjctFXTvyoWBaZSN5BlILRL57vhkhCD665HpytBYmFQBbCkgv+6ySaIezQngw7tPRgUCt/6wNdD4QWL2PqF2S7kBXgpaROxqIyOlW6aofFRhtEURc/KAZzj4rkd3D0AO4zE0ewm7XIC9J+4aXOhEt+Mg4u0/oUrxYb5U0jRYQf9zDPpzb3xgvC1VlrONOqOhaXFZTKkwVWdYB2qpxcm8K/j5RnZvLbOkfNYmsU5MiA0cmY31S5KzowPXNtbM/cwvhE/t50M2YfHckxnoLZuHuc+OC5V9ldkeUJodyP44Y/2JHl5sg+Er2+bShkq9eej+UDTOTiuf/lBofP+V2EBUZ/G3QD38yX6EvsYTTR0/Zb0t5mU8Dd3EjtJzZ/EuNzBl3pIPBnNP+OZCR39eh+kltcxrPGbGyfy/mxbRpr6lkV0vEYvMVxxdQhtoEWdTyzM6dSAbo01SLyjuEY2b76LcIQbNhWPkfU4XxcmwLpLInAg/xU4OfCKeRlibwFlf0udwGvSijc/Crb3n3agSHGqcDOj+WLXsDAhEX2vaN9JL0CWAvaka/8oNYJ63cV//hf5BFuXVh7WXx3qowL6cxc1OXbneIjdXhY/i++jlr4ACUBKYJFdqsCbQdtJDlnTHuBkDnLr1gcVzmIdrAcByvC+sdDFSQWYPhqpPX8lBZ15NUPYYnzsQh9h1OIqklz+/BsGPEmFggKyeOsnJMZ5aFr8e77BmzsHc+hCa1WIV0q1R6k/9Uh4ZB+MHSWst8qhUATyOLqJNPPT+TCjyyid7/lm8qYU7PwOFVFahKqz1CnRJIzWpgfHx0bSLZm/Mk/HPhdDcvV6GXjzVdRyyZC6lkur76Fw+wO/8S40twbgrQ63/5igkKvHY/co4x031XziS118hd1rYibWqEvvuvJM17xwWs9PfBLUvKugPphystHfGKYU8nhSXMwopytQNHvgt2eozI3VSDYrO9wTfsCs/NBZ5c40DIb2qBuJR3Dv9Gnajo6ByQUlOa4dzRjWp5P9JNe9KMiGsA+IfB6h9cKfPmFg5BMCYoPU6MH8ZJtiKnsGwk5QCje/3hiFCUwNTk2j6KPl7jJV8cG9Sw8wBkQUUEMuLnNxv0VR8e0cZL9QkPRWfUex/knSDJmgW9jeNEtJv6Ad2mdwQN6HP5GxnfyuH02GpkNyjYL4TDo/hIoVgo1rvTVcbrX3Ouy8PCzmnCV8n03hVJn4b/hHyz7082Noew== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: a419047b-d4d9-4fb4-d50c-08dbd5eee946 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2023 06:43:49.8570 (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: B+fAJnRmru40nVRydpPNc0ynuKzt/1eVaVDX/eRyo1ZbNkcWVOhGU+gvLmt5Eik3dcOmNdmsTnIUTeui7ZQljyqhsE56d5WNVE/ZMZZ3ly8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR13MB5965 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__ */