From patchwork Tue Oct 17 05:45:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 132693 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 7386543186; Tue, 17 Oct 2023 07:46:33 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 180A240A7F; Tue, 17 Oct 2023 07:46:18 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2121.outbound.protection.outlook.com [40.107.244.121]) by mails.dpdk.org (Postfix) with ESMTP id 5D2344067D for ; Tue, 17 Oct 2023 07:46:16 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BP2DQ66KDqmFCC4hKxXnV17hGTkpYj+epDyWVjyEyZM4v//0bjKvGqiVeRdztCHqkU/UmAZdfigPNtxcePNCjo3sLsukmhKTWK8SPLrPY5t/j+OdH0p3FfINkNyZKfrBvF777KVWdWjq3SGSTdK0mY6vE1F+3cl22C/P2tOSweLBcOFANxBOO2SkSXYtcAIQjx/dzlt5VmnGX/erkBlvRlZ7SDdVYJ7JOsdbnGlbLBfCmz7iV/dtH1JLaWGKNedsqS9SDk/RXlK3CC8G3/WptgPIulLo06A9SmUhx10ZFpHNrVPvWnLirtRe/EjxvQhzKDJ0dno1S2WbERNc5LNPSg== 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=Nh8teVwV9yf/h7S4j5pkQTkxmp6pkmpIfLKriiTpxUQ6x0yV1MQ5oRm/HCVzQ7UKPCjL90SMzUGpK+IGb+z+5KP6hPziyAxeCKYAIhi3r7weo/KtO5ujuBwONv4ZlxnvaMUTnp+H+n7h2gDByPYIUKdg9ZJw5Kq5HuPanrqCsrBKq6ng2p26XbHD1zxlVb5TtNU0x5dXq5C1kJrAeWGw1gHtfpDXfTFx/an11c3FGnOaRTDLgVTEH8B7BI5rAi7c95UHtyB3MPXH2vmuO+FQDO7VVoYhbTqNryStpheXQsGOIyknHOw9vUkCruILUzTcW88U7Zie0B+3e/GO4hR/9A== 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=tU/uFtg3JZGPfzGZXd1AAL/cCKxFQIqxPmiTqE7vYCcrE5yJ6YHbmEKZCOoZ9Rdagx2jmz0+vAp765lmdO9qr3FGaMXZ5sTIkLaclF8siN5noDInz8Pe0ZVeEKgEpHx7C5KuyUE0G7CiSQ7vSd/Jc+QrKSxs6Mc6u3jlO6VOS20= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from PH0PR13MB5568.namprd13.prod.outlook.com (2603:10b6:510:12b::16) by MW5PR13MB5904.namprd13.prod.outlook.com (2603:10b6:303:1ce::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.45; Tue, 17 Oct 2023 05:46:12 +0000 Received: from PH0PR13MB5568.namprd13.prod.outlook.com ([fe80::b070:92e1:931e:fee7]) by PH0PR13MB5568.namprd13.prod.outlook.com ([fe80::b070:92e1:931e:fee7%4]) with mapi id 15.20.6863.047; Tue, 17 Oct 2023 05:46:12 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH 03/25] net/nfp: rename common module name Date: Tue, 17 Oct 2023 13:45:23 +0800 Message-Id: <20231017054545.1692509-4-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231017054545.1692509-1-chaoyong.he@corigine.com> References: <20231017054545.1692509-1-chaoyong.he@corigine.com> X-ClientProxiedBy: PH7PR17CA0069.namprd17.prod.outlook.com (2603:10b6:510:325::29) To PH0PR13MB5568.namprd13.prod.outlook.com (2603:10b6:510:12b::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR13MB5568:EE_|MW5PR13MB5904:EE_ X-MS-Office365-Filtering-Correlation-Id: 0d30cf15-f736-4d40-e8c7-08dbced45e66 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ifsX+ciovVnFVK4ZGCMAwOe9de6AKg1nUyYNuaIgMe2i47WxbwYbZs2/0QcUjzHFdOpJXSyrTVQDOXfnLaDAFWwW/cAxe59VdWbSwqQV9VY2YTDzGFgSWK3aNJ9pzZwhGNHVBmjWJLuM4kyQWz3WuxNrzHaN7tj4I3WFzvZtapWdjrjpb4+PHcWkUKwuLUWUymbZAmRXjYiiRmXgTBuNyqpyebZf4oGNjvcz/OKv89fG4oW48VTwW9RD1vAu3+SIPTKEt4wvs7+9tZ1Lak814FhMMiAokI5mtvGaEYcI6unzWmHJCyuyD0RiZefqaMXfPOM9YSYiZuUdLl/BGFImQtFHv1kJc9+TD1JqkCtLYGjj5ArRGSQYPhS8CqUE2/dqqkuLl5pvGYWjeHUo7oNa+K/BUrrsLSW5b3zksV4dMXx7tehR2OgVg00oYJqqwhHB2yl8GwhvIWetvTysU1bFlVl5BfLnxHG/0QurASpZcF5l4dUwoJsLfHL0jeLEQitr6ldd92zn9HJElyBqR4gWF0NQZe+MS1OG4iYlplNGg/w8/INecC92Dwj/FzLdB3O4voDUMA7lrLboNToXupUxpfuNFN/PO25zFiq80md5QNtOuqLQ8QYRlPkWN2CNi53MMLgIWl4u1Yuhn3cMDvmGwCGcEloWMfeEeQs1BCjT6fs= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR13MB5568.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(136003)(366004)(376002)(39830400003)(346002)(396003)(230922051799003)(186009)(1800799009)(451199024)(64100799003)(2906002)(5660300002)(8936002)(8676002)(83380400001)(66556008)(66476007)(6916009)(316002)(66946007)(54906003)(41300700001)(478600001)(4326008)(6486002)(44832011)(6666004)(6512007)(6506007)(107886003)(38350700005)(2616005)(1076003)(26005)(36756003)(38100700002)(52116002)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Qk0iABlE5OgbIVxhcjyGsRA2vTYi5JCICEYzHjtlS8KiRMKAk3uZTYovinnNgYmEltOIpcXk3TI/R3krDLQXLh11PYV4ODU1Mt3cCqIbeKYuVxpgHLKRGrsI8vg9FERbo7BSfWRRo9VBlWZjKFjelyl3XM/7i/2F3Kqr75deWxYkEDzskoFaUWY+x9gxAeiuLV7z2e5tTriTXOt8Aoky2JMXOGnPXcSlkAslJ9WtYaAEOp9MeNok81+2/GrvJ8/6MeYopd5XxV7ET4HivYIB+k9hg8Ul7hI5g1qInrSde6A4AzEwRJdNxRaHiWpbQiIdBLi7+D8ln0KV/6df6vK7gRzVQk29ruAfSLBLkHThstLu66nxsG8N6SKVw4oZh90YaZ80HJW4qExxTwQAkiQNiblm5SPGo3MOAU/iphO5BWrSqkwI7ZcH1AziMCMNRfPiwBe0nM0XGLON5uq3JRMdHvWYaS8Nqr6KQS4iZUS1N0K7bA4jkgGY0DIhImPb3hJGIx5lLRRIUUk5N9tNf/eA02KjdmXf0CXVnXTlwvb5v3yjWHIG9VyMjmf9D4q2xRvDSKr+c6L0YK3PU0PHwmqoKDjLAOeZSXUi7WvIjf7LEKTgoCjVICsjhq9QTM+oUCD2qYHqTDfGnn7EtxwWl9peXX/jUPg91lW3OEue/Hx6SnjtQdJ7KaAwMGKyQ/ituHTjZYKbmDYUzaoO030h3WXQIun69w/5vvcWBkFaL8omYHC3uuEqLHwInr0FXS43f8XDvwUl/UYuVjT5jCZEgOx1Iy9diuwvjU4h6FZ0ZwnQL4hPx8mLMvqv9swSWHeGcV0FHmQWFROOZmnOSHHxX8wTQeQhL3hp/FOayV1GPVAc3tI5qQ7LrzlFGQcQHAOHGy1xJWTVhZbmB6L5TWpX1iVaX0NnEN5Ix3yPyYQFM0c4SqtV1xycwFIXBGkgwGHizGFQIAo7wtNkFH94leyRZihOqutQ+nc2IM6nINV9BmT5FEQ10ukJ/3p4eSM5xZIwESPkDtn/BNtTAr0c2UpZNJoe9/5BcQV2nwuWTIoEElX6hL6a8Dmmm9BwkM0miBMinRBbR4NlkkCT3lFaTlxaAi/gAGTXChO4xxTInjm6YPIK6JQLVBMfimspxXMhg+od0K30FhNKcljjmPkVBvS0zwaanU7O9Eo5TBwuuWm1Ukx2VUcRBPSVQ2q0yBMTlXcUbfKlT8+UfMNVaHC/UxT1uXV6lH6b/+1s2i066yol/J7dQ4WJ0XoIBebJD12F6GqRK8sGXN5F0cBRwWsnMLRGJinLFFQifgSvEkQlFIbKfLEO+Ez82s0pw/PpcpC6VhbzBlth4tV7Ydf1hF68nUxuI2ajsTnP5WCsL3LLRDG+vFlpbZV1M+rTHqxbBx32Gt5eRfLQ8djZ3H7rAXx0y2evC4vY52HR2+SrvcAKNSAOT4qZu/dfsILRLYBiQb4YEep9aadzpHKGWiYJa/vi6AWvK473sGuRX2ltjmCf3AcdcPFzkZq5zGC5tVjMF0rzLOLk7ZG6833rcwTco7B68WhmJviO/8NLyl4xUShV3b0R/gflFZnWeXuMC4XUbfhfE1HZdXbRCCpS21OfvbjDtEB8wvKiUg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0d30cf15-f736-4d40-e8c7-08dbced45e66 X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB5568.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2023 05:46:12.2907 (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: 64DKIKKpRvwauiPKXDhR7ELIffrx3sJJRYLeCcXunL5EAh0RiPBVxPkF+bO27fyB2TMkLiinvAlQ2w/kRr7ux5Men/Fz4x4W76wctHtC2pI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR13MB5904 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__ */