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 0643B43204; Thu, 26 Oct 2023 08:46:51 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CF10442E3D; Thu, 26 Oct 2023 08:44:28 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2129.outbound.protection.outlook.com [40.107.244.129]) by mails.dpdk.org (Postfix) with ESMTP id 121EA42E11 for ; Thu, 26 Oct 2023 08:44:18 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Dlf7qjwZfjP0HrQ5DNkeIOJ8+STbITpqQcSsNwLAo3x+pZEac/HbtgBUY+bPhUCZ/hqKMz2CeN+0rtKpAvGYL3cJS8r+ZZFfrpg48wKTd8DYMenMWl2hqSaVsOhjaiQFPOevIHjz2Hl6HEYyZvrIO4U1sZBuHIKO8ykIDYUfw9U3x8E+mzVAxcakWCDHhrfJ6NH9fCbWydW2ek3kLfo7VOHlueUwuZkF4pc2tiudNuNe8/HW0ZegdgyR9A6zvTp9T3xg3BlhoO+xbkjb20D9kFyRjcaW3Ipxv901c4c8K59m1tVqet8D895QU/I4T7G3Y0Fwq0VLMpBlTRVQFEwh9A== 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=PAjefWpSeBqnG5aTcMsTiTwDmQxASOpesprok6klWIpNGWjNDawURDXwW+nEi1k/+msgDJGt5r6HL9PBMdf+JVKHFvN4c5isQUZLlmigTUIDpWptpST5pDPfAhx7Pbbd4rAK1TvxorX4oDuEzryCS2QVLhZJJ5dbZ1YWDFF+coZYqkwcDdrfMKlH/+vdW9f5XTOpF6uLHGJmoA9f2Q/bHjAclNKmf0XGpvC+lTxtXg0L2ovy4oNTWUSEKdwzkj69MNHO/lUNaH/s2g8Hp4O7qdauN5U4yOLqMALvc5zDY7IB0VzrSXEK6hyyuD733jl2EZrDudu+rjzMzE5qDsmQ+Q== 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=gSgEqhRaWj0LyAN8MEPn9OiyqQrYDUQAS3jdOG6a+bLcD8bG4h26gOxUuVa0wrpygv2N8xENWomITBpV9/F2mJlRLVrctNd4EVI9kzcSbVHDbJ27Gkz0P0btW3NFcbix3BkoOgi5xKgzCVII63TJIGDdZQ5uK83uOlgMlxRRsFA= 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 SJ0PR13MB5965.namprd13.prod.outlook.com (2603:10b6:a03:43d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Thu, 26 Oct 2023 06:44:16 +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; Thu, 26 Oct 2023 06:44:16 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH v3 17/25] drivers: move device module to common library Date: Thu, 26 Oct 2023 14:43:16 +0800 Message-Id: <20231026064324.177531-18-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231026064324.177531-1-chaoyong.he@corigine.com> References: <20231024022849.3092506-1-chaoyong.he@corigine.com> <20231026064324.177531-1-chaoyong.he@corigine.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: BYAPR07CA0034.namprd07.prod.outlook.com (2603:10b6:a02:bc::47) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SJ0PR13MB5965:EE_ X-MS-Office365-Filtering-Correlation-Id: 1fb0a92c-104d-4cfc-1e9b-08dbd5eef942 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PS9xnLmRjWiaT6NbQiyDxv3LUdnrMWW9wRp+c3SE/8L5++d7N++myIx38Qe1b5S1nq+Fb1djEipPPJdW8wN+UX/npmI9QXxAhyO5NHyqUQjSDlG7VgrgBcenV2hQj7WvBluzulE9vyWf1Yy8by8oQIMhRX9cUVM2brWa+hagh8UMKcHAJsSBH1hJDUoEPbd7otKjT7EpQ0s9ccN5bcylU9ifIrXAcm3vy8oL/jOLQ2hYMJdSlqO9shQkKeyCWoepNhajB09LIATiOZWZeEm2TCRPDKWwKuQHBg1kLvltFS2hOKxzmEtAP/QzFql4XvjyVv3tJHoCNJ6Y7BuPnRmxFyS6zl/NGiufnrXN8SYmKcPIQ1FXrw/nQo7hlbCsbYtQ2GOj4yN7LFLZMQRjtcuNL6ve/2jJ5c1c5ceW97FgXey/Bs5E2PCUqqYJgkRb1h8uxK6sA0x10wUSoVJgOQS25dr4AtzbQ2e65nNELAYXHuhcE/O6qS+OUoj8CL4jatVlYqzi37VNXIgKRYLH55xjZrucq5u/MSd6ZNp3Ym4VSxv3le9DGDwJO6n6i9Ha5Kda5Wkb1Iq3pLuS77UZuR0b9cjX9rrRG8X3U904y2ybJgJHOcwm4UhW8TgRFcGHXflY9CVxP257QkUVDk0CkQKD9iZo4f884t+qYFYKglMU/Ec= 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)(346002)(136003)(366004)(376002)(39840400004)(396003)(230922051799003)(64100799003)(186009)(1800799009)(451199024)(6512007)(478600001)(6506007)(52116002)(2616005)(8676002)(83380400001)(107886003)(41300700001)(26005)(1076003)(6486002)(5660300002)(44832011)(6916009)(316002)(66556008)(54906003)(66476007)(66946007)(2906002)(4326008)(8936002)(38350700005)(38100700002)(86362001)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?PE5kOYjsuuRWcvA+GlaCYVuyFAceZPeD0Aat+POsjrAW/1REC5z3yi5jXdfI?= =?us-ascii?Q?UZ1xQxGkjYRSSEwkLQlHjQ9cyiEQKzDWCGu2jlOgAq+rOKrEQ67mZbIRCYwS?= =?us-ascii?Q?mUhhl56fMw/FUkX2V/TxXCU6oT4fXMhEq/6NF6QCkp+/P/bbYSquvPOaraFw?= =?us-ascii?Q?BtlR6MzhRhtDctTuy4PdrXNCO5P6Gp4mtH0ocvz/hptQElRhGwU5zNlJOH9z?= =?us-ascii?Q?QF01f4rTbiUTRXzP1bC9Q3vWXKbfA+9wuU6OAgxBbievSqI4TcqstHVxNPNQ?= =?us-ascii?Q?YIEMjyLXetf7FOR9QQrOkkvTPUY/EdoHCWY8Cm3wVJ9GYyrLamdna7/qL6Nn?= =?us-ascii?Q?O6eNOqh39e/KgjM0qZ+xo7zDixNr0GGNnCMbpaqnq/HtP5laxAICk6EWsa17?= =?us-ascii?Q?wxPMej3mL1824XAP71lJXQFNnKo/tMuzJWbcvXyBBkW7YNUEYL/Tzam0QAtS?= =?us-ascii?Q?ZzgbeqxG3eFI5bRKC5G+k43AQdD0x9g5PRLfUwbWX9MTKenRsUFyF+VE2rin?= =?us-ascii?Q?3VcgVhNWnSt6Bvi9zW1XmgDC9v/p8WjmLxLpCKOSmC9CCUYSErLWPFEpaDo0?= =?us-ascii?Q?bwHArT/t5oAAdb6yW2/xTHVC7rGB0/DcwUc4/5tVBjaydSSaWO6abzEc+rsY?= =?us-ascii?Q?LAT0J3PVuFf0D9+lVSd3/14L1Mkly6249YqZmS9gk2es4ih6mMqOr49edO0/?= =?us-ascii?Q?yOKEa+E3S0UV+wYBVVWkEshc4Ygy5aJW7SubltuWtMoDoDLCbh4QT5ZQaXMz?= =?us-ascii?Q?zDQyXm494KyarxaM9QHwrDKOtVrO1/lpNZgkiAzsD2sAWuglmt/6kDbWXLAH?= =?us-ascii?Q?qS/VEqPjlGzL5DmdSvC5QLUnaJBKvSkZqAc6S4pceEH3kq7+n/DX40ZmyjB8?= =?us-ascii?Q?xNj37VqxIYf59cuqc8fZqvBsTHyRhrrw3e4Og6k5MOmiJYwsM11vc4SB+GRr?= =?us-ascii?Q?Om3rFUna+DU+1CRTnYgbfXr+DRhD7v6MqYnV4ThrQvbKJqeLUwK0uR38YSkg?= =?us-ascii?Q?Azdl40OkW5AtQVYVzMip4PHKoURByT8H+QJHs3xlVSFFucLnpL4QkdcCFuV/?= =?us-ascii?Q?UMamiRJDJ2gdacDBTA1Eqj6+0pgzrmPIgLgC0jPvXJ4o988PXmaOxdAH/ZbK?= =?us-ascii?Q?mfixqphFZBE9/K7ljXYXjgX2HMLE8+IC9+016KPf5gLetMq3sVWWq1xN0UQT?= =?us-ascii?Q?S14lQ8HpI+CgTZ6tO8E74xlq+0JcnIE6OYvmO+vK1eC7aOZDm8v7hzJX6AEE?= =?us-ascii?Q?F8+MmC4EGN19pvcMCYtfTFPMlxUorJcqn7EAMJO4YZ3UNZtDThAS3VCJRYp9?= =?us-ascii?Q?7ww8aFPghF9cjhS8nJycd88v7ZZbqOapLrrRLCnu8aIoPhMWVRkUFJ13uaow?= =?us-ascii?Q?27ydhM00UbEIKprrV2fRajxvXu4zrKVAdj7oDobUXf7u2H7vRSeG3CIOP9mW?= =?us-ascii?Q?sR7qdY/32DMa+tO1m01tsIQZYbBB3F8d9pcZnB0OsiBBtBYQQzWsNakwLVEJ?= =?us-ascii?Q?kIeIxokcxMIrHdIhftgWFjSYM+Nb0nL+psyeu/9m1dYAyJWiekdPX5gQWYfG?= =?us-ascii?Q?lymVTCYHKvuJbfB4Wh3AZ4rBB7QaFkTWj/d7/FQ8Slj/79V0cNTTIXJDKcMw?= =?us-ascii?Q?7w=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1fb0a92c-104d-4cfc-1e9b-08dbd5eef942 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2023 06:44:16.6622 (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: 9+egcJfv3Y6KaF+cg2+SyeJuE9fKcKQi4m2o1Ob2o5jqkp/DguhI2aAc56oN9Da18P1NjQJMnJBMJ6oTTQiEbhS1vW9UcOzQRJ1JwrjgBhk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR13MB5965 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