From patchwork Tue Oct 24 02:28:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133221 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 0F8E5431EB; Tue, 24 Oct 2023 04:32:06 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5863F42DE9; Tue, 24 Oct 2023 04:30:13 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2125.outbound.protection.outlook.com [40.107.223.125]) by mails.dpdk.org (Postfix) with ESMTP id 7F75742DDF for ; Tue, 24 Oct 2023 04:30:10 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kmZ42qC+9cSMMZHzsEHn0pSZIqcoBZG2oD9h9hPTW7BYG69ercFMhlAnQyBpqOHF5AWpdtyRU7mKsEF/9db7j6uooR5Z6pvGlvtvWSrTbOdoIkONGa4zkhXCWUnClzvNanjfXFUNExZnOphTmLku36GhpCsi4cD8/otwcKRq2YysLUEZVq2g/IX5dYMkDFV7wpJBJoWwFeIZREVGTFrGWFiOlrlPBc6dXvd49E/vROL2avHdlgTr3hgmftFylBvf6QiUqvowdKqyz1A3lLA96nKDeCchn6tjHccjaNz/0HCPU+Y2forMq5ebXeWtz98PGmf2o0sW2WL8l8WpvnRDug== 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=MbOgDdmDw4PcVtgNTnm7mAp/yWzcnFt4LO8EZfeAq00=; b=AGRf6xDrhIoRv1n/LU4u35ylBEtnLT384GLByoJHX6aW7nkZH7DuLjyvr+RzTMkLyZB8TDAfs/iFTGNc2hIcP0BCHjRgYnLlcEs4Y5Ef8fAvChyKfybZY/TzyxXyNK+OQd3/YKXYHBBv2Su1OMQrF7CIG2WdV5sTewK+3TD3QL/EGA2wXjjb9neCWH45/2jEooOVYXYsMxQsjQ3Rj6NJSPHPq58w/AY6yYI3RbmlWklvtSokwIaQ0/BDHlyQFT7ESIoHDpdK/6wNOR9kl859TnRQeDfSXI9/5gSryUHeHECXeO70omyRIe63+3K1E1bcbnxHBbqAOt8yFx35aVniBw== 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=MbOgDdmDw4PcVtgNTnm7mAp/yWzcnFt4LO8EZfeAq00=; b=CFeLHf5uJBpk4LfQS3QI/k/TCKiMluWEe+FAb8lwSvzbWOrjn3rJDT5Ex0y0huBgvrppLfdivuBZeydJyI/Mo1SK6LfmFY8bUmrTuuSmPbXvBqqGaTe3KbqDW/Ovv0w55yVB/Qm7xAIl7zEy1BrqFCWzWrWz9d4iIYWsMfJg11Y= 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 PH8PR13MB6182.namprd13.prod.outlook.com (2603:10b6:510:259::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.21; Tue, 24 Oct 2023 02:30:07 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::142e:d47c:7320:8a9d]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::142e:d47c:7320:8a9d%4]) with mapi id 15.20.6907.021; Tue, 24 Oct 2023 02:30:07 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH v2 16/25] drivers: move platform module to common library Date: Tue, 24 Oct 2023 10:28:40 +0800 Message-Id: <20231024022849.3092506-17-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231024022849.3092506-1-chaoyong.he@corigine.com> References: <20231017054545.1692509-1-chaoyong.he@corigine.com> <20231024022849.3092506-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BYAPR04CA0015.namprd04.prod.outlook.com (2603:10b6:a03:40::28) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH8PR13MB6182:EE_ X-MS-Office365-Filtering-Correlation-Id: 0997d1c9-fa63-4f8f-0e3b-08dbd43922fa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wqfUMPRRg4O/cgeVKVzleSoeun4yqyPPP8f1jLx/YVL/c5am2Lh2JcaYkkCm6Ab1FtsQ7sRjKNzF+j4PeV6PJKEZ8KFiXL+XhzUbaF54XqfVzune/ej0/AO32Dv9xrORPkCV3I6OjdbpKdh8x0XPWyGla+GRJ94TedZvKAwXP0NaSz4n9nKn36hVxoHCwmLhyCBPAmNmbzCRaRyYCJJg7pATYthmA81UpULZRoIwdiTmJqUwDrSGP8cwtP+P2X1X+CbWWKXWRYPQO7GRUjH+V3iZCTaXaSEX451MokshHwDe7CiAQ5PqUGU/dZ2518kYjhfiX2qNd+PKUBybyfR4ikp1wHTfJa7exUB+XTu26eAkHUYlsxIpMHSD7VUhj0smhaMBWa2KN52u9Kz9zQSVrP9oD3+d8Ouzk2BCA5nWUmMbwkd1ckxiH4EMYIl7rqjStaxNY25ix3Gic/2TOmEeT90H26y7jfeUx46nkW3scsijPLxb6i2g9UHtBfuRtW5DULIg3rNZDeS/HoKiXxfZjaL4yIPXghW8wNV1WopW/yYCgLwwL6MFA1/nA6PfUkoaqHdryEgmJv3KCJ5mzmfKB30qYwXAC9utQ25pvDRrPh9XewyB+cphq9awarGc76pCRN9fKJhyBOq2ni9Z1MmihqYv8a+lwZP5eJJsc7ROZdk= 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)(366004)(396003)(376002)(39830400003)(346002)(136003)(230922051799003)(1800799009)(64100799003)(186009)(451199024)(86362001)(66946007)(316002)(2906002)(54906003)(66476007)(6916009)(66556008)(5660300002)(8936002)(44832011)(8676002)(4326008)(36756003)(41300700001)(2616005)(38100700002)(478600001)(1076003)(52116002)(6506007)(107886003)(6666004)(38350700005)(6512007)(26005)(83380400001)(6486002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: g7McSoquDGD8nLokvJ+RlraslN/hzdBSATU8r0/sTS0CBiGKydQiSpxbCVaj4U4LXxDjL0zr1rZM4XhJK1AaV/RKRtTDpru6L4+dDJbN0Po+IneNn5kWASjt8C2QNwgAree6gRnECuGqvETc9O748K8PuSIXTIrjxIwavS+/YqtVj2+bUrPfAOcGbPo8oZ8ctcTL8riTn2UtXXkX2nhs+4coQKbXC+IGeTF7szdfAQtB3RSb9woteQ6g17c+VXRCGXT40tAD8cYy+T4q09fj0q5lcBxG/ydITrn6aiq0Vfx/QQ1P+eVl6ySsJx1nODVjl+7yb3jY6htYfS3sIlQoA5BBQ/94bo177zw6IhlJzIQwKfJvy+TmG9ofFedToLd2LVKnT57wS6wVy8xgG8uCXwH2YPvJ+oY7jgJ9NPE3XAW53FA2yU7iSf282wjUmZT7C34o/DlK5+uYSidYsgdzpa4e02XzpLnmT/kPGxQGh/dGVhqz3CjM54m1wNVyhmttobhz5eC761Ud5vFCapFJQeuPlKy6A15XmdmOt/h9FPux+GSGt6WkNybtek2r/zlMsC2C3pXbdCiVUFYhQsIHzcgn8PkLPYTm2T9ya4qWXwzCDt17wTZunKTEy3Px2lqzNtAZXY84s3dJGNczy35tv1QqJrE6RjHzsjPXRYrLHWWub6crapqXo+//aepuwpXyWO6xquQ0l1QQSpJMa8OTNv/92r+MJtoPhYGYa1fxVv6vaWwZWB5aE8lAyL7Ids/916RQugwYqrGwCxh1ErieFNEatuYh5PsD1BwpCB5y6lN7dxQTY7BfQOt9A9m2dLPdLc5+hbR0MUsmzO/COgpvx6ZQFmkfEUYzLnzdoLYf+bzRrIyfQaR+V+HhjuHGpfgJ1GKQwrzx3BizRRRg0GBnLqx7TUpzLlsti6QKUTDM4vzGOGR4vQksZHUwe2O2dYZck4XyMls3F6pdQTxdB34GdXdPpziIEvRpGM2KBe7mlEn+tkHiamopNDnsq9wa28JWm4gttbUyN3QVeAWyvcwu/pIoB0FzUW7dbiPIQ0/d6CYhNNJURVlo3cV0nWw99nHopGyBkFeQy/c8bDdwTVHE64TVL54U1iTNZCv3hUpLL1JUATZt875LF0FXBPj0qunyjmuDxIZLj5B3sRpJ2iVjANPmp13oMTX4jpEjCD2uviFgcuyhWU2ms3I4Tlj9I+lQYYRqoGbR2Jx30yFSnFM6EfCpKcJsTN042UzQKL/nYHQxXFkP2u5PkfDfceZ2bmo7f2/RFqVviSLE2Si7sFbE8KZcndubb0q8zhYpFDvyEa7ljywgnVGRWWDwSX8YHOb5DYWY6Zd7lAfl7BFDCzx2b0w8adTyUHUQEWCfZwR2ZJA2hhhWiGMyFjLDoZL5eMbTwdroAzGG/MaRdB2Du4bJx4c+WUSa6g/I/QebA9C9U+ja5UKXbaKAvqcrhZAVSLleh4/l29W6xAP5Os3ZvOpC1XkJjQqKJvU6smMMhNBzKTFyoh3QJHmVyGQj5pFuJqjAagYrWvau4JLj60JwT0nWSCi50oBelevNfAFxWGM7lkfjkYjCb+5NIQ23rpWAhvzXkZxHxbpNmVsQcZUqC5bEKg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0997d1c9-fa63-4f8f-0e3b-08dbd43922fa X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Oct 2023 02:30:07.0729 (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: elCEok1Yy20GGLBl38cRBCdXbxeAS65yJtmH39PZG0xK4/kRNCaphKwKRk/RVoatALk9MqFb+e0YB7Q3Yrohom+6QR+nyKj3+/avgBZtxXk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR13MB6182 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 Move the platform module to the common library. Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/{net/nfp/nfpcore => common/nfp}/nfp_platform.h | 0 drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 2 +- drivers/net/nfp/nfp_net_ctrl.c | 3 +-- drivers/net/nfp/nfpcore/nfp_cppcore.c | 3 ++- drivers/net/nfp/nfpcore/nfp_dev.c | 3 +-- drivers/net/nfp/nfpcore/nfp_nsp.c | 2 +- drivers/net/nfp/nfpcore/nfp_nsp_eth.c | 3 ++- 7 files changed, 8 insertions(+), 8 deletions(-) rename drivers/{net/nfp/nfpcore => common/nfp}/nfp_platform.h (100%) diff --git a/drivers/net/nfp/nfpcore/nfp_platform.h b/drivers/common/nfp/nfp_platform.h similarity index 100% rename from drivers/net/nfp/nfpcore/nfp_platform.h rename to drivers/common/nfp/nfp_platform.h diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c index 3f8d25aa29..10e6982c95 100644 --- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c +++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c @@ -6,10 +6,10 @@ #include "nfp_nfdk.h" #include +#include #include #include "../flower/nfp_flower.h" -#include "../nfpcore/nfp_platform.h" #include "../nfp_logs.h" #define NFDK_TX_DESC_GATHER_MAX 17 diff --git a/drivers/net/nfp/nfp_net_ctrl.c b/drivers/net/nfp/nfp_net_ctrl.c index 8848fa38fe..5135a1ad27 100644 --- a/drivers/net/nfp/nfp_net_ctrl.c +++ b/drivers/net/nfp/nfp_net_ctrl.c @@ -6,8 +6,7 @@ #include "nfp_net_ctrl.h" #include - -#include "nfpcore/nfp_platform.h" +#include #include "nfp_logs.h" #include "nfp_net_common.h" diff --git a/drivers/net/nfp/nfpcore/nfp_cppcore.c b/drivers/net/nfp/nfpcore/nfp_cppcore.c index f9b08a12b6..0e6045f2f0 100644 --- a/drivers/net/nfp/nfpcore/nfp_cppcore.c +++ b/drivers/net/nfp/nfpcore/nfp_cppcore.c @@ -5,8 +5,9 @@ #include "nfp_cpp.h" +#include + #include "nfp_logs.h" -#include "nfp_platform.h" #include "nfp_target.h" #include "nfp6000/nfp6000.h" #include "nfp6000/nfp_xpb.h" diff --git a/drivers/net/nfp/nfpcore/nfp_dev.c b/drivers/net/nfp/nfpcore/nfp_dev.c index 7799fa699a..f29b7e0711 100644 --- a/drivers/net/nfp/nfpcore/nfp_dev.c +++ b/drivers/net/nfp/nfpcore/nfp_dev.c @@ -5,10 +5,9 @@ #include "nfp_dev.h" +#include #include -#include "nfp_platform.h" - /* * Note: The value of 'max_qc_size' is different from kernel driver, * because DPDK use 'uint16_t' as the data type. diff --git a/drivers/net/nfp/nfpcore/nfp_nsp.c b/drivers/net/nfp/nfpcore/nfp_nsp.c index 5b804f6174..a680b972b8 100644 --- a/drivers/net/nfp/nfpcore/nfp_nsp.c +++ b/drivers/net/nfp/nfpcore/nfp_nsp.c @@ -5,10 +5,10 @@ #include "nfp_nsp.h" +#include #include #include "nfp_logs.h" -#include "nfp_platform.h" #include "nfp_resource.h" /* Offsets relative to the CSR base */ diff --git a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c index cc472907ca..75f6d40fea 100644 --- a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c +++ b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c @@ -3,9 +3,10 @@ * All rights reserved. */ +#include + #include "nfp_logs.h" #include "nfp_nsp.h" -#include "nfp_platform.h" #define NSP_ETH_NBI_PORT_COUNT 24 #define NSP_ETH_MAX_COUNT (2 * NSP_ETH_NBI_PORT_COUNT)