From patchwork Tue Sep 19 09:54:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 131611 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 B34E842600; Tue, 19 Sep 2023 11:57:36 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 08239410DD; Tue, 19 Sep 2023 11:56:05 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2117.outbound.protection.outlook.com [40.107.100.117]) by mails.dpdk.org (Postfix) with ESMTP id B790A40ED6 for ; Tue, 19 Sep 2023 11:55:58 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IJtsh8xP1iIDaHcQxc673SVrnYLtiTrb99acf41sSocKxDWRLkOUB/jeWhNaYCGogmKovewmRrzDFxmOxLgXLdnqv3q0FVvVtzIw7r5QGp/fBUX6bZeFV1UUE8OM619guOasFw3KktpHjRxRt1DIZJWzew9ZIHsQ1gsyQ6C/Y+NCmy+9eVQGrrqvyM6iYvAW5Ao3m7oZhQY+UxO5WjS0jhOwt4svp+pISVTPSkQjSw971kcnVNV4bRynBpB0myalwk3+CJcddU9CaU5ZgBZRfZ9JwYoIImCBbX460KP3u+N8er2jhmC0tTsEdEE7APvW9o0unEaiUubhJOKBrH0aTA== 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=yNa0gC/vzYWHBDKuCwIxmg0bAIAjdONdYjHa4+Bh4sA=; b=HvAOh0G0z4CIosdSDvB0JpsUbhCk320M7lttrorhXIfmeOJqZyJHDIWvRgoLmkRC4VrB8glcfZAYwre13E5eUqxBSBvn2G4KMfPKpStYum2s/QAMj5spi2Bzcgtn5wK5WikXuNtF3U1LMneD4wI/C9EFhGFbit/GvLd66fMg1btNOORPvOGJETDA97j4GeP0lJz6Cf0XZzOHSJoKi9+fthyq4BDvXkcRfyECZBninnlW6tkze3PkBuWlXGUiokZW7yB4V89CfyMloWCCvpXtYZIHwbymVFvPhQRhVsnGsWwwVVTzjLTNvYWo2BiaqnPRXAE3v7s8VaH6YsXoBicUBQ== 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=yNa0gC/vzYWHBDKuCwIxmg0bAIAjdONdYjHa4+Bh4sA=; b=LL1kkkNwAZCftOGVfCNe+ANlzxF/bajG7/HRaBVb5/xz0XYGxNqGC82TyEzVqDVFNHN3iYQMHi5veRgfISwTMteTJ2drk2mDoad4BCZdm2q7fPz95N/KsIoXXkbaNXH8nyRLJZMloVJnyV6IiejfC3a+XLY4cgul5xh1Ib6AjXw= 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 MW5PR13MB5877.namprd13.prod.outlook.com (2603:10b6:303:1c7::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.28; Tue, 19 Sep 2023 09:55:55 +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; Tue, 19 Sep 2023 09:55:55 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He Subject: [PATCH v5 22/26] net/nfp: add header file for PCIe module Date: Tue, 19 Sep 2023 17:54:36 +0800 Message-Id: <20230919095440.45445-23-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230919095440.45445-1-chaoyong.he@corigine.com> References: <20230918024612.1600536-1-chaoyong.he@corigine.com> <20230919095440.45445-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BY5PR04CA0014.namprd04.prod.outlook.com (2603:10b6:a03:1d0::24) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|MW5PR13MB5877:EE_ X-MS-Office365-Filtering-Correlation-Id: 8b5627dd-ac5a-4e4e-2656-08dbb8f69dc5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: v3NqwfBZAth9Wom8asffeO7GaRw1JDvsHk4Qsh6vol9Kt59IUIOCxCo6hRn1AtI+wjvRhbZwsqrjlOae5p+Fpt36iLtcLrRcW58/bvZzuVNktlldH36bOnmbqr79MiKcRQ/w+znJHNUeI4lonQNRgE2XQjE4mrLAiPFkO/s5qWLzstm1+AZlvspoFcle6ns/gH892XCfIKJhWuqvuUxq8YLjqVJtNN+DYNxXlXNOD8LRtzf76ed9y8VnhZPSXlrIg+GcXxQ4jTpthAZun2MKlPdQ3pIIJDz2kYq05L0rJYCTGvGCJ8PrfnUjJkbTv/PPTRq5djZX9SetOYJgfiB9Zxmd1iJY8JQQ7QgfHaXgsxLkol5/JlCTy2T5p4fjWwIZZhVXtj/JSijtFYfy2y8GRqlgK8NLvvqCHab9lfhcCbFQDcrCxCvHQJfFt4KU8UPhA5E3smgcGSUeUwAH0mHsjKuaUQ6faEd52xgMWiY9thwprWFicC0A6dbzB+IBlHXXR2fp1m75v+QjkuPy6Kd0X2AmLN0r3JwnfO61riKz12UA/zGdB8P9LVZ+B2H5ugtYwJT0NEFLDnxbZfLLKSukvDUCcbAkg9eAbjXihMhXTxAv5ZSamTL0rVhVxaXBQJBHqJD0p2RXLLdP7/+5Zde/pvGf1IDqqatLnR+Sk95MCVE= 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)(346002)(136003)(396003)(39840400004)(366004)(376002)(186009)(451199024)(1800799009)(6506007)(6486002)(6666004)(52116002)(86362001)(36756003)(38350700002)(38100700002)(2616005)(1076003)(107886003)(26005)(2906002)(6512007)(478600001)(83380400001)(8676002)(5660300002)(4326008)(41300700001)(8936002)(44832011)(66946007)(66556008)(66476007)(6916009)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kY2vsClaiKYo102wssC+rXZMrj3R39U7Un2cmge3K3lCPvKQjBeS3mHyyUeddDTa1c3aGCzd7Q2N/ppHNn3lCrXLHOrva+SZG/1UoI7qUPdzW7oJCQpodIVCRshATrjy8njaYiXfn1JvhSyZ5bZcajYi3WSwHDdJk6/t0eXJThGapH+Qn9BqLTRrjjergS/Ovp7KMNn+bGuCjNEC8S/DdEEYG0vZLTnKiuMtLkmy7g2MNPtcQjrvKIL3BTpHBL48DCQdn0h/MA5/YTj5ZTInMoDplGKCgg2Yk4HFuxp83kj0ldt3swdRuWjEksEUd0BeeLUhm2ecQloastqgXQcnj7AMZTGKRUX7uzDA3+7pXTrUL17syScY88CKhVQAR85mqEuc1kNK7CTYIgSyvZJt97YQEcWlQ5eyhZxBN0NaWzLG33dlXu11cPib+sPhQ1bl1zOWMvs3nk5WVlPWvjwGiDTLlofcrN9PYLv4avZMQXsbwQxj3MVIUeISv4i7WBGpJrlwRIdCg8ddm3Scr+SU35vmhlW0AHy3pL/wfEWDcQ2JYJUx22xZ2WIqqAXN9pDrlt01dBHsjyaot9D1ZuPHsJ8zz7b5uqA6QzYUWgEmyN0mq/c4bFvL3qV6U9Q1qPxPArA/A+Kxr2qExPZYdhDAJLIgrmGyxyDrnCqk22/MK0fUvnBZe6j53i/HTR43vD7yx5zTSx2mA0LE+sIED+Plk54wS18ABFWx9pAiiVluNcIzFKBSBtuGkGAd6DF7N4pw1lWqEB/treNN3/hZ0nzkpFUX8laZI4RhYLVgNlSFFyz7InTDJ3rs8AHBq9bX+beIY2Ms4l3cqNu4MFF9OGg0lr0IwMTQF0/BgZJNhcHcIqpj5bFdf/pEEOBo8lKmUrl/D15pRdjTpwrLNrgDzCJrMPjSuA0Lb/upN2PRIpA0lYKr4twFHAJ0T/la2UooHSHnWu7g8qJHBgN8EyDrJPa2ONvup2KGheBC9Zf4Zw9MeY43Z/GdYgDTKs9yHYiSleXmzJb4LAxWrpIjsmdUWFbPNomOw3GOMdJz/EiRfBJKMgYtAcafQY8futIlt/8CY+FKtAXVbehqzu3ZJEQq3Q46a2az5fkrh5c7ltIJchoNPxkmJq0SV9tSotPWFlJNnjduSq+/k07q73/y1pjreoJ+Wxg82vq6FOpI7v7WlJmaCgOIVPZ2dsynbmhZiTi+du8k5hTDr6J5YzocXo4kqiO28AfAGqHSvYuoxSaNefVxIKGyE0s4ku48hRkQbYg5QFUqxx6Zb7NQfhKQVh3Q+R2glL5FqXcEyZ9piQYxMHtT1nteArLhpcyscDYfODrDPqr874nBoaiFtksblcDS7D+uWsLYh/jKqfTiG98nPBgm9vuzJSExkyOxBTD1umwjSE+GmKyBBfsTKwyeYcH4snpt/tM3Ff1KyACeJZkMlSFygedpmJpx9yQ3bA2YIcvxR4ZVNxLwtaeXylTRtindRVdQ7FS0bu2YWSeFvRpKZ0ZVUWjGtuXdpnV7lojNOUOV9R1A4/8kqo7vdE4vhO90M0b7fJoRPF2vEcxeu3NZeIC3jQg/U52TWumFoZcD1jFvgBhGj94LU+s/JtNAs6NBd5BZOg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8b5627dd-ac5a-4e4e-2656-08dbb8f69dc5 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 09:55:55.4786 (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: 6UdE/9SkHMCksz4M4tEVlN/RsHzcda3GZphUK2h04ayNGIBi6cqPrYIfImJawuAk7XIIn1n6PRjltZmtVLgmRwd614SZNBlX1Aa13VJ0/R4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR13MB5877 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 --- 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 41485b6975..47dd2f2bca 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