From patchwork Wed Sep 20 11:34: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: 131716 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 C130B425EF; Wed, 20 Sep 2023 13:36:01 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D2364427E4; Wed, 20 Sep 2023 13:35:36 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2139.outbound.protection.outlook.com [40.107.92.139]) by mails.dpdk.org (Postfix) with ESMTP id 11FCB42D28 for ; Wed, 20 Sep 2023 13:35:32 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rw9zS5IPI47Fv1L/KSR7+Y8G9R7ZPvB9gr56b7IiVgpDnbeACmbG5lqXS3Rw84bl1WUtyWucc3d1A2vbPrS8QE+5ITQ8XDqyGOtpENgEAuEBp+dp++tXnKx5WBqC1nJkuOZSchlB1g9IIp9jupIoKUFkTkHq5E1m5Bq2eUlzEK/boYaAD4MZXnNcXd7l9eYsqpsvAKHrSd7locv521aPuPIsXEWVqIG2Za1qXrcHjVvqOKwSu70gnkIpFAfKgprf4b0hjnaXWaPwzRBNfKXSLILBz6XB/BwOqwK65LHHgj0kkhtT2FqOvPXSW7X2Jj2/xI3kDjVmFck6KWwvJgeSEQ== 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=b6JysoCbCff3IDvtBbYi2wTgMpdt/i5aBunJ8v31c/8=; b=ATxfBx/9cd8R5JLl6y8p/VNSWG2mZogVjAKmUMstXnDNnbsKvECl3TQJMbIY0kcQIDfKwi5MpARQt7GQed5wH8Bmul2J5q33UUUdC89b8DzJHj2wk1xL4RGnWEF2c7LZZsXeU4frNGu9oQ/fAx0RKazieJh6bQeGgdkWkf4TYeB2Efd0PJwq/4Xyc9s+/KoH/DVlevF2f9+3ELII+LOGMvk5GosOtug/l/6Z5ZfFFJ0PJGin3ORQ0WHIoFaG0ErnzpI4tRoeyjBCBoANHtyU/EwPP1UBg1Gps3uNnGLZoGs8Mr9CRthoLmu09m2oE9m+KkwtWbhj+cT7v2QF3wztMg== 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=b6JysoCbCff3IDvtBbYi2wTgMpdt/i5aBunJ8v31c/8=; b=ePCj8HZhkJVyWEUkK3uFcekqUlk6DZ8mygKHbzZKi5fpl9nQehuMUDvGqc+ME/EHHWfO+FxOU8upfj5rIDjEoq5Fj4eOkztosT211dJ2VcYDG4UF/14nRmz9NJHmj8qfdRfQxgchHzoZ+3GyniPnAMpUtQ9gwq1cziD7641E1GI= 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 MN2PR13MB4039.namprd13.prod.outlook.com (2603:10b6:208:269::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.28; Wed, 20 Sep 2023 11:35:30 +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:30 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He Subject: [PATCH 06/13] net/nfp: improve modularazation of flower module Date: Wed, 20 Sep 2023 19:34:47 +0800 Message-Id: <20230920113454.739356-7-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_|MN2PR13MB4039:EE_ X-MS-Office365-Filtering-Correlation-Id: fba43bbd-b932-48d0-8d94-08dbb9cdb17f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YDgo24ftxDSWQPG8j5lLVgEnJqmegmRe2w77Y0jYnPMcYHrxennOmWTGtn+PByyWs+O8JdBFqky8whHz8GRvvqeVSrg9f4pD+QDlGTQvuZHoJ9NRGHC8OiyeMfS0UL0w/dTW4gEpmEF4/yzMiPW9apBiAO3fN36GTd5C0EEQvUmiaZmoWeM8TdHTBrHO+GziJ31GKTo3Goxb2XwCxpRxrjzk8m8btCcVFhRjdfBoHm2vByjgOc2oG7Iwr4fZ06vrneAZcY8zAK1qHbKOGssVlt984EcReh+b8QfQRcCb4V2HPYloKxqQH4CTu/DVV4CcDRcOkng6Br+SyhwmZ4h9arKq3xQgiZaAROvwm2cTGSxXb65wMjjQOgdvdFmDceoVZjCcstGNGEtC1vT6dxS4xZFZr5Mkt57tr3G24Ldta1WX1aKtHGRh8qLd4UulNGAT/Rv8bVg/RcJRskyjQixzwh0YDCaoVCq+MiR9B2diPwhIaIQLkNcaqzTrkL7K5ekyQySyXBLylQ2DWYMzmswSoCRNwx7O0KcG57US4Ciq+0XW3FjxYA1uxS6svcUMXABhbOt41/I9FJYnmYHpTkOnPcqyuropT0x5l03P5pbE3s0+KWaGflqaKkyS8meYPki5RdydQZeBhR0bcDwv8f5fWeJYp3Ly2q1E72FRW1Y7Pz0= 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)(376002)(346002)(396003)(366004)(136003)(39830400003)(186009)(1800799009)(451199024)(6666004)(6512007)(52116002)(6506007)(6486002)(86362001)(41300700001)(66476007)(6916009)(66946007)(66556008)(316002)(478600001)(38100700002)(38350700002)(107886003)(8676002)(1076003)(8936002)(4326008)(36756003)(26005)(5660300002)(44832011)(83380400001)(2616005)(2906002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BdQ5mzwaaQ0DEVHEVa3Lk3GaqHIRNVr84vhdyARBtfEAFtNQdPCJA6PS34ckuF1dYTJlxt2yDbl2MF4ShVABVLr/z10PcVV9RGHQcvmdVbIc8HdpAZ0oy8usGzO0r97oMvtlxw216R0sodGEPFR5mC7q9+Y+wezI4a21t5QRMxfNXPHQotUfCgYLOiqJ39ygW6afYNbAQx7AfKrT5c5VOYpy/+Rt2iTMZlIlLDqEaUJPA4m8Lfttr45rnpesr8Tfqcmy9bEMdYwEvqixlxSuru3iJ8rbLI6sTimX1l5873/DmHvUydg/3iKGtlBHGffkmcUUUs7zwNfy7eWq8VzaNPFEZZqbSJrP6NARNnoigfzguZkr5N52SNqh3rtBu0yZXqgcCdnFhwlwueFy9e5M+0mcBfkQqelPdkjBWkFEVQpz94aPaMgrtfmKh83jEwZehiw1Jt5yz6xYA6d6UsZWwC5/a31RDgpS16otUms6V/hNDfySO1L5NDIF49Uqtmmp7FAywIv/p+wYk0DtW8HLxsLXIeB2E79l29p3nmRjQhi5mSBLmYPfnUfNR3D09K318XhnowARUMeGUoFxmqFwlAk5ce6pc8Ensfbpuu3Ys4o5i3kypXP9P7RcZABqmWxFbCJrFYNaHMbuonHDkTP4E9TlhQyIh5ddkbDJzn3DIJNKJRPtdmGKzadjXy88lSlIQ6o4YmvEf0Xipk0d5e8kttiBgFSo7BcMQeErGwSohbzqIVXzJHmAgyljFVorB4bx3DgFXi5LUNce5OkkugLIAbuRRU8wi+nV1IY2aZA7D/I8fifWj1q4FvOt/bM5KIFGv0P0rS+RY2QLxr1D5Fa9mWcv85SqS1MxYvk4Sn1idOz7kE52i2LkydAFRlIiQ0qOLRp0mq20nHH+Fpaj6Z9DqcF8NyRCmJk2x4UFuAPpexcI84UZ3yVWRM7WPD29lx7gPBU1qUnvcRCx6qZBlhnZUI2Qn4NJlzulQg2XXBNcQM8lpyPEChYNaAR/AkuCZG+dpu/WDlku63IPfdPxAs3NQmLenzD36PZ3TYBxgaiISUygfwfmnS8R7t1/cKLMsMI0z5OyItzg1TJW/XN83ShZm5MQkzaOjMQYvuF22izQ4AWLu5QSDO4J+x2CyqE5MECQINSLs8FPl05CfYCNbSviHCwXrdqr0FN0Vciputj3+XL4xnaUW121JhvvG29SKXh5aRjzFgjHukKDzPPzrYLEC/CyPmkrs5t57lb5OOErRIWk97jaQijiUXxnJVjH9iIZx1c7LTEI+vwvSiJb54IM97KOjUCk7wbZbh8yE1Rgz9RuyAwxvHfbRM47iZ3EchEI9fWjlM0YqqfbcS3aFhFdfJ+EOeEa24l8Rp2/yXNsT8zDZprPG8yya+z9RU4Ge9g7nqtdR2aM5avHKqlf6DEf53r3+jVkRpd+xpGkywpeKkp7yFOlmmva9eiqm3q7vbZPEgTkmof86nOMVru/2yRINzThZjVSdkkfAIo5xRMjHQtDsEKrXsTzoNmBtADeXuaENkJEKx5KCly8B6TF1dMQ3JNggmQKiWLU7iO/ErSPjJpVYVzAYxSFIsk25TKJHdqHXQYQlFGXRlsQbID6E9v15Q== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: fba43bbd-b932-48d0-8d94-08dbb9cdb17f 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:30.2782 (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: SMM6DXDiOhg43i6UXv7DtpIQ4qXM2+/TWIRLRML6/wTanJ7YthSIdKXNaKJLL0CsXKebrLRtxo22n7QxwFONkW39vaTX0pUOPJU4D63ENK0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR13MB4039 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 Make the header file self-containing by adding the correct include statement. Also remove the unneeded header file include statement of source file. Signed-off-by: Chaoyong He --- drivers/net/nfp/flower/nfp_flower.c | 24 ++++++++++-------------- drivers/net/nfp/flower/nfp_flower.h | 2 ++ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index bbcfa6e66a..bbcbb0060b 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -3,27 +3,23 @@ * All rights reserved. */ -#include -#include -#include +#include "nfp_flower.h" + #include -#include -#include +#include +#include -#include "../nfp_common.h" -#include "../nfp_logs.h" -#include "../nfp_ctrl.h" -#include "../nfp_cpp_bridge.h" -#include "../nfp_rxtx.h" #include "../nfd3/nfp_nfd3.h" #include "../nfdk/nfp_nfdk.h" -#include "../nfpcore/nfp_mip.h" -#include "../nfpcore/nfp_rtsym.h" #include "../nfpcore/nfp_nsp.h" -#include "nfp_flower.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" -#include "nfp_flower_cmsg.h" #define CTRL_VNIC_NB_DESC 512 diff --git a/drivers/net/nfp/flower/nfp_flower.h b/drivers/net/nfp/flower/nfp_flower.h index e8df8b1769..244b6daa37 100644 --- a/drivers/net/nfp/flower/nfp_flower.h +++ b/drivers/net/nfp/flower/nfp_flower.h @@ -34,7 +34,9 @@ #define MAX_FLOWER_PHYPORTS 8 #define MAX_FLOWER_VFS 64 +/* Forward declaration */ struct nfp_app_fw_flower; +struct nfp_flower_representor; /* The function pointers for different NFD version */ struct nfp_flower_nfd_func {