From patchwork Tue Dec 5 02:54:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 134847 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 B2F98433FD; Tue, 5 Dec 2023 03:55:26 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 47FB342D0B; Tue, 5 Dec 2023 03:55:23 +0100 (CET) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2125.outbound.protection.outlook.com [40.107.102.125]) by mails.dpdk.org (Postfix) with ESMTP id 0CD0840299 for ; Tue, 5 Dec 2023 03:55:21 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ko7FyGcYxGOEHp/hjDZ2GhqN9kQ57Pcz3/eyBdDlDX0gPmqIzGnGI52XFZGtq2ABnZre2tSlZ1Blba62bYxrG4ClqMBOC3mDNqkfLs9NqiqqPNHo6/27VYjaigUi219nHEdUsOQZjfL/EySyedrhlphGLN8lNQrOil5WZkzURB3fFZlHezCWfR3l5fthqU8lx2UotxSIYBKUf6nLHN5AbTFytZd00YaWRWU+J8oHDrCxmAAMTXbuA8MP2qv2817nDDM02XjtSp0FA4b+IIxRuBZkk5dwYEbzUQW8Z5rTfvviSqWzgTIo/MeYb8GTNQbuFKipy3CKgvepRHjGVNQzjQ== 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=KpopvBAPevHfzCV4Dv6SaetEM5fAqt2ZnWeScuS97/c=; b=lS9LB4g8BGVB1+MyfgvHNGpJzzyZLeVx9g1NQRnuJdMYYgSJt3bneDb22zlkDbFFKr6sADJwky9Mc1N8W6piOD3I3BvXWZXSyZyUayHFvFFdCtU5ANgXrL7cr5+vjz/hGeFk5uIf0pv3tkXwo1jjMAI/sFDivcI+NP8n6A/XIhB9aLt8uxP6jOYzgBw6D0cFw8dGGsTrYs6wbxmVjX9u7QhI7gZ51TysmpWr+kL43Sn2Cw20bsxWaNqK1y5ouyoaEDLOJh2iyZ15MDFYjgpBLDhGTGt8t4PKxaZppH9SxNeBD4Uc6l7XqjWFUF9ilKl2pNfCf/N91duFKJ4oQv7wTQ== 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=KpopvBAPevHfzCV4Dv6SaetEM5fAqt2ZnWeScuS97/c=; b=JLgVauaLSCki+kdFIomxZ7m6i8lCsAeCJu+aOy6vpsRoNeHAOqVzuh+vSI7HK0uWhaN12TfL8LdoOQgHCwkMnDxcStG+3Z04Irwps6jZeXnuE0Cuu6PQxGhSrIdadQERaqrWi/CmPMpMzsSZ4wjLtEiXGE0rMNLUbcpXcoBzRDc= 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 LV3PR13MB6528.namprd13.prod.outlook.com (2603:10b6:408:1a5::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.34; Tue, 5 Dec 2023 02:55:19 +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.7046.033; Tue, 5 Dec 2023 02:55:19 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH v2 01/11] net/nfp: move some source files Date: Tue, 5 Dec 2023 10:54:47 +0800 Message-Id: <20231205025457.1067372-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231205025457.1067372-1-chaoyong.he@corigine.com> References: <20231103062606.2632012-1-chaoyong.he@corigine.com> <20231205025457.1067372-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SJ0PR03CA0214.namprd03.prod.outlook.com (2603:10b6:a03:39f::9) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|LV3PR13MB6528:EE_ X-MS-Office365-Filtering-Correlation-Id: 789fed1b-13b4-42e9-ba2a-08dbf53d9d9e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1C6PW6pSlwGdcuhpxVxu5vah3bFIUsjlrKXuB4z1e4BQekr34PS9bi1f3fBLWKROPXWWqHbZMOfXpyFA32BPPluZxSd5yiE28tLxRsO2dZheRrJULt5Z3L4bMrq2nHUhYHHJXHzjF0hHlSWtY1298hluPK8hufeStM3xyNdaooiVeouAvIuL1wZSF7P9EuUBH+tLhwsqmXCAh7aC+rnOAp0WPg5NZcTXKKoHpR20PKWL5fddH44bHG/9Rxgj3wyk0yuMxg/+R9Z1MJxF9J0iG8sH6aBGxtVU/p24cq18DtYkZjvWTygXqluVtud+jE8GrxqPEwykPmFYWCdL5wF1iFc/CHVyZY7zNFjfjjrydtATLAP8BEFA3TaRY9Qc7yAKZ53Yb4cPev8FA7JfA8RaiCrYAgR+9HyplAruPcBZNlux9R2pDqO+szM0Tpr57BezY6BxwFThXSFbpDr/A99M5MlzBVinttlppMW3sp27wyu4ZSRxC4xY3N5yjmbYqNbcYc88Fpy3Sha195ZP096nwUKEq57++bUADEydVmf8wTdiVRC3bPoye6dsneQzgFCSI0zqZlworikeVoDdTtQxfWo3+kIH2Jwk3ZiiVhF9l5QAA7/jO4l4qsAvFqo34u2+67Bx5USeDo0BQIa5dV4QfcIZ9VGvDGFK8GRG4xP+0GE= 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)(396003)(136003)(366004)(346002)(39840400004)(376002)(230922051799003)(186009)(1800799012)(451199024)(64100799003)(2906002)(86362001)(44832011)(4326008)(8676002)(8936002)(5660300002)(36756003)(41300700001)(38350700005)(26005)(2616005)(52116002)(478600001)(6506007)(6486002)(6512007)(1076003)(316002)(54906003)(6916009)(66476007)(83380400001)(6666004)(38100700002)(66556008)(107886003)(66946007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MZ0Vu2fki4QYDvvYVm9Tce7W4xKB6nhhgWNwQ65WdboKZ2TvFYccVPnY1xJynsLa5HE+azt1DmYV8Y11l9yQ2Rp4z6AULhPdBU5fgiOZP4EDjAQTWmmFJPjfUqjyuJlKbkEpj62f8I/0dPsBtuMCenrIxCMZ2ut1ltV3R1YryrtUnlRVer1/pGgQF+TrnEJKztAYrXpKXfMlHAXADeRkKJlSUIwr+M+0fmrc5VWJ0bhhvp1dBLGh3/aVgFgiQioKw60GofL3J3447YCRJ4UCB2UpC+mRtt5cj0qwaG9sQ1OsWYyjDnVYWfE3iFnY/GaLGQuVJy/IncrumsH7JMS4iNOyC0U/CWxYs3P1jP0RJDS0dLtPGQhXtLgiZFag3hlimhYX9qFtARqwvI/r+jI3X00Nn12+4pFezAgwa0WLrXynw+4a8UOTfw40UrBnjAMfooMhKbjbogVlaPEb5jqAbcfGseEl9/CRw1ZwT2SPH8tUCPwwpdaU1JuPULx6wKO4bhZo3vCAvRt4fPyuZ2xUr6l818Al3tkHq4TapadC9cxZsGWWduTr45JRotnygkTefpR73XL+rHBSuBE/Bysm4U6tKj1uc7J4ktHxiqhbOOxYAxbw+obcoAggsP7a6A9Cx68wMF146f32+iiOYds3hSByHmBLT2n6WHMQyeO/PxW8wPy7Rs89pmMJ4mb8SeWId4eo1MmIqD0yEcl89iU2d7+DFPjVppEiFL+QrnCB97hSV901iyetoqZVP34QXk81KExk2oB7xyIEb6hWlGpwAWj9/ahND6L09DrLJ4Qds98/ARxYJVCuG2ABE1LiCM76JLe1wEJzBgpraUVKRCrPlZ2LwCxYb6+40vuY/VVl5o3ao+AvlHnmn4aWQSDjT4HBxigZyzLQqC4ZxvwyNZpewxQk8m5JZXy2uFZjxJAYRU6rAWHAh79aC9rVtIvEFlvRsW1CydzxQZhr370n2vgTVec2wJGGnyatu0U/0sHuLkEKaKTnMzSivM01AQ5XUSzgp6ZVIb4kRgEx49PtCU3PWc5FMRU1bxxlsVolw0eU0ZigcSDc028FDU/XkmXorD0kqpp1BmvpUmSIGuFXeHh6Fz3wAVhuWsBy9MfVHuqx0Bt3p511UtZh6k9mnr5zo2mbXQR9klV+J/oVkbwsCmoc8MmFk9v0Huu7RW3Cg1F6JOdOdyKD/XbdpYtZW3a5fIyQ265TUZ69jRgwhSpemrNKNaoL//p/eGHbImIOFMOYknAQ/JQU5scAgspLxtXYbb157IeDN88Rh1V3XaGF/1gD9Ny2AhZ0w1v03KQt521grJCSLkqv+s/z/WmYRXpW/jRUkHwBWwDFWjCTX82hX47e25vceZplVnEeJ8eMj0hcNBmFDmwvTfh1rSepZNsb4qL9MRMHk7fMRjimjQPtVV9G/KzoS6oFZbjEsLhbaTrj0dK95PrgJorqsUHSDYga3CAfyy1iE8rLs5+M+YIRB9DJGjDQ0QN2/nvNOrs+fa/z6zEjg3eI5K7YapFftUA9Rw8iuy/xi77QdMIyFoWV51zEW3zXjOZ5Bns2GW2fkaRnd4iCo/3Mg44EeKyqVBa1N41PdLAKizv8ZhDocWqfxzbLyA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 789fed1b-13b4-42e9-ba2a-08dbf53d9d9e X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Dec 2023 02:55:19.2014 (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: kHa5Xw/Gk0s0+ZNtqotu/0E02ACh5nW7VgxwrVUCeg1vEraBqiuH+jT3FB27g/2lpLPvVYR7zLaG/qxVxN/TJhz3lbZynnJObICsbT4IHwY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR13MB6528 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 02089d390e..7d8c055b80 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -435,7 +435,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',