From patchwork Tue Oct 24 02:28:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133222 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 B6CD0431EB; Tue, 24 Oct 2023 04:32:12 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8DF5242DF1; Tue, 24 Oct 2023 04:30:14 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2125.outbound.protection.outlook.com [40.107.223.125]) by mails.dpdk.org (Postfix) with ESMTP id DBDCC42DE9 for ; Tue, 24 Oct 2023 04:30:10 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WhxmEWHj1ewHFoITCl1TqZfOb1JB3CVTHw4gieTZNF0KX/mP+TCJTzIpZzb7jM0/GxGNOV9ZTbgH5sDrSJbBMkB7xe67cL7SESzh3LGmSzpolPK6qpt3amPKyeoRN7BPHRqRNBLrEUW7YYWARIoNbAlkSfXAKN6mWKvrmbQGur7SeWJRdfiFLcXuvb6gaz8LnIUmR+4cMJjgV7Z7ao93ekUjA83f0/qEoTgBRpFyRHwlsTVeh61Dxkjboz8n2mGgrUnLXT7rbTcoMFkCpSVg6bffTlP3ZTO8O3IQIO7POcuTWoeN0KRCyNNjy1iSaan1/qMbkNicDFXk/S9ucu9kwg== 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=87HXns5CLM0Sk5NzwoHs8Zzn3NQuAeftgI4ae8Tsneg=; b=L3jgwNzMW/3fDHDDcGiJ5pshhjj0VJ4WFZM+wXmlfvpmU6Jjiy1YNMMImWotoy+zbgCoJqK1wH4besD8HEdQfsM/PWIqvSql0PznhsvJ+9hQmdOCHT+S5OslzZas0rT6UQ3zuAadBlco7XUUck9kQ5E2o5MN4Rl+NtshJzJG+KIZWqaCqoI0JK16FC0nNv1nF8kHTtNixhU5iLCUj1Ls07c6XNjSqfK1LP14KcdwUujQPCWoOvZ3c/OJ6xsrpe4cQs6Xxj3y9/z2+f/6TUqv+Qfg7b9UCQJ/NdCs/A4RWl+KlkmdtZfD6HEgz1g8UFKaMl1BQWZxhBJixl8x9C2czw== 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=87HXns5CLM0Sk5NzwoHs8Zzn3NQuAeftgI4ae8Tsneg=; b=Be5YkGaELQ3qiOCM9cRrT0ILo8JvB7K/Oucs2T8nVBSZu0Yny4M0gtw/UGVl5g2xBecncDxf6zaIVBGEMOyjGKzKZ+aFk+97Di8YdvkffQi5McU8Wie8Hxa/tMSZjN8PFz41Es8Qnt4+MKvstJwMBWy9vMvSLeGEz07MMnCJGG4= 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 PH8PR13MB6182.namprd13.prod.outlook.com (2603:10b6:510:259::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.21; Tue, 24 Oct 2023 02:30:09 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::142e:d47c:7320:8a9d]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::142e:d47c:7320:8a9d%4]) with mapi id 15.20.6907.021; Tue, 24 Oct 2023 02:30:08 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH v2 17/25] drivers: move device module to common library Date: Tue, 24 Oct 2023 10:28:41 +0800 Message-Id: <20231024022849.3092506-18-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231024022849.3092506-1-chaoyong.he@corigine.com> References: <20231017054545.1692509-1-chaoyong.he@corigine.com> <20231024022849.3092506-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BYAPR04CA0015.namprd04.prod.outlook.com (2603:10b6:a03:40::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_|PH8PR13MB6182:EE_ X-MS-Office365-Filtering-Correlation-Id: 10890f57-5ae7-4169-04c6-08dbd4392411 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5Rz6O9Fh8HbivfElQIRrCjUTtJN1dsil78sL4E5ElFAs8IM21V97OgJC4+EA8IbFEPKf6aI3FVtTFm7ErRAMzHf5uKq10+CYgU35LJF3sNdhrUFzqXSOfYouCR4F2shugHum0rfwOv7MKwjD94BoPbrV40iYcftbawsnf4LRYXOCxogIRNndrvRqLagSRR5E4nR9pWhu/RLrG3cos5hAzvRiTKUakW3wbiGdQaZb+RSIaRR1fJtV2tuva03PjRQU3cmivUqGvr/0waIS/LV13JGnFwoBBpHWoB3vf7MVuWHcm4r0Y+RkLFmhXYMg5rNyCVu+RgYxjTY23XFjVnvGEwQqNl3MJydGnpKpJ6vn117XkhGr6KxbHUKivxdQSdYSkcda2pY9zrHDN3NaP1OkWOML26/ZT4l65yLM29+Igp/KYRp2mVzTRfvAOLjUq9rL3NomncgYA0hzxsxqYAya5A3QCc5uTc3wuGHjDIWL569rgSORVy7LavoZd2lVPoNE5v62fJpGaPslaSpFkeB0CLaPEPIPiESL6XacqWaaOc456YxZDRK9BgnLwl2Gy161WYugOZzKzwO2+NEYOVzgobLTY9rmeycuw5FKhqrUU1ciyvOlvDRk1MlIQEZEDdaLEL20ugo1i9dDTEF5V6y9uv481d6BG4RCG+gMLc4XYLQ= 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)(396003)(376002)(39830400003)(346002)(136003)(230922051799003)(1800799009)(64100799003)(186009)(451199024)(86362001)(66946007)(316002)(2906002)(54906003)(66476007)(6916009)(66556008)(5660300002)(8936002)(44832011)(8676002)(4326008)(36756003)(41300700001)(2616005)(38100700002)(478600001)(1076003)(52116002)(6506007)(107886003)(6666004)(38350700005)(6512007)(26005)(83380400001)(6486002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DaO7Fqj92V88DhzMMrJNKf5DPKY71mBv5izBKx0DazMnOUvewQVJ5QTzh/VClIvrAzJlXTfTxY1SUyc19saMckoKu93feF3AQXVs+QfdwbGAQZxaG6CBBbl9FABt7drmAVvf6DY/3GnfnN8m6Rni3uNTPVnfvZS9aaFPJCnHAd7HRROo4d5F9rXDuEPfVS9KvVuC0UMpM27VG/Qsahtq9k4XyZypi5BvQXPJLU+jjEckgPH/neaNtMOhUQ0095C+feMTmRpLV0A1rfZbZfKTnnXM/ubz0vwRn1FwuKstBCeFG5xDit40Ssex/MwWHFeRurAuoD3cPhUsSDPSG3DxKLMzsSHiVHwte1jJtjyJErkZg1b1OjKMFrfeVIdqt/yhgJLP1PrHfexX70cREMhnIu5S1QT5ZOWm+V4vXo1eDLhEkc202G8jSVgYI0Hipb+St2Yde2KZBWXAiZyonOPzWYeJs3sTuGcz7i3DLgN1QqDV9YLVPCayG+KmmsmuX6kIW7xr8Q6YtKsXf+91qNmZxk4rRvGrE4xpi5pYqmepbeh/KsjkaBRwiBtfz12BPZxXy5Icu4lNXI/l6NsKuGMY/ynBwZC2tYe13l2TVk9pkD6Ncmbq0gZaBD9B/E2mH8CxrDs4V3l1TkYPChfPAupx4S7fhuYbnTlmCOXFV0wOLrDN8Db7k9H6yT9CbCktJnDXUUaUH6c68i1T3j77EQSvIvDRK/HLZqf3khk+q0rGe3guaaCP/5j3g7TMPaKJbe/Q8GdYmLHwnN5ubnW+ycK6+zZIMo/3p3YVa0ljaCorPxASjT0WmwhZeLtJOAijg0H8HzeDhIyJPX0PedEPoZRzFjIiGUJVndgJX0DFGdNrZol5NCxfS+gccn8jkOyoIyYNw+9zIThPbqTQyk6LhFhcq5qutT2Aa9zcXdbV1H4j+6wIjFqVnVipkvs9PazFza82DgnJ7kuYa+CV3oYN7i6kHFQOz7XyI9THoDtpduGwzx63PHa/0PaBKp4mUkncGvjuQxcST6P8GeJeQrK32J6v3+CkptB0QiEADVMTRfbWjr7VthLT2Nqaz4A1iNcPfBGSDRFw+UECoqM5708Cht4gH/NTCJlua/LtQ5rrdjiIYVB3SVMieJlnh79pO7da+Yc6UGll5hZv8UDbs+ThPU9G8Y/B0vzO7J3nj1NVqXygnpPMq3TT8l7aXHOLtzpBDTTY2vF2bkNb7B+Gswcu1cPcCuvoVh8evWINdkA4Z0o15ANez79krbX2S56njwrnyCj/Og70ReXzpBDDWnoiOFyAuo6EoGa7Y/xQ9037t7w9310KWJC59QIfwFVLhTiOPrZGWXPl/v4/LoVk2L25qQGEhCj9kiSeRXvI/WbZOWex82mQIJoqZQdeTQox6tMD1vANAdWkp5mW/Ekybv59lsUkag9dUTUNUAuv9aDstWogHyL0Sk1pX95ZYr/PICg8NX5AKWgKxaISD+V2HsM1ewHoeRTiHVqt5fLy4MEZrTy2wFb3qXWxm+nm65SoiZkSkSOnmGz7ASFiNh+2NHNtUJI+DQI+dq4mqk9EW/TlSKNsBUp17PrcH68xYB3w9sVcB8YBjs6vWqrHnVnW92w1UMcG4A== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 10890f57-5ae7-4169-04c6-08dbd4392411 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Oct 2023 02:30:08.9270 (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: oqAqgNQ9rf1eSkUAFWCGUVmLmGui1OXRqc6DBpumtslhAtAsQ6nfvFnKXRva4QbEHOZDz2ciXA0lQLf2K9tM/GJ9QvnvNNuoIz3jUqNVz/A= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR13MB6182 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 Move the device module to the common library. Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/common/nfp/meson.build | 1 + drivers/{net/nfp/nfpcore => common/nfp}/nfp_dev.c | 0 drivers/{net/nfp/nfpcore => common/nfp}/nfp_dev.h | 3 +++ drivers/common/nfp/version.map | 1 + drivers/net/nfp/meson.build | 1 - drivers/net/nfp/nfp_net_common.h | 2 +- drivers/net/nfp/nfpcore/nfp6000_pcie.h | 2 +- 7 files changed, 7 insertions(+), 3 deletions(-) rename drivers/{net/nfp/nfpcore => common/nfp}/nfp_dev.c (100%) rename drivers/{net/nfp/nfpcore => common/nfp}/nfp_dev.h (96%) diff --git a/drivers/common/nfp/meson.build b/drivers/common/nfp/meson.build index 727d21e00b..7f496c2da5 100644 --- a/drivers/common/nfp/meson.build +++ b/drivers/common/nfp/meson.build @@ -12,4 +12,5 @@ sources = files( 'nfp_common.c', 'nfp_common_log.c', 'nfp_common_pci.c', + 'nfp_dev.c', ) diff --git a/drivers/net/nfp/nfpcore/nfp_dev.c b/drivers/common/nfp/nfp_dev.c similarity index 100% rename from drivers/net/nfp/nfpcore/nfp_dev.c rename to drivers/common/nfp/nfp_dev.c diff --git a/drivers/net/nfp/nfpcore/nfp_dev.h b/drivers/common/nfp/nfp_dev.h similarity index 96% rename from drivers/net/nfp/nfpcore/nfp_dev.h rename to drivers/common/nfp/nfp_dev.h index b0fffff619..ffcdd17227 100644 --- a/drivers/net/nfp/nfpcore/nfp_dev.h +++ b/drivers/common/nfp/nfp_dev.h @@ -8,6 +8,8 @@ #include +#include + #define PCI_VENDOR_ID_NETRONOME 0x19ee #define PCI_VENDOR_ID_CORIGINE 0x1da8 @@ -39,6 +41,7 @@ struct nfp_dev_info { uint8_t pf_num_per_unit; }; +__rte_internal const struct nfp_dev_info *nfp_dev_info_get(uint16_t device_id); #endif /* __NFP_DEV_H__ */ diff --git a/drivers/common/nfp/version.map b/drivers/common/nfp/version.map index c1e03d8b8d..c8a04b1b95 100644 --- a/drivers/common/nfp/version.map +++ b/drivers/common/nfp/version.map @@ -10,6 +10,7 @@ INTERNAL { nfp_write_mac; nfp_enable_queues; nfp_disable_queues; + nfp_dev_info_get; local: *; }; diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build index d54dca36e9..c566c6d2e6 100644 --- a/drivers/net/nfp/meson.build +++ b/drivers/net/nfp/meson.build @@ -16,7 +16,6 @@ sources = files( 'nfdk/nfp_nfdk_dp.c', 'nfpcore/nfp_cppcore.c', 'nfpcore/nfp_crc.c', - 'nfpcore/nfp_dev.c', 'nfpcore/nfp_hwinfo.c', 'nfpcore/nfp_mip.c', 'nfpcore/nfp_mutex.c', diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h index 9461440d0b..6607175460 100644 --- a/drivers/net/nfp/nfp_net_common.h +++ b/drivers/net/nfp/nfp_net_common.h @@ -9,10 +9,10 @@ #include #include #include +#include #include #include "nfp_net_ctrl.h" -#include "nfpcore/nfp_dev.h" /* Interrupt definitions */ #define NFP_NET_IRQ_LSC_IDX 0 diff --git a/drivers/net/nfp/nfpcore/nfp6000_pcie.h b/drivers/net/nfp/nfpcore/nfp6000_pcie.h index 8e2cfb69e6..59b58ddd04 100644 --- a/drivers/net/nfp/nfpcore/nfp6000_pcie.h +++ b/drivers/net/nfp/nfpcore/nfp6000_pcie.h @@ -7,9 +7,9 @@ #define __NFP6000_PCIE_H__ #include +#include #include "nfp_cpp.h" -#include "nfp_dev.h" const struct nfp_cpp_operations *nfp_cpp_transport_operations(void);