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 C408A425A3; Fri, 15 Sep 2023 11:19:20 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 155FA42D9F; Fri, 15 Sep 2023 11:17:08 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2091.outbound.protection.outlook.com [40.107.237.91]) by mails.dpdk.org (Postfix) with ESMTP id E13F342D9F for ; Fri, 15 Sep 2023 11:17:05 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ckILjqynqY+vCTsaY1v7Bd5YzUJq1uZz4K5sKb2iZkkyjlxJhwxgbCmWk0xE8Bj8zfoF1fyI9N0nH3OKtOFoBuiMlUZa0S0179wIb55jsSLysrtaS7WTTo+kTOOx+VHu3ObehWd9U3mLBp60d0wlPSzujZfu61VZTOVCAvGZ9mgUFAnxSPpDCCotA4tR5Gw4AIpH7Xg4stVuuvtCx+m2VigVahEMp20QWXFB4bUgVxm2m3Rr8bEsk3qzcn36OOsEzzR1dHMrU3kEo8DWIKqXZp/s8dsI3bwXN7QKrUboquOZrXASqglCjJrI3AvHBzeCHghenal0/ixck2xuiQyhPg== 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=Uw/34AagV5xUfr+QoGwnr6ddhxvHW6RlEXiMlWeXXH0=; b=GWewYNT3ndG+dMYUgXZRYgzOVWsLtB2wNpZKcnCmpThFN205QBxbdYf7znpQrEaYuXoN7oGwU30Hi0WEvWi184KNxGnb1wgJOz5iWD8QLJOkna4oBNaN/vJzSqPm/b1MU0KcHDkhAnTGqouDYdSQ6tBEHmp9+u/ilmIhS7xhBE+WJvwdKj7Gg6WuPCryJwM+gNk/lS7f2Gi8xRQowLxTvGn11DlTpqdp7EHG6CtFhl0euWHfiKJzEKuhKkj87usogABUqEFQ4cg+v3B/4ZFLU6VvKUinNdOuY/xa8akgtc5kycFv4w3slTgb7gPFuxlQq/BhOc9hhy/hFOkml27mPQ== 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=Uw/34AagV5xUfr+QoGwnr6ddhxvHW6RlEXiMlWeXXH0=; b=arIXNfmXdSxC1o+GM+9TkbNvNFmgtfJBTi2pyIIONfTx3ihUIyVXGbfTtvf4jgd/9MYYqOMt/EEZ63fxLD4UspJUOMQnQucjB9gF8UIg53Il30Y6U7khHrDu3cXvAHfs5pL6SBGFX27MVtj0IUYGQuVZHEQsWKJDQ57gw2xuhGg= 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 CO1PR13MB4773.namprd13.prod.outlook.com (2603:10b6:303:fb::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.21; Fri, 15 Sep 2023 09:17:04 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::c05c:6915:1628:70c4]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::c05c:6915:1628:70c4%7]) with mapi id 15.20.6768.029; Fri, 15 Sep 2023 09:17:04 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , =?UTF-8?q?Niklas=20S=C3=B6derlund?= Subject: [PATCH v3 23/27] net/nfp: add header file for PCIe module Date: Fri, 15 Sep 2023 17:15:47 +0800 Message-Id: <20230915091551.1459606-24-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230915091551.1459606-1-chaoyong.he@corigine.com> References: <20230830021457.2064750-1-chaoyong.he@corigine.com> <20230915091551.1459606-1-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: PH7PR10CA0017.namprd10.prod.outlook.com (2603:10b6:510:23d::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_|CO1PR13MB4773:EE_ X-MS-Office365-Filtering-Correlation-Id: e3722822-953e-4efe-9c3e-08dbb5cc8699 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0UHeixq4+CwPc1Zr9QbTGCA6NzNmULpzhmJV5C8U5Wb+bAljH4W+2CUw9yU5mfzPofv7V9vtx9v+wTyARtXOTjQhO2PCuP+uBCvPzTbvmDv2ydvjKA2UVcg0O4QTZA3ul+fpb1sfJQN2oJ5tdo36xJjt8QBTIfqgIAeYz5DdxyYgliUNsGZt2AV3n3Q2i866gDbWVdbKxZY0hp+1Rf5rHwA+9pROX+pzSmOnuyQwXMesosjKD+SpgMgMBrs3XQruiZ0sE3r7VOQ0QSAiRlGiWlHsQRuqAjXACM5F6EiVQId0lJdYEEIkmckuNw6b3OV45M8/BPemWAR3zINjuW7nrQ31v3eLublN3w5Ez4Y20ZEDpYtYbix+8HVRq4LYvZ9lc8c/q5/90A1GKh0gkrB7xSdTVBBW0qKvFXmdafw8KRRg3k+wkwrmVLdQR6peRrjiNPZUuuU7kK5n8jpOd2e/XKY+7zONgAiiiMrEjV3G6ch7JE6UmzDTFcomsgtgS5gl//4SmdYWO7Kly+3Hse9HYTdIIf/fMQ2WmQ4BzMd1KX9vWFZul2pCwQZRO7iHYfsWOf534F3y0x+v/SRMGLrwWq/DDbnRqhfSMwa6XJTl7v5hpnK7jgqm93hHZC8zQSFTfX5w2//6BKYD9xzPg9WB+yAflPJvT+SR42vloj1GpTQ= 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)(39840400004)(346002)(136003)(376002)(396003)(366004)(451199024)(186009)(1800799009)(6512007)(107886003)(1076003)(2616005)(6666004)(52116002)(6506007)(6486002)(66946007)(26005)(316002)(41300700001)(66476007)(66556008)(6916009)(54906003)(5660300002)(4326008)(8676002)(38350700002)(8936002)(38100700002)(478600001)(83380400001)(36756003)(44832011)(86362001)(2906002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QzljMmVrdHZ6NS9HRXlaYitQZE5halIwalNaWWJsTG56MHBsSnduWnJrTktZ?= =?utf-8?B?aGtuTm5CWGFrSmhiM2hXT0Y1TXpVMldrWUVDRmtkbE9oZDVLQnNxK2tnTXlm?= =?utf-8?B?OVd2Uk5qR0dvcXN2N3JLRXRGUERTOGhneG90Q0NsNnVCWFhhdHA3K3NJakpE?= =?utf-8?B?ZGF1Rk5mRTNlSkdyV0x5d0tmNW01U3BnZGhiUXBFUHNJNU5wZUpDb2taNWJq?= =?utf-8?B?cWFJOGQzSEgvY0VCMTBSVHpidnlwRzBDNVRUU1BUQStlY09EdUdoZXpsdkMv?= =?utf-8?B?OWFyazNYRGVsUGErY1l4QnBFblc1TC8xbCt6MzBERG5kZ3ZHdmtmWnlzWnho?= =?utf-8?B?ZmFzZ2NaaW42MnZnQ0tvUHF3NVhZaGZTK3l2UTg3b2dOWlVqdGQweVpCUzJT?= =?utf-8?B?SHFTMW5QTnE4am9JalZHdlRKQnNyK3oybytjd2xzMTZheFZOT0ZCZ1YvenpW?= =?utf-8?B?Q3JZcCtFQ1l3Mklrdis5MFVucm1PcHlCM1gzcUpBL29zcmhLZjZBUDI1M1ps?= =?utf-8?B?VTk2eDhSaElNZ1JCSytGbDk4TTFoYmNqdndsYUVLeGRkNlRnZ21kbU1nK3Yy?= =?utf-8?B?WlZDSGlSWW85WGF1c21XVnlKbFhwd3RUdkh0RHBNUkljcDljQXl1eWd2NEYv?= =?utf-8?B?eXdyeTU1b1VmQXluQWRYMUhSdHhhNUR5M0NwVCtwWHQxZzlOYkdGajZ0VzJF?= =?utf-8?B?WWVuYzdDNlpZUUdndkxwM1NRanREYzZGWWxXMmNYSm5nTWszVGZJRE9lUjRB?= =?utf-8?B?dGJmVGNHTnNpeWhPNXVpV0UxQ3B0WEJyZ2xxNnJsYjFLTHJ6OUdGQkZKY05M?= =?utf-8?B?ZUI0UEViZ1RIdllpUUFhc0IwZFBvZHhOU25jVVJmOS9nVXlpaVRmc1lIaFlP?= =?utf-8?B?YVd2RThtSGRYNzE3WGRKaEdwQnBBcy90TUh5Uis2UnR3anBtSVY4ZnBhcGtX?= =?utf-8?B?U0RXc0FTeTlnR0g4bURlWEdEQmRDTWRxQ25xZEtvK1VNWGJuVHozN3RuemVD?= =?utf-8?B?UDJaRW42Yi9IN1NSOHg3cjgxMEQ0RVM4endCc2EvVXBHOXhkWkxxSWZBOVg1?= =?utf-8?B?WGRrNy9lOEJKNG83SXhpVnVvN1RadDhmYWZVYW9ncllNLzRMRm9GaUVDV2ZX?= =?utf-8?B?T0lQVkptOHBNajg1Z3FlN3pidHJ4QmlPVzE4c3gwSHJ1aHQ1ZTYyVTRJSGJP?= =?utf-8?B?SWNzN09kaEx2MGNWdEo1QURLZlN5NnBYbzhuVWZXeU83czdzNnIyRW83L0sw?= =?utf-8?B?L1pSK0tSMFhaOXRybzJNR2Z0azNHczNNVUJtM3BDeVpiQjlLMWk2M2RKOTIw?= =?utf-8?B?MzlPbUVDbURwMGJUOFNRS2dQYlZZdWNJeTdwdkVBb08yck16UEJQcG5TZDhJ?= =?utf-8?B?bzcwRUdidmdrSVltK2JjeUhCb2ZJQUxxOTJqTlcvN0ZXS0UwVnJaRWFFRTFN?= =?utf-8?B?R21hYXJYTmlQWUFsenRZZjRNaXNCNlpXenZoNzNJaVRmV0FpZFJJOVNZVERv?= =?utf-8?B?Y2ZrdzNZTit1bTRrdE5lQ044Q3krcy85cHNEVHFjeFpKRDkvai9MUVNNMExH?= =?utf-8?B?WnhzQjRBYkNxd1RIZUVRZjZ1UWJwa012cERpV1FndUpDTnIzK08zV0N4UjZl?= =?utf-8?B?aUorbzVDaFl3d0NKdUhwcWw3UmpHaUdSZ3ZIQTZ2WmZkT1VjbWpveW5NQ1F1?= =?utf-8?B?S0FmV2N1WjFPYVVEbWpZVFpFV1FIVUVvczlOdk4xQXlVcHNtOTFsNmRsWVFB?= =?utf-8?B?bDQ3bHJLUjhXUTlaWmJOQjRhTWtqdy91VWNkVzU1MXFUcGp2OW5qbG1iZ0hk?= =?utf-8?B?RENiRmRCY3FobUdibkFXNjNmREFzUEp4SXNzL2g5SC9JdG9jVHgveDk2emc4?= =?utf-8?B?U1N5aHBRanVzSVdLakVDOE1jeGt1NnpNZ2NkQ2gvOTQ4dWFwT3VEcXVzcHhM?= =?utf-8?B?eUZ2Sk90elVaSGpZTEFsOWNYcm4vTUlLZVUxU0Qxb0pDN0xkQ3ZWRTBzSmVQ?= =?utf-8?B?VEhxdGtRdDloSUVndCt3clF6NFV6L001bUtac2c2ZWxVMmsrc3VLeUFNU2ZP?= =?utf-8?B?LzhHQkk1U1VWbXNEUlRiUy9FUERLV0NtUUZ6OGhJNEhHalhKalFDNFJHU3l3?= =?utf-8?B?S0c1elRiYmd0aHZQaG1YOEQ4OEdZNFdkQkNaOXc4SlRFSkNYTnBuNEp6Qmpj?= =?utf-8?B?OWc9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: e3722822-953e-4efe-9c3e-08dbb5cc8699 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2023 09:17:04.2020 (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: vBPKiKsuTgHTCzdz0pbTm4U8qEAXs7kjdhQmdjK7vqnAsjgMet9d50fxXZ/xkYwlA4GWdRm9xaQEuo8+Q3gNpw43jP/u7j6DuyYp1igm3bc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR13MB4773 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 b7eb53697f..965b7a3428 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