From patchwork Tue Oct 17 05:45:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 132694 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 911CF43186; Tue, 17 Oct 2023 07:46:41 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 11FDF40E78; Tue, 17 Oct 2023 07:46:19 +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 A9E9040A7F 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=buQFxeLtWSDHwqpXuUlWJVmMd+7M13T3VDzbWS+14LapUuVjIl2lJPkubToYUgu8bQOBsHRO4//aYDAcJ2YL/LtoSAQbIzXMZRP7E+0BHj3qWQGN12Rr8rWCiSEQS/fMRJT+zgA5XVGvXHuzoOjlhq/KlsbRtvLvoitEwNaY2ebah8rpJuBKGBICvbYGhEeHtNBAUxFPidktDWWiSoHrOoEz5RPBX0bHud0yAOVTESteiSwkXge36vx60I0Xw4c+xdrKOulvdHdkm8Wd9Iibjh60+KzAeFLHRHR/G6A0KkcsU36W/KOcHzEJeV+555maNAaTwQj51G7S6QX8Z0Ui6w== 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=d4X/lJS4zCHqyYwFQhGJG3ZRKBInquv1bRtjVCTr/40=; b=CF6KgMPbN2CzZs7CJyRd4xw8LQN/pO8Qpre4ySmfBFrdF/zL4SaIrLsi/or6rvFPNlOkTQgj20mtns3NdoRtfkAmZQX2jjiV6+GoJqVrcc5r+NhuaDD67G2kkZJ+uqcO0JxH4cKaCj+Ogu2dovIGiVoJd+bxSKDNz+YdZQX3xzrUPqnsS4cSdF6k2KHY8iBfmOvZxVGvhehuySaGkyaUGHjP4hbzEIalpjarxE0XXvsarJhiytjhIDo6bFb7L4fTl5bJLiTIQ9VePtmGmhekTNb+GmUxERD8io8S1JP4LTQgAleJ00q5z6LRlv83qaegPDVa2SZUFDF1FiTzOpl15Q== 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=d4X/lJS4zCHqyYwFQhGJG3ZRKBInquv1bRtjVCTr/40=; b=F4niC032qnGheNO/yot7Znn+FJN292Ymd8OCu4kbDJbKUSAS/pkQ5kLahrUeifMXIUk4p14h9umoEulRdNDKpYjxW5KuHiSKPSbbYQYZU8kxzhdAoOTU4zUyk9+GWgHKLAr251TBKKa9NpOWAF2uU7AbDKRj5lMyXwvrNmfPFxw= 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:14 +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:14 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH 04/25] net/nfp: rename ctrl module name Date: Tue, 17 Oct 2023 13:45:24 +0800 Message-Id: <20231017054545.1692509-5-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: 8aa5dde9-97f6-4ea7-75ea-08dbced45feb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lQedgok2T5fjVdQGLtr7X+mX1t9lk848V7l5mipGeey2qVhuWddTmj8m4BbjetXoMfF61EOAtbdg/Qp+pXSd++RXaR2DjZtvsiu7y33B9iYy76rIznK/nT0ZdA69mBfolGMJPekNKutaimtRuRsUcp1SlwmVwhqgo7YY9tIPOk83M3+SqqVK/gOfAyHeocJUdya9neXx4q0oQikGSi+p1uFCUdGvpvz9IiGubRPqE6VCMFC+zjJkzRJaOC3pHpDgsYM/bu+rnMotG/8+xETiN6k5hHSkGUebHLBKsADu1iBxev3P6eleVQ/IE+hXfzPoTyh737NEA78/KjKLzPWgV10sQ0f+zfMtWAySvbnuLQCBaeSxBaEMVSeVYWAYw5HEh6vm6gnxUAFVPPvzUa4D7Quf5AXbza8uRdObSAAm2ZN2d7OnWU7OSpCJJbekcLAqg/hCUIVSS9VvjXsLtiYAAPqEVX3eD4R4D1/TY3+tllZoPsyZ4l0xMwbFXIBM9VtGFPTV3MwDpZIFJAlVTy5BMWE8p0GjdHHtUkgRrQPXvevuyWDZfSLPbNhcwGCCEzZYL5bD5JmKR1Kfy1Ixl1ihIDz/98V2EuUCnkrYpKTX9O97JRzE63iM9ZUnUgOWvDhdh4SOr7raGBPQhWzWuCXsPvsL1P3OM+QWDwckmQbjSjg= 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: C//6r27rxbc6D1nWHSQ+yGhLqph8QSqKog32VRDUOcUTBNRIugGuMljYW+MGdPXmqA0CotwC9zoTb9gopR+6u4IRjG9XjQiRz/5mdSpieJ1imJfW1mxp6TDcoWnDrun2s6P6P2YofQ0TC1iuPICQI28AxrlfiSg4HkLVRqTvXg+aFLUUHxqf0nEtdqCd2CpzX6/7gTw2HCU6aXcHCsggxeDD2mZ3bry7azX5r588SXbLGR6hDoIEK5AI6G4JNXXJ7pzknhfy9mvGZZAk7dURyjtspydUH2OEZet/aQCU2KK5iU66Xt6psJJgH1SrYwm70UpRO3ecbRw0A8upTdNXdra9QFFFLqCIibgd6+tAxvSYMokxNHecYk7NHpfwEIkbTuvJAvRn4iba1CBZLokQIEk4OgXnH1MvuJagFrFgGpk19NUAltJ5QALmE4C4D3Tz8CIN3TIhgZxq9nkhk4qa4kNKwuiXGqJ5n6LcXJjMPg7eJmxfGUAWLoZpDWAbYC3wroTtlf9ZGLtP6O1quAv0CSb1m83FhbWcadbp3m+jqQ1r4Z9CMFmCJ85ae5PDNfUNIgIT05JmR5xdP6yD4Yw0uIk3dXUSpx/l+rwPUBvjqFBk6p0cci3zqZgwfiuq6KqeM5han6qn79KnIHq3jdP2X0617DRA4Rk01UKbD9QZrJb85GBIlF+aAdImzur2chDpZZy6eJAhLJg5Zbe98TaUtl8Fu6uOTzA+UCKXfe5wL7JcfJbpqctHxyi8TPNoE9I46FtWwfrWW+vmmpTJG/NiUMqtm2ut0/PdUkWyEjqgiYg6Vm+OniVnTZhjGv15GB7BEV83wnvLzx4djK/ayEFjWD9RluBMlr35aEnNpF8Xd2pWp6nWkfUOKA/J0T9hWBaLSjK9OMQW6WRj8d9QcUwb3WxEttrbO5vzOF4bipt7Ozia/MkIrcF7mufxobQMiudtdmVOXZ7h70Sq3bhYbxSihE0of516ySoRAzlxKP9AshrDBTLmaxGZBJt/6o0DraAiaJ6iA0/RUYHfKQVnK/Wc3WjcgN8A+g8+MKoGm0uOIGW0zvABDE1VwFsB0HCLWea1OnQxhIgkyDCIfDGbBBbugmYB4S+YajBmiQPsn310Iru5X8DPMhKKyRPQp1XMzgwUWvxoDRemYJSVh6E14xXiIU6OX/NkzYhXn/SArH2cSIouPLBsc9cFAqgnaXocXxm7TJ7kmTG9FTFCWJZT2nfZyFUNDJJIu1D/xZq1HRa72I/FP0kS0HzVkq7r93hRt7l2sOXPnPPSxRT8vxhHiIrYrpXz03Jrr8QcjdYg/OaS0bbjoZYYTPVz4fes2g5u28Um+D7Vs9XYRZTSyctsqik42tO2hli7YlIL10qehdr6zOIGxHEptA1Xyja8f4Y+LnblV18p8oz81FHBglUQ9gIw9GnsSLPAgAqrQGR5M7GSlAgEKHvL4QjT/JjdeuLTAtB4tFnDHxa6AOz0FUOtAyync65hCgOmU86jkk8vm5k6KMo0M9CVkivZcl9pZ2vPDEgIjCxcHi00nPQDs2z13/5Lw5gu6qhEEhi1sZW7BHLbSQk93vaf+AVn411pWN7UzXpbO5DUWaI5CMNaVRI4W461dA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8aa5dde9-97f6-4ea7-75ea-08dbced45feb 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:14.4473 (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: /ScZcwVYutR7eV3XL+yxWUira1uZ0spedSWVXyHyxdTXCgS+tM0rVvkdcNh4FhApVgI+ejn1eFviexjVewKj+1zsme/4vbMR9Cv3t2S0p+c= 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_ctrl' module into 'nfp_net_ctrl' module, because which is more suitable and we will add 'nfp_common_ctrl' module in the 'drivers/common/nfp' directory. Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/meson.build | 2 +- drivers/net/nfp/nfp_ipsec.c | 2 +- drivers/net/nfp/nfp_net_common.h | 2 +- drivers/net/nfp/{nfp_ctrl.c => nfp_net_ctrl.c} | 2 +- drivers/net/nfp/{nfp_ctrl.h => nfp_net_ctrl.h} | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) rename drivers/net/nfp/{nfp_ctrl.c => nfp_net_ctrl.c} (98%) rename drivers/net/nfp/{nfp_ctrl.h => nfp_net_ctrl.h} (99%) diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build index 40748ccc98..d54dca36e9 100644 --- a/drivers/net/nfp/meson.build +++ b/drivers/net/nfp/meson.build @@ -29,7 +29,6 @@ sources = files( 'nfpcore/nfp_target.c', 'nfpcore/nfp6000_pcie.c', 'nfp_cpp_bridge.c', - 'nfp_ctrl.c', 'nfp_ethdev.c', 'nfp_ethdev_vf.c', 'nfp_flow.c', @@ -37,6 +36,7 @@ sources = files( 'nfp_logs.c', 'nfp_mtr.c', 'nfp_net_common.c', + 'nfp_net_ctrl.c', 'nfp_rxtx.c', ) diff --git a/drivers/net/nfp/nfp_ipsec.c b/drivers/net/nfp/nfp_ipsec.c index f137e4b50c..af85e8575c 100644 --- a/drivers/net/nfp/nfp_ipsec.c +++ b/drivers/net/nfp/nfp_ipsec.c @@ -12,9 +12,9 @@ #include #include -#include "nfp_ctrl.h" #include "nfp_logs.h" #include "nfp_net_common.h" +#include "nfp_net_ctrl.h" #include "nfp_rxtx.h" #define NFP_UDP_ESP_PORT 4500 diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h index cf08df4618..8a02911c45 100644 --- a/drivers/net/nfp/nfp_net_common.h +++ b/drivers/net/nfp/nfp_net_common.h @@ -11,7 +11,7 @@ #include #include -#include "nfp_ctrl.h" +#include "nfp_net_ctrl.h" #include "nfpcore/nfp_dev.h" /* Macros for accessing the Queue Controller Peripheral 'CSRs' */ diff --git a/drivers/net/nfp/nfp_ctrl.c b/drivers/net/nfp/nfp_net_ctrl.c similarity index 98% rename from drivers/net/nfp/nfp_ctrl.c rename to drivers/net/nfp/nfp_net_ctrl.c index a95e35c9a5..b0a427c98e 100644 --- a/drivers/net/nfp/nfp_ctrl.c +++ b/drivers/net/nfp/nfp_net_ctrl.c @@ -3,7 +3,7 @@ * All rights reserved. */ -#include "nfp_ctrl.h" +#include "nfp_net_ctrl.h" #include diff --git a/drivers/net/nfp/nfp_ctrl.h b/drivers/net/nfp/nfp_net_ctrl.h similarity index 99% rename from drivers/net/nfp/nfp_ctrl.h rename to drivers/net/nfp/nfp_net_ctrl.h index 9ec51e0a25..3772b28a66 100644 --- a/drivers/net/nfp/nfp_ctrl.h +++ b/drivers/net/nfp/nfp_net_ctrl.h @@ -3,8 +3,8 @@ * All rights reserved. */ -#ifndef __NFP_CTRL_H__ -#define __NFP_CTRL_H__ +#ifndef __NFP_NET_CTRL_H__ +#define __NFP_NET_CTRL_H__ #include @@ -571,4 +571,4 @@ nfp_net_cfg_ctrl_rss(uint32_t hw_cap) return NFP_NET_CFG_CTRL_RSS; } -#endif /* __NFP_CTRL_H__ */ +#endif /* __NFP_NET_CTRL_H__ */