From patchwork Thu Aug 24 11:09:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 130726 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 3EEB7430EF; Thu, 24 Aug 2023 13:13:57 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 68EE7432E6; Thu, 24 Aug 2023 13:11:31 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2102.outbound.protection.outlook.com [40.107.93.102]) by mails.dpdk.org (Postfix) with ESMTP id 0F6C0432D1 for ; Thu, 24 Aug 2023 13:11:29 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SBLioP7o42Aqs3wOCcqGTP8pq66m7NFXXtpqotIDhXmCElHAURv0FX3PStjVg43nX5qkJYct5HPOiQhm4D3usTKoolzvtiNRa0qQ5/T9eLVoRdHYWRw7TMcafVn9D6/O7OecK6Z+cpbAk00cp7HwMrLRaaGhJcEf+x7pEN9m2EtkUzzR2PkAGRlgOV2qNc9zK63KiySFkl9uwo2PnA8BlVp5ddl3utHMJe6SnuDTI/Vs9em4k9v5mFGKgHMgipmC82TlkUBWPvxnaDw8y4FpdY9Acbyyr2wawE5UK2x/eUagcHDa0AAPo1cGwnjE4mPQyNLLzBUM80/FigYnmdYgXA== 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=eGgf8eKtnphYutDENvAfWG3UIhdlyy5yL1cfyCFDCYM=; b=bFmH8v6P6G763t6wUbTsti/Goi3k5wMPmVwwoIOUkoaL70r9PZy86IK8l58xKKasCBmESf0aed0kETHmnEZPkbiRhneSfCeNSGppDFRtp+sXjazfDvERuYkMDNjrAeJVMafX+S1Ms42WCRPNY/ZXk9aH2i2jJdfk0hc/i1q6GUvOfyxCNoS+NPd+1WCUtyWmRxNptAHBJV3BoukMCq5G5n7up8e53LhxI4vAA1UG3ey0z14W9VcOKsm/zltIeM5+fmbPaP/9ORF/ZFOHkgxXvvDBbrwnrcrsw/k3cZyeAPJDdaRKQUw/i+/q5DMfa0ht4/lg7FTrMwIjh9ui90t8sw== 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=eGgf8eKtnphYutDENvAfWG3UIhdlyy5yL1cfyCFDCYM=; b=WuBr2cmIdKJ1NEbfRc2Jh9Vb2607YF8LkIQTOF+sC22bRwpztyYvSOzE07i4Wvq3X5xRIV4l6LZKjg1yzUlMIBSd92NkX0ghY/8cIDQctUlFfuXFq5AXWa0t51qOMY+3ZtF5eULaHKJvcP8+++7oxg6w6fK7adbgjG9SyuhMosc= 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 PH7PR13MB6116.namprd13.prod.outlook.com (2603:10b6:510:2b7::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.20; Thu, 24 Aug 2023 11:11:27 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::51fe:5846:af8b:bace]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::51fe:5846:af8b:bace%3]) with mapi id 15.20.6699.020; Thu, 24 Aug 2023 11:11:27 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 23/27] net/nfp: add header file for PCIe module Date: Thu, 24 Aug 2023 19:09:52 +0800 Message-Id: <20230824110956.1943559-24-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230824110956.1943559-1-chaoyong.he@corigine.com> References: <20230824110956.1943559-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SJ0PR05CA0005.namprd05.prod.outlook.com (2603:10b6:a03:33b::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_|PH7PR13MB6116:EE_ X-MS-Office365-Filtering-Correlation-Id: 65bef93a-2b20-488f-5440-08dba492dc5f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PGLD5OcOgyQ2u2Tpf1lyES8we44sJcL/lZdvC81Gb9Xl2/ow8uvJYWK2w+KxO0VE86q517TB9D6owDfl0TANnmOedvpF/nF2E9a4ZskYC5E5V93Kp3WQw4Gp5D1SprZC21uy6yF7q72brLjOzhHGjH+MszApuEMEy1AqXNms4JN6Ls/2DmtU0apSGN+WrWpFl4rA8sxWOZcnooXS8z5nTjJkyNj5qXG7892aMX1hw3kFJ10xJEkjsZc+55pLkCc8WlLEGhWYJhy1LZpkMKDWzta/9DRiNduVyfE7uUfZ0wMAlQIWW03Y5EqFkhvrm1v5Bltx0S1lq8JkyR/2OFB/Oet9+ZRtmeVypkZz5qb12I5Hu9qMExJkOS4hmqBhvFSe5te+KhqgsKw4LYynefzcIa6IgjQg6FATCMVHXBl5AHMR3KkZVn2vNQx3rFpn3LDQxlBNP6IVajuGIdUZ6Pp7QeX772NCGZuevUAug5nSNWfU0RfVHuQcLfHItsjvSccymBa0y3T/ykuHYcr5pOGCEbd8ga5X72Q/AtWY9XRMSQ+3snZliUy4+0qtimfQ3kyLSIMYfXjxrCdThHLu3zHBUzz3L/HJal2WZx1ySQuBt6GYUsAORAYxOl/KgA+dGffrgNAP6mvi7u4RC4666N+4bDVbSuycFTADSB46ySdwpXthsrglqgn7y3UpYLroxLZ3 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)(39830400003)(346002)(396003)(136003)(376002)(1800799009)(186009)(451199024)(6506007)(26005)(1076003)(2616005)(107886003)(52116002)(12101799020)(6512007)(6486002)(83380400001)(38100700002)(8676002)(8936002)(36756003)(316002)(4326008)(41300700001)(2906002)(86362001)(5660300002)(44832011)(38350700002)(6666004)(6916009)(478600001)(66476007)(66946007)(66556008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?8px3q3T1lG9L7pvWP/etFVN5Ymxs?= =?utf-8?q?Yy6u50JXNaC/Q9Ya58nBVFizqrCCqvL56mNuXHjfGWwwJl9MiuzN8jzCYtYJaxtxV?= =?utf-8?q?6TlKVTX5jhyKVC3Xxkxb3r3AV41YImsq92msLvKse14WMqfGqlqbXuaB53J/iNQqt?= =?utf-8?q?6X6wkrE1IW+QWg4i9JZ/zzqxG6UMaZAl9oqYQRdyzyB+WIOA2LG7LYwzL2tcZURT/?= =?utf-8?q?poPLdBEydC3YjH/mWqDbGDdHFXHam0rVVWorjulQJWxUP1BgF7kbftpMtDBqTGXbj?= =?utf-8?q?0QKgVccP8IVvQOwEOEmc6/hOG75qrBUD6mSWrSHh0GgP1Pz9vRCCrROJ5GvfGL5ux?= =?utf-8?q?qKlnULCzjfwOhuEdR8Wnue/FAlnS0F745cOhOMlbSiH8Tvug/ZY2IFdgpKrnyz4/E?= =?utf-8?q?gGA8JX+qL+nxFtH3CsRS2U9uulcaX1mY0HAQz5UkNHY8F88saY0SwjRzVRrEMFKxR?= =?utf-8?q?jhh1kKilutqVMBLLIsgepAmfhD1xOV510DWApNuyDBIXJrWmosCuZoC+iI+V3jeH1?= =?utf-8?q?MiEdwJDZSY13Oh5nqI9PMQlXBKfMnXOTI9k0VuWzr57orEA6bfHB/G2lEAYb03g4i?= =?utf-8?q?X0yZywRkwsjcYLvEedEmZgZ9BLhp1ihhvmC5C9ndbrlincafPAoJgBJPuIEqAwi1O?= =?utf-8?q?P8ar5sk72okn78Qcvk0BS4O9wpsvxnhv7A/eUhI+6Eil8CRT4TfdawQfgg2J4IEqK?= =?utf-8?q?EAVgoUeVNvXqpTc/pWgoelVt6VYu41/SvGoJVONKlIdYEYYfNwkFZ8GIg/sQm4SJl?= =?utf-8?q?FylD+YMLmh9VVWOwpvDXDJb2qA3iw/nmpl+7k2Tipv4QitBsd9jOOxZPDeZuo0li/?= =?utf-8?q?fhdBIBrqItmDL89Q0VmmPKMQsxW3/EQsPwivaPvgS2D04yRM61DgHFQ66bx5ul199?= =?utf-8?q?qcXT0ui0Rp6sTpbOOLWb/XGtVVMNZqcJ9Tkn+HY0hhSR+J0BY6Nh/HiDMPJgl/Poa?= =?utf-8?q?VU1KOnjMxcNfvnSVMeEzxGYt2HirK8VpOI8vrpJmRiqmrdo8ZWKy7KDCnGQBMVEiF?= =?utf-8?q?tD7ch4H6Za8djmBeQKsTjdN7pRU3/WvY/Day9nwCRaKsQ+1fVNN33WcERj2UTqDGj?= =?utf-8?q?0lr/6mgQsh52mjBpNHnFdhlK087F17BmDQ3nLR0XunxEAYx3/LM116y3RlPmwG16j?= =?utf-8?q?JS1f6JsemoPIzqcoCAVg4lRUcbf8P4qQ2VySzImpZZDtyVRDjgP4U+XRBgquOA0Fz?= =?utf-8?q?6u9ScAE0sexwy5cvjvz+tEVo9EXtZ9brd6swChXTrzrfzRGpfoIwrWjUbgQJndMDa?= =?utf-8?q?gax5gxnirgkBp6KlPHJrphcWJqDDrBxvKAwZHfAIuY5AM0YiwXrMRDGz5HUwt74Fx?= =?utf-8?q?6Nfu587xXh4Bb38/ys6fELJj5yPDiZriaTYLfBGsGvSdg833pYxZ9kunVaSOPRYUY?= =?utf-8?q?sr9QRO/OKxErOILbSpmTnGg/X0FnfJdK8VHsvses/hZRpraVp/zesPTCxTB2LnjoM?= =?utf-8?q?l9C9AlcBinMhBwg7bCNBDOgHL/xmdIIzOOGfEN4nyXvHWYi2Obd3Pqr4sPN1mfNGN?= =?utf-8?q?m4SCFngQFWJd9ycfRNEuHMlqwK3qJ7csWQ=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 65bef93a-2b20-488f-5440-08dba492dc5f X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Aug 2023 11:11:27.5885 (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: gMOdKIP2O7I4z7W0UcdsTkuwgqnXGL4/vypqFcjG5CA2yJFy8KOHD5PqwqrPb6fAhxHLiNe8USt/cpIq1+B7+B4Rh95skJYio9PWUEStJCs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR13MB6116 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 Add a new header file for the PCIe module. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/meson.build | 2 +- .../nfpcore/{nfp_cpp_pcie_ops.c => nfp6000_pcie.c} | 2 ++ drivers/net/nfp/nfpcore/nfp6000_pcie.h | 13 +++++++++++++ drivers/net/nfp/nfpcore/nfp_cpp.h | 6 ------ drivers/net/nfp/nfpcore/nfp_cppcore.c | 2 +- 5 files changed, 17 insertions(+), 8 deletions(-) rename drivers/net/nfp/nfpcore/{nfp_cpp_pcie_ops.c => nfp6000_pcie.c} (99%) create mode 100644 drivers/net/nfp/nfpcore/nfp6000_pcie.h diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build index 580a478cd6..d422269c4b 100644 --- a/drivers/net/nfp/meson.build +++ b/drivers/net/nfp/meson.build @@ -12,7 +12,6 @@ sources = files( 'flower/nfp_flower_representor.c', 'nfd3/nfp_nfd3_dp.c', 'nfdk/nfp_nfdk_dp.c', - 'nfpcore/nfp_cpp_pcie_ops.c', 'nfpcore/nfp_nsp.c', 'nfpcore/nfp_cppcore.c', 'nfpcore/nfp_resource.c', @@ -26,6 +25,7 @@ sources = files( 'nfpcore/nfp_nsp_eth.c', 'nfpcore/nfp_hwinfo.c', 'nfpcore/nfp_target.c', + 'nfpcore/nfp6000_pcie.c', 'nfp_common.c', 'nfp_rxtx.c', 'nfp_cpp_bridge.c', diff --git a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c b/drivers/net/nfp/nfpcore/nfp6000_pcie.c similarity index 99% rename from drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c rename to drivers/net/nfp/nfpcore/nfp6000_pcie.c index 310cc691cd..abee584f85 100644 --- a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c +++ b/drivers/net/nfp/nfpcore/nfp6000_pcie.c @@ -14,6 +14,8 @@ * The generic CPP bus abstraction builds upon this BAR interface. */ +#include "nfp6000_pcie.h" + #include #include #include diff --git a/drivers/net/nfp/nfpcore/nfp6000_pcie.h b/drivers/net/nfp/nfpcore/nfp6000_pcie.h new file mode 100644 index 0000000000..e126457d45 --- /dev/null +++ b/drivers/net/nfp/nfpcore/nfp6000_pcie.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2023 Netronome Systems, Inc. + * All rights reserved. + */ + +#ifndef __NFP6000_PCIE_H__ +#define __NFP6000_PCIE_H__ + +#include "nfp_cpp.h" + +const struct nfp_cpp_operations *nfp_cpp_transport_operations(void); + +#endif /* __NFP6000_PCIE_H__ */ diff --git a/drivers/net/nfp/nfpcore/nfp_cpp.h b/drivers/net/nfp/nfpcore/nfp_cpp.h index 42c4df5fdd..0df97552cb 100644 --- a/drivers/net/nfp/nfpcore/nfp_cpp.h +++ b/drivers/net/nfp/nfpcore/nfp_cpp.h @@ -226,12 +226,6 @@ NFP_CPP_ID_ISLAND_of(uint32_t id) return id & 0xff; } -/* - * This should be the only external function the transport - * module supplies - */ -const struct nfp_cpp_operations *nfp_cpp_transport_operations(void); - void nfp_cpp_model_set(struct nfp_cpp *cpp, uint32_t model); void nfp_cpp_interface_set(struct nfp_cpp *cpp, uint32_t interface); diff --git a/drivers/net/nfp/nfpcore/nfp_cppcore.c b/drivers/net/nfp/nfpcore/nfp_cppcore.c index f33985bec6..74b35f4a62 100644 --- a/drivers/net/nfp/nfpcore/nfp_cppcore.c +++ b/drivers/net/nfp/nfpcore/nfp_cppcore.c @@ -14,12 +14,12 @@ #include #include -#include "nfp_cpp.h" #include "nfp_logs.h" #include "nfp_target.h" #include "nfp6000/nfp6000.h" #include "nfp6000/nfp_xpb.h" #include "nfp_nffw.h" +#include "nfp6000_pcie.h" #define NFP_PL_DEVICE_ID 0x00000004 #define NFP_PL_DEVICE_ID_MASK 0xff