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 CCFB04320F; Fri, 27 Oct 2023 05:03:14 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DEE3842E52; Fri, 27 Oct 2023 05:01:11 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2096.outbound.protection.outlook.com [40.107.220.96]) by mails.dpdk.org (Postfix) with ESMTP id 94D4242E15 for ; Fri, 27 Oct 2023 05:00:58 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CpSGmn5F5yzVqsY/7K2eky9QQhl1e4e67gOhXgHlvk1P/4TKqgqEsVKbfJNuPQJ7/rEvmJRVz9cJ4/Icsj5LYPW17ujwHoyqBUMnrcEiONAKS/S9AHIfd0Af1NEFRUOowAXtexsx6uZxjL9gEhv4PuN6s6c3n/rclE4lZ9p2aoU7Z/cqKRkRjn9W7eueUYzMgHa3f1ZCj4Fy9+QV5UDasXUosqXHVw8icJFnkSk6dwohLcPlch1bsLSn+7F6KrBLITEkmqSXnO4w6MqJAaigRhJdaDf9bFgNO5pXW82ZQh4E0qzVQ/7Nc2YEuYaALWLZGA8TQs6B3TuXxQ9aBLh6tQ== 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=EF7xNBqUOpQNvYGZKdJz/UOxNnBLoG0H78eBn7k8+VY=; b=cZc0bLL2nZEYwRVFL2RUR4+p5VsZtSApGt98B+MKb96tq2htsyM+5jYYgqqGS5ZnsB8wPE6JM6T+YG/hBev7JGMoBDjfqBloY+sj+EXd1YQRlVvLAcPb+qzBjcp349cwMX0PvjaHl1/2LuAh/aJZIw70SNx1IYOKdI6Q0t2HxCQp91qgKB3dPXhIHi//A0ckp/wtM9JlRPrNIiN0WPjCO+vNyYX9ML/6beOgADEoP5xdoq1m9Kuz+08FRtY8cvql+2Dv9i7SO5DuHXwdrGD6pnRSquXSXmhacF9arhsqNomeCx8OPkGutPhbLXdnzbwMlxQ8Jy85tEKglgIQAM3hnw== 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=EF7xNBqUOpQNvYGZKdJz/UOxNnBLoG0H78eBn7k8+VY=; b=qp3KtgN9kL3ZO/nJo/HrUsKn0NvLewJh0tYarL01h+6q3UQbXI2MWZxEOjjFL1gMaP1t05gEwpYwPEAuZppAj7MFbfXdKNO5Jnu9i2h7rEvk4snat70T1ihtRvudkLRDL8H4bL0MSCFqh/jsYJSSPDfsD4bVjBJKHu7o4mc3uaQ= 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 DM6PR13MB4493.namprd13.prod.outlook.com (2603:10b6:5:1b9::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Fri, 27 Oct 2023 03:00:57 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b%6]) with mapi id 15.20.6933.022; Fri, 27 Oct 2023 03:00:57 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH v4 17/24] common/nfp: move device module Date: Fri, 27 Oct 2023 10:59:54 +0800 Message-Id: <20231027030001.602639-18-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231027030001.602639-1-chaoyong.he@corigine.com> References: <20231026064324.177531-1-chaoyong.he@corigine.com> <20231027030001.602639-1-chaoyong.he@corigine.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: BYAPR08CA0065.namprd08.prod.outlook.com (2603:10b6:a03:117::42) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DM6PR13MB4493:EE_ X-MS-Office365-Filtering-Correlation-Id: 33635518-7c79-4089-1a7e-08dbd698f0e2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CJIM7hewsYfLluZ2VjxkluGihgXrdUQd7p1vIjdU4Ol08vdDIDopCethVHTHFLbBp6Sp41cNd/NB0iBEiboaVMMdZDZv+pJc6Qfc6fYnmCSVrsF5NgCNaPpMfaJNe+NFuL6y/0Nwcj0eIKcuuqvCuH8PJOqPabul1RMSrhgMnfGLkZDjjaShb2I+evw0HzEympGAF0kLlMN4Tn4PYSFY9MF1iRacbYDk/lDb0ANWz0SBL3XRaob81h7ipBds/OOJQ5ydp/85avp7JfhlxZyip4b8DeIUndNG3ICNVTqM75FQjPwPcOS44+bgUz8OSqBAYWF24hr72KLtlDtwDx9kJ9L58sY5oy4IbnC16qMex+fe9asmHHTfNCk+STHeYldi7bvdVALHDOJaEVvGl2f/ZlyULgTGcuCi3ABIioI5EAN6Jp7i5XV0Pz/bpuN4ykKz0kpw+UODdeHERipObo9M28kinp5JUi/F5Q/Wz0koUjAaDjmCfNk4GzoJSBRyiZTzJ8YN57xQtMTfSILa/b0l04ae5/JlB6xdFTODkaR7N10qDYFBkYrhUCXOkKYPj+W2Yue0n6Mnu4sTfdHCKcYvIDk7/x6STlZ6KDVs+5Ga8EZCV4r8XDocbFpURPDXnL72zX5u507vG+kigGf9bFkthQpSBwXNM+FkFqDAiAAobzk= 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)(396003)(136003)(366004)(346002)(376002)(39840400004)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(38350700005)(83380400001)(4326008)(52116002)(2906002)(38100700002)(107886003)(44832011)(8936002)(26005)(2616005)(1076003)(36756003)(8676002)(54906003)(6666004)(5660300002)(66476007)(6916009)(6506007)(316002)(6486002)(6512007)(41300700001)(66556008)(66946007)(86362001)(478600001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?F3/VoBq1OZ3ETiFYanJkv7d/ldbR0KFqzRJdih1bkdjnTeRhkjm7kxImqokM?= =?us-ascii?Q?qZHS5Dm+ljVehp/IvWHwPfAZVWoEAMRYBuZALrYpYx3NXjhqNXqvsGCZFqBX?= =?us-ascii?Q?ijLthQtF6GKJA1bZLOVtsc6/DSkfaZREE8qZGKoufBQNIgQfErNtfkvW3Hnq?= =?us-ascii?Q?WPcA2HG1t73Fcps8AWsonHaoN+HlGG1/4BAXb7FQqBQ7BcgM+4g0zq0J2lNq?= =?us-ascii?Q?e4JLdEjPtn9eYi5iF+f8fSvP3NraEYPcYoJU5LCM6u7IL+xoHB1a7O4xuork?= =?us-ascii?Q?jn6Y7alZXaPsmELw9SyreGsXl0nLAYeMCVRXj5KYi+gO0OhLiXxy9PrUcms9?= =?us-ascii?Q?ghcMLg7G7t+VjqlMmh65OjAv6n+QRLxiZobRNESWfQGaYSK8FDEOTGp7rrQv?= =?us-ascii?Q?icMZlLHBq5LvIFFtj2r9pVpRt5FmDxf5s1XlX2PsFqdtzOHfqclXlA08S53R?= =?us-ascii?Q?CknSVIHmo2oVa04/bMO9gMHoN/GYDLI2J+nMOfIb3sgsHc07UWgSPECcEsEL?= =?us-ascii?Q?Mw/LFKuL6+Gi+3ff3L3KmYLSI/8Gi6SHA9QDk07LA46B2B0ZT9qFKKenyBJA?= =?us-ascii?Q?7z859ZjqU2MOXi0GyZJzazU7nVEkb5Qa7bqTkI2vFMYcSJ5kBqTDK3iCNI2N?= =?us-ascii?Q?v0tfd4ABccyDF98Kfx6A9DCv4HZZlR/T2aNWZkcecEIzDizlXaVdVVxgWx+Z?= =?us-ascii?Q?JWd8XJ4NUikWFWdWjMafL+1c+2H/3QDg3Klk47CRlcDE1DbDeDFrX955aMlP?= =?us-ascii?Q?jm/IWQ83jdB7NqBso31I0aIVQYVT7KKiBI5BaUjcI2ufxCGUPArEka1jUdeR?= =?us-ascii?Q?bo0cF58x6ifaXTdh8vT8Xr+ph4qWYXEQAfNOkQUypB1ogNVDaCbnyZNFbKM3?= =?us-ascii?Q?BqVIqxkBKF2r6cQU6dsDdL8sh/2VtmX/ZBjlMRvi8ObzPHi/kCaXv1lMzJbY?= =?us-ascii?Q?bGUG4i1H6H2MVMdEMJ/OONyYTMr3dShWC95avl1xR9dxREGtuvZ/zSowgiwz?= =?us-ascii?Q?7qDEFGrkWoX/+RYBLEH3vKq1IcXoY3i/Uz50CMn19mKeybNR4BOzrI+D8Y8B?= =?us-ascii?Q?wsw61oJilYu7qIXKnsGtRAnN2yZTYaeIXFyd8O1d2SRt5oqhhJKdFjHsH0mJ?= =?us-ascii?Q?nAWrxIC/1emzRzDhLDt72Nrpjy5TF4a3HsDCLsBUPQHQw0ICWw9wcFd5AkrA?= =?us-ascii?Q?WaVVyqzRrwh5rS0Ohweu67epXjvCftxPNCRmF69eCtvdbB/FdFYK/x2Che6z?= =?us-ascii?Q?6JQIxiOPVSf6lLjRUPjC4+2GOnAtQoMkYrj+431cPPZGorsEhkpjnRVdL+kv?= =?us-ascii?Q?qvTAGLR03oahaobuG6E9hyRcK7PFnTIC529AmYdZcEDrQy1Ea4mrvFl521SO?= =?us-ascii?Q?J3ocYQz9w0rMdMH8IrtVhGF/MP/2X36VzPGO6xwNBFTMrIbtcoQLiOgDVA/I?= =?us-ascii?Q?LMh04R8MHoQCHe01E9LbaPhaAE3bDvN7EAZ+cQoaYdf87lNQbsAjU5l+j9EH?= =?us-ascii?Q?/4UJh0ric5O1X5jHnV9cx1kug3K/KRWaw4fuTehpra7GYpL7gFfcBlAPVKej?= =?us-ascii?Q?OZLJQ24xg51UyZN3aGIbuZM+hDeIZzEAk0/0zyfuL+nXvdUxOyeMUJK2oK58?= =?us-ascii?Q?mw=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 33635518-7c79-4089-1a7e-08dbd698f0e2 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2023 03:00:57.0703 (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: AS5XpzGJXyM5IosENrFFoiKEodFuNv5BqZ9PHaml//np+931XGPqxLgM/T3W2PDDqxWQ+1hzRKj7Grwpu6Vx5wFBsXx5VwTy+myxArXJ6Fg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB4493 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 cca7fb7796..a09d1e25e2 100644 --- a/drivers/common/nfp/meson.build +++ b/drivers/common/nfp/meson.build @@ -10,6 +10,7 @@ sources = files( 'nfp_common.c', 'nfp_common_log.c', 'nfp_common_pci.c', + 'nfp_dev.c', ) deps += ['bus_pci', 'net'] 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 fa99c3b6aa..cf9c16266d 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); -- 2.39.1