From patchwork Wed Sep 20 11:34:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 131724 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 3349C425EF; Wed, 20 Sep 2023 13:37:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8426842DDF; Wed, 20 Sep 2023 13:35:48 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2092.outbound.protection.outlook.com [40.107.93.92]) by mails.dpdk.org (Postfix) with ESMTP id 5F3F142DD6 for ; Wed, 20 Sep 2023 13:35:47 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NPajwr6/PpkrZzoLR5UtTgScPHcm/epeFedBAjMys6tHqDMUmvryHeFvA2g7rlsARhy425nJordC0X411TVCzs/Q+7GKjY3m6ViiQphbKCcrP3M9LNpMyqWQks73AOz9KXPHcEW71RMbGsPSYneHGAsXgX921XO04Qsk5+XCSH/2xs2SjMSGBvvZd/6OB2VHoB7AP2tK/BO6cxE4OVOHJV/E3sgiV62RDmTvEX3VsCsmTWQh0MYLARtc1J3/fVYRKe29FVoKZJQ6TDqq3zBfmUQEZ0ima7E707am16urnFRGHAjTpsI7vpirtBLc6QV5NQDisAhNQ2p65c4DyllF4w== 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=CHAAvDX/tEoBM0kiWzCsi5U752lH88RsQ8LyiQkNdhQ=; b=P/HJR+pggI2eq9J1VySCFfn1vhZFhIbz7OE7gdxmAdJ8x9oq0kYD3Vb1yIPOvnA/hO/Gc/sl3IL0kNaoKwSjiAKmdHMASL4iZ6oNo24aLiEzD8q4QcOz0VZDmWQtuGdyvBwiTBi5L008HdmuZWNBR7UwaKqCY5vgavCwp2WPRVRG8qg2PGSqNX3ZM29eG5tls0vIzcpZ4zsQvqFjiuJsTDCYRhCF85AAVsGb4BQ4NsrUUUOVtZ3ITTxo4yGnI3lQUV+jqF0vZ8bwFExPDj46F8oMcTQ73UlTla0MXbu1/z/0LsJhacQgKIRqtajUyNDtaAcw838vJmBIE6aIvZe1zg== 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=CHAAvDX/tEoBM0kiWzCsi5U752lH88RsQ8LyiQkNdhQ=; b=FZZ95OtCN6Po5PGnM93KrSSRDn6/V+FTTTj2FHiRVJ8RWmyXpoVR1YL9QmCPUq7hDdnagCaj8c0j9VgA0P1pD57qYniZWriUrluK7xKmtP/MYzE06X/QHSubglkDMJc4760wz03iJCOoEmG/5zGIzojMYZHaknbQnClAXtIFdPs= 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 SJ2PR13MB6474.namprd13.prod.outlook.com (2603:10b6:a03:554::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Wed, 20 Sep 2023 11:35:44 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7a1c:2887:348a:84bd]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7a1c:2887:348a:84bd%6]) with mapi id 15.20.6792.026; Wed, 20 Sep 2023 11:35:43 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He Subject: [PATCH 13/13] net/nfp: cleanup the include statement of PMD Date: Wed, 20 Sep 2023 19:34:54 +0800 Message-Id: <20230920113454.739356-14-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230920113454.739356-1-chaoyong.he@corigine.com> References: <20230920113454.739356-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SL2P216CA0113.KORP216.PROD.OUTLOOK.COM (2603:1096:101::10) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SJ2PR13MB6474:EE_ X-MS-Office365-Filtering-Correlation-Id: 2cc8edf7-588f-430e-c611-08dbb9cdb99b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8eJ/hATghzyThgEq+mlWwCDM5IeWCNgZzgHdxvjxp4gq5GglR0qeIgzA8A7/mkniZHEWcOPx0bn8CVqUqdRTfC9xxxnKOjTDsD7o+AYL9mLPrnTMzvYF4V2rEsbX0YkQgkYQwLfAPDZPHz+0qqNc3e6NfG8vS5Lqu4QMbCz5DnyO3U5ple65zxO6b3seyo0kQpJ99+1eP3GaUPFruO3GEAhPM4U4pYAATRGDBFlYFDO9rfP5RjCh7zh5mv0KDps7of4H8VuIW0zMrtWRFdnfG6czsDeUv1chj7j8ZLS7DuYXA7vE/iioG0boe3Q9bIdFSuURM79T2lBgLZMuK77REiaZjbmIO35KyRXeLEfWDYplg3Elg25XLmGjqVVvaW3g8JawB7jTywdGSPBDRNvspO+jspjtDDIn3AEcbQMXKJXCXy2ztHUr3WpjgPD83KY73GPfUlpie+Gjq+XqP1y1kMSuudo6vZPprI0XhzDMjsh8BXAUg0ltvDo8xz4zbLIPHirb7hgnWUDVTYEucRpZk2C6tvEBVzKFJubb+K32zUnpgbODvScm7qAfqZi5MIIHY6U0lAs3AYxQ3QMns2T/uE/13EJ0g2ouAj/VShlVY/jZcl8UhxMeTCwd8OFcSxgIcq37j5usdcsk2lSURe2j+VtPqoJYkkoPQ2M19G+k8Sw= 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)(136003)(396003)(346002)(366004)(39840400004)(376002)(451199024)(186009)(1800799009)(38350700002)(38100700002)(36756003)(86362001)(478600001)(66556008)(66476007)(6916009)(6666004)(66946007)(2906002)(316002)(6512007)(6506007)(8676002)(6486002)(8936002)(5660300002)(44832011)(4326008)(41300700001)(52116002)(1076003)(26005)(2616005)(107886003)(83380400001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9eK5FqNF2aHMQbXF7FmgAEgkFkV8XAvw9FIeKRrUfUPO1rgjQlAoLgzyitpx7h10YY7KtFhSMYJYdDTPYKAzcVy8+oUWTx1P/fQ8nPCgvjNyqTJMAAR4REnjlZVnox4otgmC50YkG7nW/cZevF8dOEfcNp9xfwR6IKdzRGya+08N5TJLJzH/4p8TQcVvi3QcFzWh1kioBPp6dKNlyLIRTnj3JOqznaJyxXmzALbeCJ0hwPkmOBbftbZVvhlHzEh37QMKPVOMO3BUUsimqbBRm1evpZEepe+9flRC8YqTSzRMCp1gLvccM8xLbYOCD32mmynGK+yJjGtNY0wQgQLIvO8f6b0AUBP7iY+J3Eja1D8mEXCE2tO+X8R/NKyAStlxHg5b9jAZOejGUJSToe1HfNF6+MvC52Cd2iOERvlcNDJAyWmI/NQvNPeXDdW6JePc1KRl663d5RBS6aFFKJXj6UXSvkDDflHV0kYpG+4ndtxiij6efS57OsAoyFw3eSvjfKMvRhCAbfsocMScyjxwFM9QAAgpVJ4siMPUbs/8F0Hnj/lMJXAnHOC1NG3Q0jZhMN3y0ovWEk3V3A9w4h+tfJmCxrF/6pat2lRW04r/e46LpbneTHJ55VmFo/skXhP5hQeG2Ttet/QD2DVjUumw41L7oyQ0HsKlZuY+UAqHifi7qvgcnGtYyeL/uynMGQbLp5mPgv3eNqYO5ls4cFzE1cdR9r+6zNDCAcTkpUCqePd9TBCGL6Yym/D0Mfic5EiUkGVVR0nMLcD6OchPEDvMd8IPR90gXYxcKa6lSwoIY3DWAs65eXt91oFs1iog2M9Om4KT0NHYKgZHAZzmup+gGMfUXY2CEmbbl/tHHKSCbI+dgOFuzQ6REYgb+emkG4Wqr/ORKX0clO0PhPS6Mh+qmEnPVIFiv0tmoeTZ4fS6D9f3PQVi00vZ23YWNYQQnvMstiTvy8H+N+i1+RsX5OTlxVXNlG+jzZjVgkGr9y7YF4VHcn3WveEXhHADLaADHb/apvGRdHiK1FLODANmZ/CdCmNzqXOWOSzp4A1EZ+hCHVE5RrkEXqDvmi/n8NeqEOqM9Ay452UZqUuVXHX2zST5otQC6lFpkhCYQkgIc5ksrq6MBcusvFvxFFJ8VjMp7sTCcYon34l8uVvcMqGFvCIz/EvydFBfVsvdDa67DcmFVeC/zgws2qmmDJG27YBCVcMgBsUDNo11ypEI6YoK+UtWX4ibPeBnX1hLbelPtjQLq2s5c34kBu5O1wET/xzMdbj+6IgSBhwd3XluTsfMrCnsiEJK6/sJmEtwDB5lUpNHhD6NiUNlvXCqSIPu2QM6Y4t9sfbrj7bwp5PBKYBPOpolo05y5HNdUX0zAkhcipl1S2ugvGcgOloj6KVKU6KAgzlhXxp/ij7esuLldcxMWoT2UJ1+/Yq6hYuwvtP+5GFV5af5nb7AI5A97v8KwrBvmSVnBD8CPqTaIV3NQCTWtZvbD2Hoz3DOEKj1zLgdQ/ujlpkmyeEmHmHAkl7Yl6GzQNfD1pFWy3N8jhVb5Zk7Pk+4uvKqz9wUck83864m5S7qv9Fvt/FSdjQrh5Cx8/Crz8ed6cEJ9w03TAjvxPx8CFPudA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2cc8edf7-588f-430e-c611-08dbb9cdb99b X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2023 11:35:43.8699 (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: oUsqCTk+UglZVbTKqMhO7FhjT2N6TzMPiKddInTD+HR6yLgrDY7bKFUo/C6ieMDwWCe42hdlnu+u0B+mGCRFbxUUrE/fgIxsK+/zaJSuejg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR13MB6474 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 Remove the unneeded header file include statement of PMD source files, also adjust the include statement of 'nfp_rxtx' and 'nfp_flower_cmsg' module. Signed-off-by: Chaoyong He --- drivers/net/nfp/flower/nfp_flower.c | 2 -- drivers/net/nfp/flower/nfp_flower_cmsg.c | 1 - drivers/net/nfp/flower/nfp_flower_cmsg.h | 4 +-- drivers/net/nfp/flower/nfp_flower_ctrl.c | 2 -- .../net/nfp/flower/nfp_flower_representor.c | 2 -- drivers/net/nfp/nfp_ethdev.c | 25 ++++--------------- drivers/net/nfp/nfp_ethdev_vf.c | 9 +++---- drivers/net/nfp/nfp_flow.c | 1 - drivers/net/nfp/nfp_rxtx.c | 1 - 9 files changed, 9 insertions(+), 38 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index bbcbb0060b..1e10b38120 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -14,10 +14,8 @@ #include "../nfpcore/nfp_nsp.h" #include "../nfpcore/nfp_rtsym.h" #include "../nfp_cpp_bridge.h" -#include "../nfp_flow.h" #include "../nfp_logs.h" #include "../nfp_mtr.h" -#include "nfp_flower_cmsg.h" #include "nfp_flower_ctrl.h" #include "nfp_flower_representor.h" diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.c b/drivers/net/nfp/flower/nfp_flower_cmsg.c index 0b8feec05b..6b9532f5b6 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.c +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.c @@ -6,7 +6,6 @@ #include "nfp_flower_cmsg.h" #include "../nfpcore/nfp_nsp.h" -#include "../nfp_flow.h" #include "../nfp_logs.h" #include "nfp_flower_ctrl.h" #include "nfp_flower_representor.h" diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h index 3c2b279f40..9449760145 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.h +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h @@ -6,6 +6,7 @@ #ifndef _NFP_CMSG_H_ #define _NFP_CMSG_H_ +#include "../nfp_flow.h" #include "nfp_flower.h" struct nfp_flower_cmsg_hdr { @@ -974,9 +975,6 @@ struct nfp_fl_act_meter { rte_be32_t profile_id; }; -/* Forward declaration */ -struct nfp_fl_rule_metadata; - int nfp_flower_cmsg_mac_repr(struct nfp_app_fw_flower *app_fw_flower); int nfp_flower_cmsg_repr_reify(struct nfp_app_fw_flower *app_fw_flower, struct nfp_flower_representor *repr); diff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.c b/drivers/net/nfp/flower/nfp_flower_ctrl.c index bdb042142a..c5282053cf 100644 --- a/drivers/net/nfp/flower/nfp_flower_ctrl.c +++ b/drivers/net/nfp/flower/nfp_flower_ctrl.c @@ -9,9 +9,7 @@ #include "../nfd3/nfp_nfd3.h" #include "../nfdk/nfp_nfdk.h" -#include "../nfp_flow.h" #include "../nfp_logs.h" -#include "nfp_flower_cmsg.h" #include "nfp_flower_representor.h" #include "nfp_mtr.h" diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c index d4df88fb73..55ca3e6db0 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -7,10 +7,8 @@ #include "../nfd3/nfp_nfd3.h" #include "../nfpcore/nfp_nsp.h" -#include "../nfp_flow.h" #include "../nfp_logs.h" #include "../nfp_mtr.h" -#include "nfp_flower_cmsg.h" /* * enum nfp_repr_type - type of representor diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index b2a2cd9ed8..241595be9d 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -5,35 +5,20 @@ * Small portions derived from code Copyright(c) 2010-2015 Intel Corporation. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include -#include "eal_firmware.h" +#include "flower/nfp_flower.h" +#include "nfd3/nfp_nfd3.h" +#include "nfdk/nfp_nfdk.h" #include "nfpcore/nfp_cpp.h" -#include "nfpcore/nfp_nffw.h" #include "nfpcore/nfp_hwinfo.h" -#include "nfpcore/nfp_mip.h" #include "nfpcore/nfp_rtsym.h" #include "nfpcore/nfp_nsp.h" #include "nfpcore/nfp6000_pcie.h" -#include "nfp_common.h" -#include "nfp_ctrl.h" -#include "nfp_rxtx.h" -#include "nfp_logs.h" #include "nfp_cpp_bridge.h" - -#include "nfd3/nfp_nfd3.h" -#include "nfdk/nfp_nfdk.h" -#include "flower/nfp_flower.h" +#include "nfp_logs.h" static int nfp_net_pf_read_mac(struct nfp_app_fw_nic *app_fw_nic, int port) diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c index 1a02a857ea..0c94fc51ad 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -7,15 +7,12 @@ #include -#include "nfpcore/nfp_mip.h" -#include "nfpcore/nfp_rtsym.h" +#include "nfd3/nfp_nfd3.h" +#include "nfdk/nfp_nfdk.h" +#include "nfpcore/nfp_cpp.h" #include "nfp_common.h" -#include "nfp_ctrl.h" -#include "nfp_rxtx.h" #include "nfp_logs.h" -#include "nfd3/nfp_nfd3.h" -#include "nfdk/nfp_nfdk.h" static void nfp_netvf_read_mac(struct nfp_net_hw *hw) diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index ff03bea6ce..aa286535f7 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -10,7 +10,6 @@ #include #include -#include "flower/nfp_flower_cmsg.h" #include "flower/nfp_flower_representor.h" #include "nfpcore/nfp_rtsym.h" #include "nfp_logs.h" diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index eeca193d14..e74aba7439 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -9,7 +9,6 @@ #include -#include "nfp_common.h" #include "nfd3/nfp_nfd3.h" #include "nfdk/nfp_nfdk.h" #include "flower/nfp_flower.h"