From patchwork Fri Nov 3 06:25:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133807 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 6ADEF43275; Fri, 3 Nov 2023 07:26:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2919140DDB; Fri, 3 Nov 2023 07:26:33 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2093.outbound.protection.outlook.com [40.107.237.93]) by mails.dpdk.org (Postfix) with ESMTP id 0222440265 for ; Fri, 3 Nov 2023 07:26:32 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ut3pNh5lAl8WdUUzIQMFztxsSFD7Xd0phuUQoCVg/lsmwgdoPr2JCgdH2Puez51bNNkD3dgXNIpW2AV35XFCdgh4bLfF/PWT5CDyvb3fYKdgkIHRFHs+aOncGDhIRZJiwl4CU+qjdQRxFjC5lSe4Ep6QW5T2cUO0oGsB03eVrSVae4jrx2dMDxQ4EX99BhdNoxzHZNZNeIVrJ7qvpJAddMsMfzpiP3hlD4uUdRvGLB7eYd6eG4QuBBjkzAEcHl8GAl9+UNsiEmEwnKFdNKcPG/HTDqQ3GabtUwhj+9RNVNnEaEZVhfkGTAeJxFpHJ8DlIXmZOwQGOnkAPZzBJ+H5tQ== 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=i3Vuq7nQHgv+gsJ1OptGilE0Ix5fcxnqLIYUNigPlnY=; b=FZhEF1iYBfNS3dhAWbwprW4ostYAzDZ2IJ/zau3E0sfzmkdm60p9V2pwE+n2IBuC+aqkmEGqcqpFHEMfDfQCnaVV5jghHjuPPLno5zXsIHHQlLPyozbcdIFttutIZ+z6BxGlihAV6mlkSfcmA8Q1VzRfXhIvogz9jw75BGLt7VSNz79V4hQyUv8kqaivUOWFLvGvxdWu2R4PKvoQfYSsx9KmzbXDCMkRsEwbTPPXpN9BP5To5dNffWRCXmlNwkmRZpenA26a3DdnwjHRMc28a0YSKLKYt339ewqDpdLhu2kBYo4UDzlEsNFnCBUGDad2Uub4Gn9m8sN0YYlJjyUinA== 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=i3Vuq7nQHgv+gsJ1OptGilE0Ix5fcxnqLIYUNigPlnY=; b=ZgRAko14uUIMc1ILLIpp/16Zj9bo3YRBTykgUADpdrM1AVctjIErzdSnhUUBQUUvgA5cJIm/1cBzBAaw1jX2L4++ckPHO+P5HTQZdszIeb0HZDeMuqpgt7vu8yRXw1PrK/c1Y3LUppMITa1Vnk98oIBqm7gMqy2vNKIOgRh3bWQ= 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 DM6PR13MB4416.namprd13.prod.outlook.com (2603:10b6:5:1b5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.21; Fri, 3 Nov 2023 06:26: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.6954.021; Fri, 3 Nov 2023 06:26:30 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH 01/11] net/nfp: move some source files Date: Fri, 3 Nov 2023 14:25:56 +0800 Message-Id: <20231103062606.2632012-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231103062606.2632012-1-chaoyong.he@corigine.com> References: <20231103062606.2632012-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BYAPR02CA0044.namprd02.prod.outlook.com (2603:10b6:a03:54::21) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DM6PR13MB4416:EE_ X-MS-Office365-Filtering-Correlation-Id: 7441df67-faab-4adf-5033-08dbdc35d115 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mNG8C8VPY6k5NRJqwuY0JEr702IIP2+4Bjn6NgKWA8KISltkEjPru9O6dmCQwOy8a2im9TnRANFPYmbRAw3/6UxsvNFVGxcqLv3hX5KUC/hoyaHJPgANS1wPm5eDzt2oWTHh8NRAvVJo4qpciRCNdxZTlJUBCF6rrSo6gaIuxOsa37IEFz21rq47CBfLh6fZN73WFr1P43RAbC0HfVLBt9TIsH9j8a2YXdzxSTK7xom89vUZC4lRSCeEil1XvLR93x42WZAGNgfkfwPdLTyHDNhOgSO1Z7ypSYFpxtYKZuUmgi2YV0w4zRJS+iVWpfk8XeR1UrwUSW5WXqwPFN3vPbP+ceWL0voNKIPFDDwtLI8YDQXFqVMNtflR3RHOkL42eBlLsiMzWO1J6nke/rKzcOF7cqc0bEwX266i0JwDaV+PhATgy34LPVjDgCqCEU1yG14KqCSRVvf0I3smqteIbWMo4EbxBBhzR4xC5qW4MYfkT+ljcMqha3zdYQ1sBNHfVCIW0FJekca3HndBVNRIhXwWuS6H2p0UtUwKPiizCKu4gJ/Q1CcUrTRkfTHoqNHCOw4tA8cibXdENrxGIGwjJ4Lvq7L7kZBvjf2JwkV2xARviw/JwjTh4jsg7wBmPfZOEq6pneIXZMC0ZIRBHuk52a13t0jJcOoxnaznqIFIF0I= 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)(136003)(396003)(346002)(230922051799003)(64100799003)(186009)(1800799009)(451199024)(107886003)(2616005)(6512007)(1076003)(38350700005)(86362001)(36756003)(38100700002)(83380400001)(2906002)(5660300002)(52116002)(478600001)(6666004)(26005)(6506007)(4326008)(8936002)(8676002)(6916009)(66946007)(66476007)(316002)(66556008)(54906003)(41300700001)(44832011)(6486002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: aU+sTLCEE3LxM2m2tJbvxl8Acm48Ai8/yQqO0SvyvRa0x8S20KnE0M74++t08CrBTPpCPE0GPazKMBfUk8/HZYT4F7Q65f6c7D6by9nIqFZiTLjDWiQ27UedpVJCu568NIzuoACFD7HyyeBtaNfRSTcvqTHqUhVdJBKkrRiesu92H62nKa3RgTiQERP449fHfbEc8+7coTosUszpilN4iLyMroxGU1tIIrTXMTVnk0d99hhR7VKJkYQEEa8iwsWPY+JyqulCoZf8ee5leN2gLO34lwFDCRgSmOw/fMNpfXHona1e+FAw+vTuFY0O5cqjvqk01D98o9yPmVK4xtjQKDrSRqZg5YC0NNN+ueLdJisNLvbOCBssqkFbQcOI3px47ULyf7aKBoT6lHS1ocb63DqSXqJAQ0M4wzaIIfVgmUvZUOg2XkTICIzzY4ti+XTU+jcIfiOQ7hzKtlaRV49JcmSU5TLKLOYgb3O/xlPwb1KR5YxT7MklSk5gxysvr/XOQnDCFzsuUXIBdd/DGpLw0LnYPGHCgAn1B8wQagMpgxN6a89SLJzGXbprfY5ghwHsMpjlbLxMn0w5fu0IhG43h4tP9W77S5j03eX0YV/91wirKW6L76Ly1rnoz8UP0ynaq0BVp05N7zJhB6/sWgYbByYxURRzpUdKNKt9suw9Dp+bPIh51B3t5HByAvF3OWYrOn/pVJj94LGDaDXJsEW4mBSSRyGz5v67YUEdEJXpba+LHjC00T0vwEc+B6yrbye8177QbYjHAfrglDF7JiGI4bBdWaAU+4QIVZCwxOD6bS9ZnOR6Jzy+kzu8QpuNIetpu3of5BoxIM4TIqUerBmtVOj+fOc+Z0IS9H8yKlDOdmmIsygK78MgS9BuoOpjVqZS1kgnNTqQdC+1ygp++qbRGtFKYRmaxNnwdwzxjt7TzuVX9CR862a9Go14W+6xi3DPucCuxnQHTg2MKHHvFZSXKYmx3QvkoWvnMw+OArNFOaQ9UQs+ptO8tsws3xOUWfgoDHW0tLBQXptdiDzCPy6ztM7Pj2ikJ2nsAh0FGX1RWDUw8hg8LPrMXkau5gtLn8ihxmQ8wEDGE8p3pApYbzY6mKtQxIUsUGZvEGwLBvwvDbBOfAf0A8x7puNnPOVIV+b9oj1bkrZ3sZ7mb77TgpHDzN4uZalezDZVUb0qER8bX/wXaqDwGEIaMHd/8s08knGTDqzfx7XfVInLSRDxi3Z9mZeLIFoHsFp9+0bQ2hXw6X3bFQX7og2HQYpdRA5qegy/x1LjgKZWssGdF6zl43d+yBdQOYqG/tA4dcGh6YuxxA4l7alT6xChLwM7BeiJAI+hKgjSX7KcnZpQNULuDhQITODJQDpgKSKXqZsJ86s0PFrnA4Z/h6A41YjdJnYcvceYJ8mi1jPz8qhZ2sJ2KVRwYgvwAEe1WjN+qBDa3uf/OcbmEUb51jjm7wnedyvM2EzAHT80eM63LVIIj5sCU7rQ8RM8I9005qNL1CRxaGoEdUkSv3ETyZvNLOEwe8b7sDmXVmUa7UrmqO5l26kbL5weEq1oI+JFm5aD1qgk3wE1MqO5aniPtj+V9ls0rdjMvM8nQSQKDeq8Lcc5HekOVFshxg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7441df67-faab-4adf-5033-08dbdc35d115 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2023 06:26:30.5239 (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: cRvm20m5MHJ0n6YeH1Vjb+Z5JPeGNCmnQMrEGBLvVjXhcUujNmBueA9hViNkBoAkNQLRwJGCL4q60mG4gFjEkacLigagfTLD2DHk8a6n+vI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB4416 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 module 'nfp_flow' into 'nfp_flower_flow' and move the source files into the 'flower' sub-directory. Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/flower/nfp_conntrack.h | 2 +- drivers/net/nfp/flower/nfp_flower_cmsg.h | 2 +- .../net/nfp/{nfp_flow.c => flower/nfp_flower_flow.c} | 4 ++-- .../net/nfp/{nfp_flow.h => flower/nfp_flower_flow.h} | 10 +++++----- drivers/net/nfp/flower/nfp_flower_representor.c | 2 +- drivers/net/nfp/meson.build | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) rename drivers/net/nfp/{nfp_flow.c => flower/nfp_flower_flow.c} (99%) rename drivers/net/nfp/{nfp_flow.h => flower/nfp_flower_flow.h} (96%) diff --git a/drivers/net/nfp/flower/nfp_conntrack.h b/drivers/net/nfp/flower/nfp_conntrack.h index 5abab4e984..9bfca236ed 100644 --- a/drivers/net/nfp/flower/nfp_conntrack.h +++ b/drivers/net/nfp/flower/nfp_conntrack.h @@ -11,7 +11,7 @@ #include #include -#include "../nfp_flow.h" +#include "nfp_flower_flow.h" struct nfp_ct_map_entry; diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h index c2938fb6f6..45543816ae 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.h +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h @@ -6,8 +6,8 @@ #ifndef __NFP_CMSG_H__ #define __NFP_CMSG_H__ -#include "../nfp_flow.h" #include "nfp_flower.h" +#include "nfp_flower_flow.h" struct nfp_flower_cmsg_hdr { rte_be16_t pad; diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/flower/nfp_flower_flow.c similarity index 99% rename from drivers/net/nfp/nfp_flow.c rename to drivers/net/nfp/flower/nfp_flower_flow.c index f832b52d89..e26be30d18 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/flower/nfp_flower_flow.c @@ -3,7 +3,7 @@ * All rights reserved. */ -#include "nfp_flow.h" +#include "nfp_flower_flow.h" #include #include @@ -4318,7 +4318,7 @@ static const struct rte_flow_ops nfp_flow_ops = { }; int -nfp_net_flow_ops_get(struct rte_eth_dev *dev, +nfp_flow_ops_get(struct rte_eth_dev *dev, const struct rte_flow_ops **ops) { if ((dev->data->dev_flags & RTE_ETH_DEV_REPRESENTOR) == 0) { diff --git a/drivers/net/nfp/nfp_flow.h b/drivers/net/nfp/flower/nfp_flower_flow.h similarity index 96% rename from drivers/net/nfp/nfp_flow.h rename to drivers/net/nfp/flower/nfp_flower_flow.h index 09e5b30dd8..75f18c6bd5 100644 --- a/drivers/net/nfp/nfp_flow.h +++ b/drivers/net/nfp/flower/nfp_flower_flow.h @@ -3,10 +3,10 @@ * All rights reserved. */ -#ifndef __NFP_FLOW_H__ -#define __NFP_FLOW_H__ +#ifndef __NFP_FLOWER_FLOW_H__ +#define __NFP_FLOWER_FLOW_H__ -#include "nfp_net_common.h" +#include "../nfp_net_common.h" /* The firmware expects lengths in units of long words */ #define NFP_FL_LW_SIZ 2 @@ -182,7 +182,7 @@ struct nfp_flower_representor; int nfp_flow_priv_init(struct nfp_pf_dev *pf_dev); void nfp_flow_priv_uninit(struct nfp_pf_dev *pf_dev); -int nfp_net_flow_ops_get(struct rte_eth_dev *dev, const struct rte_flow_ops **ops); +int nfp_flow_ops_get(struct rte_eth_dev *dev, const struct rte_flow_ops **ops); bool nfp_flow_inner_item_get(const struct rte_flow_item items[], const struct rte_flow_item **inner_item); struct rte_flow *nfp_flow_process(struct nfp_flower_representor *representor, @@ -202,4 +202,4 @@ int nfp_flow_destroy(struct rte_eth_dev *dev, struct rte_flow *nfp_flow, struct rte_flow_error *error); -#endif /* __NFP_FLOW_H__ */ +#endif /* __NFP_FLOWER_FLOW_H__ */ diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c index 0f0e63aae0..c23a82c356 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -334,7 +334,7 @@ static const struct eth_dev_ops nfp_flower_repr_dev_ops = { .mac_addr_set = nfp_flower_repr_mac_addr_set, .fw_version_get = nfp_net_firmware_version_get, - .flow_ops_get = nfp_net_flow_ops_get, + .flow_ops_get = nfp_flow_ops_get, .mtr_ops_get = nfp_net_mtr_ops_get, }; diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build index cf9c16266d..8407073af8 100644 --- a/drivers/net/nfp/meson.build +++ b/drivers/net/nfp/meson.build @@ -11,6 +11,7 @@ sources = files( 'flower/nfp_flower.c', 'flower/nfp_flower_cmsg.c', 'flower/nfp_flower_ctrl.c', + 'flower/nfp_flower_flow.c', 'flower/nfp_flower_representor.c', 'nfd3/nfp_nfd3_dp.c', 'nfdk/nfp_nfdk_dp.c', @@ -30,7 +31,6 @@ sources = files( 'nfp_cpp_bridge.c', 'nfp_ethdev.c', 'nfp_ethdev_vf.c', - 'nfp_flow.c', 'nfp_ipsec.c', 'nfp_logs.c', 'nfp_mtr.c',