From patchwork Mon Sep 18 02:46:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 131556 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 AA5F0425C9; Mon, 18 Sep 2023 04:50:00 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7DB80427E8; Mon, 18 Sep 2023 04:47:54 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2112.outbound.protection.outlook.com [40.107.220.112]) by mails.dpdk.org (Postfix) with ESMTP id 06A3C41153 for ; Mon, 18 Sep 2023 04:47:51 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BsDDbKkFNtnHVbHZkqkqcanYbcfjQ5XETyeXCtvrr9gqqYVMAVSHjq23FvmAy0iEbJSlQOSW8K2uxE1dfqCyXf6Tnp6grWPSpveET30VvCRVnu/0ZW/gqMM+pwG8P+hNQ2/fYtAXpnxQcMyM9hLDuzbruXVrYk/guQAtUmitdH//gRTpXvmQwiqSkmJopMsfV/XkB2NgB43EBa9iBUd/rQx76aaZ9URdh6txl3gL0A8XVxEdsYof999SVV275+MJxfd4f4z38FL8mAtdNn/U7ji55i+yPJpzIOzb0n08sTT253bi4+gzeICf+67sKOUQIusQTSVe/BAPj66k5VczmQ== 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=ej1OB/k3ddlox1GhiSQwdHOBnI6daYnsvn2MgupvnV0=; b=NVhuP90ueAHHyUQISDo3LWfKgnEj+Mlf2ct22SQtfFUs5f1AQl9CB+8QnAynDJadyE8gPn/unfQ9T768ujZs+jMUm3yXkuKGyzQmn5tTJCj1mGD/JnsgywW1RdVVkw673KAC36GoCRr/0SJIMLywz3yJsT7UYGsLYfzZ4WB2+c+zX5WRQ/cfpgqOj26+IKtbBazm9xEFzihx5gi9ThDL3yw2oe8RXv1k8+sjnoLUgxtihmTywGJR2HtH2iQRdUVlQ69o6zlaE050Z47xwfI9kRzHuQOV/1EA5z343Rd8L1HsFg8hzn7+9G7OdjcYjb71t0eSiEWIq/PT+SKKl62AHQ== 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=ej1OB/k3ddlox1GhiSQwdHOBnI6daYnsvn2MgupvnV0=; b=pm8Y+CcSeYAg5uYzc3CkKmRH8EV/FJDfeeVemPvTpdhycXbnJHQqWL6Ud3sGhbhydJxPDON2GBgrf9zR6lt6oG4mdPV+0Qd0pitefCMlBy58CcvvsGp13j46XwsZaORVETABn//vb+zcsqupSwxUiv2QhGYo2+ieOIz+oqwf2Lc= 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 BL0PR13MB4401.namprd13.prod.outlook.com (2603:10b6:208:1c3::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.24; Mon, 18 Sep 2023 02:47:49 +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; Mon, 18 Sep 2023 02:47:49 +0000 From: Chaoyong He To: dev@dpdk.org Cc: Chaoyong He , =?utf-8?q?Niklas_S=C3=B6derlund?= Subject: [PATCH v4 22/26] net/nfp: add header file for PCIe module Date: Mon, 18 Sep 2023 10:46:08 +0800 Message-Id: <20230918024612.1600536-23-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230918024612.1600536-1-chaoyong.he@corigine.com> References: <20230915091551.1459606-1-chaoyong.he@corigine.com> <20230918024612.1600536-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SE2P216CA0016.KORP216.PROD.OUTLOOK.COM (2603:1096:101:114::20) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|BL0PR13MB4401:EE_ X-MS-Office365-Filtering-Correlation-Id: 3e21cdd2-413d-44e0-3b2b-08dbb7f1a553 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wYCYazz8Q5Jtm6eggAGHTDZWY0gNgSIbF8Ok62yPjB7IFcntlOZu/seLcW5lrf9DqkSNJCYku0eS0Nc+/hAig7dPKLnTIKenuCgrdsnaQ7Q7jdOlCWPt5sgg1sBNeLpUn1jHD8Sn5OddhmvdyG8syP7EzH/iYqfxeQTgO3m8X4Lby56kMSKJYvpxiOobBtAMt+1gqy1g0j31neBJQhMNr7H9HVSaNr5iFfG24XInX98ulYVOuZfli3dn2ncGQrPabZG2w7ta4nQ9gxYksPz++fS/vfxaNlyI8JVjG74PYIhjrPeTr/YqMIl21fs5ghBS63e92yWNl/z8yrXzIYzlWfoy5WQf6KeAMpbiKYEpDPo+EMasMjM0SeXXyZxmp1s+rs+tIAieWNTBPBW+4Q0ywU5Iq5iv1ndQ9cPLcZrx2LQ/e9MRTwUZn8Oo3fcqXIz8d1p5OYmGf9cUHAZuGWRF+H7ccGy4QCSjuXmwpT0ZDiRWXcR9PgBjPM0ruLyhasxt2REU3w1bHRE7XMZNNjUhUF2159hQRhHOjxkGl7S+ntQeRTP53fUnC3KRxQRHXkBeMgc9cWNxey4HpAisK/dVIWJM/LFUR4ajEPhns0BpmuMbKSZo+9nNEoZTNwxQqvfR7adbdUf1vx7v/JtXG04O0yq9EVgNwvo1cDzjl8XumIw= 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)(136003)(376002)(346002)(39830400003)(396003)(186009)(1800799009)(451199024)(5660300002)(26005)(107886003)(1076003)(8936002)(4326008)(8676002)(2616005)(2906002)(86362001)(38350700002)(38100700002)(36756003)(83380400001)(44832011)(66946007)(6506007)(6486002)(52116002)(66476007)(66556008)(54906003)(6666004)(478600001)(6512007)(41300700001)(316002)(6916009); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?WgkQH0/irlkLbErYM9oeDgq9/q1j?= =?utf-8?q?wKfjqQXw+vxhv02Gxlh1vjgJwTGxkuMWHfnRiygrAGQ3UDxvmMhgnA/kUr1ZOuClL?= =?utf-8?q?QduqQH/QNujUGtngJc3PHvLQsHVb5fiCb6M+1kJ8Pntgu27yTNvR1rOLdv8bMI55A?= =?utf-8?q?aM+OKGh+uZuuUOInhr3pki60B8DnrDMfXO1ZXdSptRvXhA5BtopGHkRkGaBYCN3Gg?= =?utf-8?q?lsoA8SJ/J0ECNw+/MCno/4Bb6Sza05+CIdj9xOw8fsteRz9UDWbQaCBI6rXBP3J1k?= =?utf-8?q?m7zzKIpsYCVmoR4QqIGgEdLsE38GFamAxCgmkU1PHiNCvUb5ZSthzsOFJFGZLnslq?= =?utf-8?q?SQ3twN/I9urW6X7RuIxgWobIZ3spr13tJv5qM7t7rxzZWmwQvP6jmFArdcdtajFPY?= =?utf-8?q?aTUp6qA9iLtZqgb8KFg954qTznfKOMEhqB9HnWeNfHEF7xWOTG3NPDwInCWuaNUHU?= =?utf-8?q?oJW6uRxXhm78WIWGUxYvqtRgO4lUguLxbj25bso9AIwGjXu20aZRQ7aTerx58ZPMZ?= =?utf-8?q?dOmQi3G1wMUOg145htluv1Ly7HpUlrtD68tZP+JmUhuu62GWEvFJ/xjBnrhOMKFT6?= =?utf-8?q?p20WBI+RNW2tU1ylOX7NSVjuAaQ+18A4YEgcdVI1rEd/UnOlDgtUgVmasV2UGVYXi?= =?utf-8?q?p26smHNTBMAEM2emrzUAjIi2KF4MyZHxL+cisJ20durLKOtVyGXH9NyO9OYNuyj9+?= =?utf-8?q?dGEmR75wgo9dph6Iqknt9WPs3ttxJNn8vsu2/+aaVUuD8DCdFPtc4VWEyrckGKBtD?= =?utf-8?q?d9Zk0aqahnprrwazOS2qMq5fOU1qR9d7byknC+52hPurrLSe0i8SXlOi4WtaRm0Rv?= =?utf-8?q?y5zgf3lrB6kMEdGKmpoBRStdZ06u8uy5IrlQ6/1r2zxWLTD1/cXcqpxgJTCpOwUdO?= =?utf-8?q?Uvj5fAog5V4lkhk8KZoc2eNfBgezNoWZv+aQFVdZPrzW6PwRluap5DN4gjrP1542x?= =?utf-8?q?V+/jRx7vzH+rGbwM77Vqlk1rvLhANOokTPSlR+IJFbuq1GKz7vu2faqaRk0ILZqwm?= =?utf-8?q?2wcjdFJ0bp/kZWM1D0TnR49g33yBXY78sGJG2UzIgWYU0X5GPtn04kU3sUbDKyf23?= =?utf-8?q?d73CSOk8n6CoqSeFVVvcsDJpFT+BviGmwEfuXriIh1lsqvA/ZbkArwdI9pJch1nDG?= =?utf-8?q?T/PsONdVnJxDw5EU+sM55lIDNUC1D3LmqiWwAy0OZGemoBgAE/Kq7wsT8iSHaL956?= =?utf-8?q?oXTQd+FkmJ/4WI+M6qDW1gRKBZqj05qs3HSFE5nAMwPcrHx7z4aaAw54q+9l+CqNx?= =?utf-8?q?toQ9nWs9jq6S66lfChWFH7yuItuyBFxhv3Ei4s2C3A+yYSPggU3JPDvPq5KY+/2Ro?= =?utf-8?q?xvIHRRxS9E5lvP0uLD6eL2cD8khhqvn147A+prP8HVzN+43Y1dc2hitFmkfgQxcIe?= =?utf-8?q?w1y6fZeAZk7F+3w1jFKCxe8uhCLGcAskAk0KYCG8HdojKxho8J9V8Ja75e29BeSYD?= =?utf-8?q?C48//guwRN64qlbIUzPdhIW4YoxJw1+UE8747o+0/UaZ+Tp4sZ5DpBrCXtK0YK9H+?= =?utf-8?q?8Y0q1aBywxdYjtmth1UcLEtvgrQGors83A=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3e21cdd2-413d-44e0-3b2b-08dbb7f1a553 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2023 02:47:49.3488 (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: ZDQcaGLO+mXPvqOxW1TrCQGdjAxrG6tx1UhcCBStihOcNvrz7M3Zn1MVoA784hqh6DNNqPtwGIB9oQmlBkj9wKNuNBKJNDmytj+kw/BkHVA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR13MB4401 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 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