From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0F74341FC8; Wed, 30 Aug 2023 04:18:44 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2A16340E01; Wed, 30 Aug 2023 04:16:12 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2108.outbound.protection.outlook.com [40.107.93.108]) by mails.dpdk.org (Postfix) with ESMTP id 5471940E2D for ; Wed, 30 Aug 2023 04:16:11 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jG4FWa1b0SdW8RQnAb7is3EPUSlcn54B9jrt/I/zW+VKXBxuc0wIP1d+LXcH8gcjrk1hWuwu4o2xykM8UajQ4RWYz+wWOaB6xXGAVxInpheqA4M2g9SlWf7PuWhJbV3ivxnI8np7mKmDXSTDCQNMwDhnZGX/Jt+ZMhm4WYcp95FCZW5WcHIXSdsbmWqkpV38govT3+w6N+3W3kAqnTDLxfzBOnexs+cGz5MCe7iOVAIh4wXYY5AgptLSMym2fphmLi9IxcLXN0p8pqX8ejCNwCEQUpgCIoyqnddFCgsnyu0mEQCzBiNp8geHg/dyYuePCJqinVINHhQS3g8GOwejUw== 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=RRmU8Ha/6MxfPs3E9R8OMqdVxLVymAI7P72eFbOK+i+ysbb//586uYnQng2RJ6w4cLGi8Yu1zQQGmmE6cJ58V6QMSdJ92FO9Eg0N1TAYIBLvJ/ahVb4R4MTGMZD+qmbuDq/M0HRdjfRNObuezeku3+m2CmcdkNnzoutTf1Dn5G6ImvMe+lwTO1l4cqnqLUmZoeMIArf517HZ+QPlTfvcOA3JAhw9XLufXMEeTb0kjVkIcaks5r7uWUpunvqL9V9bV39s6bjol9wkvIghknqDkDe2BKgO4m3I9IRJtj06BS/U6N3yUfMlabA4O0Drj8rsj9WDbb6ItRQ2kB+s4cebjw== 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=wTAJ+JsXgzJA8Ath4FIe2BoU5JN1p7Wov25pOastU3mQ+3hFZ6/M5m18ssVgkvtRUo7yXDwn7VLcs5mOcS4bI1gOsWdSZmIAxLzhcrX0T2+I99c23CQfDnft4rQrqfvKwdbqxdKdRMWN2xxOW9zxkrkmPEJgYhq2kTvoHdwe/+M= 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 DM6PR13MB3786.namprd13.prod.outlook.com (2603:10b6:5:229::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.18; Wed, 30 Aug 2023 02:16:08 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::c0f3:c2cc:b5bb:4192]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::c0f3:c2cc:b5bb:4192%4]) with mapi id 15.20.6699.034; Wed, 30 Aug 2023 02:16:08 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v2 23/27] net/nfp: add header file for PCIe module Date: Wed, 30 Aug 2023 10:14:53 +0800 Message-Id: <20230830021457.2064750-24-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230830021457.2064750-1-chaoyong.he@corigine.com> References: <20230824110956.1943559-1-chaoyong.he@corigine.com> <20230830021457.2064750-1-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: PH0PR07CA0113.namprd07.prod.outlook.com (2603:10b6:510:4::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_|DM6PR13MB3786:EE_ X-MS-Office365-Filtering-Correlation-Id: 9b53c730-90b5-4d47-2a13-08dba8ff1246 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +4h/kT7YI68NEU6PEBCgAfAzRezSldbvUWhzxuItSUjLNNVc35L4yjVqvyd5pS+ROIFogW1jUcBSPBl7gS+jBldEI4FHBFevYnjVyWnPDPxNJHw1aYD/Ao85EvN/LP4oYXyomlpI+H/hHn0frniT8vtvtc0GL4GF6va2pOjLPDf3O6RP/3mo63o5t+Q56M+a6wKh4O2l6jFrNLVIzeVXuHFduXqOMJG/M0rwzC2Mm+JDRsxmDXOXd7NDvi4RO49puwgDyfdUP29vkXyaNPQ1oDSfhaEvZrc/JYJ47U0tQh0nnyLwG7qEJEJiwQr43VyW+Iwy7YfUXgzN2GJr1AAF7t41Od3jok1eOLv8kwRZXNaxM0h4HzSdOfdGxByIisqhVvnyACWpDLj6p0cB2/xn564vMXBwFEupvbWL1pTIBCxI/Bq+BwYpwhAlVv3hfmSRoXRUZ7/kiOoLiX+cZkcWy5W68q6JT3tkvG3NpJPOH0t1wYi0gnrEa7WeJIywvAxeEQYGzRsf9nweKScl/zCFEnav2FBuSKLOO1LseNnxE0C9ed1sArpPRlcJaBIMowsItURrjwtAEz4fnyiQXzaTWIQ4utBsQlo+YP3KjcG5C20DD6UbSzH+7Z6eR3A9SnhZdo3rGeJR5GrgowO64asjKruKKXa7cETWxGuzHevEUyg= 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)(366004)(376002)(346002)(396003)(39830400003)(451199024)(186009)(1800799009)(6512007)(6916009)(316002)(38100700002)(41300700001)(38350700002)(2906002)(4326008)(83380400001)(2616005)(86362001)(44832011)(26005)(36756003)(1076003)(8676002)(5660300002)(107886003)(8936002)(6666004)(6506007)(6486002)(66556008)(66946007)(66476007)(52116002)(478600001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SzRKSmxNc1ZONkU3cHliMmVSMUt3UHZBYlRRN0J1Y1JLLzJnUXNCcVNpSnVr?= =?utf-8?B?NTQ2dFVzWHdra291SXlNdXN4RTd5Y3VqSFdHaHJ0dGR5Q1ZiUkxZMkVJNjg4?= =?utf-8?B?dWFFZGdKckVkcS9kNUZWc0FGNXRlVXF3QUx0bXl6MTRHUG1aQ1A5TWdsNlhZ?= =?utf-8?B?dGxhYndVdEZnbDd6OFBtT01uMTZhMzhJZnVHS2htbzcxTVR6aCsrQm8rRXFS?= =?utf-8?B?aVdMYVhYcFZwVWx3STBnY2ZaVjhjUHZQZ29VUlUrV2oyc3d0U1BPSFBKUEZN?= =?utf-8?B?TTZxdDdyUDZ2SCtZa05HZlBUaXhiUzJLZzZqUUl4My8vcW03R2pURGJrTDQr?= =?utf-8?B?bFp2aVZ0RHdrbmUzOVlka2Q0UjNPamJNeGpKbFBUaE45WlJUQjA0ZzBTd1I0?= =?utf-8?B?TkNUUWVkWXRkeWxIUHNUb0RMc24zRlI0QmM0cmo1RWdrZ296QUJSWUdHczl4?= =?utf-8?B?empXbkwyUkNXSmVSL0JIM1ltVldPY0FYTit4ZnBBK3ROWERjeGZTT1orUnRX?= =?utf-8?B?L0xNWFJoSHJoZU5ueXhMV1IyaFpxNVFQcmxJMjBUdHpyUFVPNlJEN0t0ZVVm?= =?utf-8?B?UUk3b2ZldEllckFrU0V0MC83aDR2aktrbEt2T2xiTFp2S0VaNUcvWmFWQmJz?= =?utf-8?B?KzVTd0t1MFJUYkVyZWg0L1R1OEZWbDlmSzYwOEtLUDcwQnBRK1ppcGl0MWNw?= =?utf-8?B?ODA4aC8wa3B6UjBMYlF0SE5yNGtudFZ3c2o0UU5kVDgwVzdYUCs4ek5keU94?= =?utf-8?B?NlJHaGNmY245R3pURE9zWnBMWEpiWHFmNjh2RjRTUUkyNFYzamo4dlFTNlR5?= =?utf-8?B?WFpwWnZ6RmNFaVBNWVdKTExjKzgyWmZBcFVDeG9FS0NSa0t2NUdpVU5ad1lH?= =?utf-8?B?bTUxa0paOWN2WXMweUdVZVduVFVkYmJ6TXdMNWFNYWNKZDRUcTl5Z1UxR2t6?= =?utf-8?B?alFaZEM3OGlRWGpOUHNFOGI1STJYQVBnU1pOaTRaSWVjVFp6TFNzL0Yrb0Nj?= =?utf-8?B?U01aM0M1NjFTVzkxNTNLV2ZRbzUyNTFVZ29CaUo3b3cxSDVRTU82aHYzOFVB?= =?utf-8?B?UXZjaUU1WTdzMkhXb2F2SDhEMTA5dTg5R3ptbHoxNk1YN3diMWFGZWJFYXVw?= =?utf-8?B?d3VCR09wTGw5TUdhdlkxdkRxVlRZdU9veUQ0WjdodFZucVhLWFJrdklrQmZp?= =?utf-8?B?MnlhNE0vTHFjcG9laldsL1JLZ3Y2UG1zV0lVcVlhUTBoZW14WWJNRkFUTE5Z?= =?utf-8?B?bk9DdXZxV290SmQ0a0Y3NFpxb2dFcFI1QytlN3p4VFlzbDVlTnV6NnNJeTA0?= =?utf-8?B?V2dOYWk1L1B3cmhyckduRVJhN0FCL09DOGdia3NzOS9qRU9TclFrTUdaYWNy?= =?utf-8?B?cTdoY0kvVzNTYWdnQmlQb1VpT0hkK3NjMkVkdEpZREI0VEVPZjNuVExLTVp5?= =?utf-8?B?UkNYT3ZKUTJSc0FDOHpOdXFLMGNidnFtK2tuRG02OWJiQVJpSmFDY1JwR3hB?= =?utf-8?B?b2Jta2pTZWlJbm8rR3Ayc3dIN0hwdmx4Q3B2SDFQNVgzM1ZkbGlCdkRIMHMy?= =?utf-8?B?V3lhZVJsM1U2UkZ4a1QzaWtYaWNyc09lNlFuV2tIUVI0bWUxUDZYRjBpekZS?= =?utf-8?B?RWtnektQVmNTSDJBZmpQR1I1dnhOaXZPNTZGNVplUHZTVWVEUzRvdWZoRzh6?= =?utf-8?B?Y0xHcnlxWVN4OUwwQkN2bnN4VzJyRzcxNHF4d09vOGJKOTBaa0k0eDRHYnRU?= =?utf-8?B?N0RRWWQyV1BrYjNIRGllUzl1M1F6UmpJRDlaaHNuNFh0SHhwa2pzNm1pbkEr?= =?utf-8?B?bDBhVEE4MkVwOWJWOTFWRUNLSFM2ZnRtTlBtekl5NVBDci9UQ21kNXFMdzVp?= =?utf-8?B?TGFVc1ZmckdWYjhsMVpuRXlNWXFoV1dCTjhMc1c4bnNra3RwWXA3Tm1ZajlE?= =?utf-8?B?SDF6OU9UWWY2YTZ3Vk1UYlI3Q3F2b3hETEgvdXN0UUZXNkZCQUY2LzJuRHZX?= =?utf-8?B?Tk9HZzBUQjZ3aGZlTm41L1l5d3VqYkNtU2o5dDJYOGo0N1FTUkFUU2p5V3lL?= =?utf-8?B?ME51eWRtOUtQOWhiejB5Rzh1ZVBNOTF2SHZScG5KMGdJT3JWd2g0UXhNWG1z?= =?utf-8?B?akxqM2UySE5CU1FES3I4SGd1VUNUZXRrUDhvb09RK0hUUWp5MGVocTVEOW5w?= =?utf-8?B?Q0E9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9b53c730-90b5-4d47-2a13-08dba8ff1246 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2023 02:16:08.3264 (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: AOtJEPruWLRYnN4w6LA+UbHqH/uZYOrC1G+5S7Mu3NG6dhdLDFQi1JxE/eMGTnqNJQBj3DwlFyBGljgsU7dqGU8XdMXjaojQuuRsP5HH9xE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB3786 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 -- 2.39.1