From patchwork Tue Oct 17 05:45:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 132707 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 41B0743186; Tue, 17 Oct 2023 07:48:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 11475427E4; Tue, 17 Oct 2023 07:47:06 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2128.outbound.protection.outlook.com [40.107.244.128]) by mails.dpdk.org (Postfix) with ESMTP id C863C40ED0 for ; Tue, 17 Oct 2023 07:47:04 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OT5JwWr2sQ1LuM+o9Bj3g3ZmdZkqEFSCrWQdDA3x3Lrzrt20WATdyqtP57Vu56QftkQgN/ocyU002ow43v4nw7Qu9hDcsLzGrwgX/+X8DR9dxBwNiCXr4OOHRw/9M3H0o7/Qc2ts9M56OtALrgmeUdh8KL45ZB529IlQ5c/uW7nyp7BnkmYF0QuUpnveUidUE98pZn9exBv8L81SAzqDTm95faN3WfJbn9ZGfV+HoqyV63pCgnO2aYL1YAQ5nA+lBAAJcQtma0/x/0GVgD/UUK3Y7JMfTB6hftZEH+iTjM2U1FFzapqXCoeiJy7V8pSui7G2B9DVezAnixAP/vBQ0g== 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=RDKwXiKYo+QpxPiCBKln/AamTH1IGgMId8wJU6tHiFU=; b=dvnI9qMEJYhC0k5kiRXQSdlGIECo1h8NB/JZYRZgH0y5hNqYJ3vPwOY6ELU6vMzONG/AqRHjLKyqZUmRkXEWmfUy1FFYG2k0YjmRrz6ATvXoKl5E/0NEsCAy5gaJexmXCOv8w7qrcnJhIITYulTUr01U76nVMyqFsXmFGxY0qw0XxMmcxT80GV29aiYV3xqWcJCtFXjPaOB/0X/dRxc/meNWIRKp1eo2mCResoraFyF2uOsIJHO4MeRtsZsQDSWjyItF/W6kEqJAsLmwQLsUJAOXEOHpwIL7nS2JxaSAPHQnXYDpogmE8U/kRc5Lo6JdrfIgxO3CGUwsXQDCkVyYZA== 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=RDKwXiKYo+QpxPiCBKln/AamTH1IGgMId8wJU6tHiFU=; b=TbVQz+HsNV6BNII7WazBhU+gyZWazu5H+CQyll7HpC0vKAOW6zLZdyZQRXLU/2HsaWIk0b7EXUsV3UI4c5XP4Kwpisir0FbebnaK6HKj6T7huP1FBXs0CZPB13LZS//ebRf5OA5vEeycc76V8NXnq5vfgTZn+UspsT1LG/kHGMo= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from PH0PR13MB5568.namprd13.prod.outlook.com (2603:10b6:510:12b::16) by MW5PR13MB5904.namprd13.prod.outlook.com (2603:10b6:303:1ce::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.45; Tue, 17 Oct 2023 05:47:03 +0000 Received: from PH0PR13MB5568.namprd13.prod.outlook.com ([fe80::b070:92e1:931e:fee7]) by PH0PR13MB5568.namprd13.prod.outlook.com ([fe80::b070:92e1:931e:fee7%4]) with mapi id 15.20.6863.047; Tue, 17 Oct 2023 05:47:03 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH 17/25] drivers: move device module to common library Date: Tue, 17 Oct 2023 13:45:37 +0800 Message-Id: <20231017054545.1692509-18-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231017054545.1692509-1-chaoyong.he@corigine.com> References: <20231017054545.1692509-1-chaoyong.he@corigine.com> X-ClientProxiedBy: PH7PR17CA0069.namprd17.prod.outlook.com (2603:10b6:510:325::29) To PH0PR13MB5568.namprd13.prod.outlook.com (2603:10b6:510:12b::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR13MB5568:EE_|MW5PR13MB5904:EE_ X-MS-Office365-Filtering-Correlation-Id: 19e618b5-4088-4fef-ffc7-08dbced47cd4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jcjOyZYIkD3gTglDdk8hKZpNRxLg4smUCxCyYGWD7Z8GG+uIlyeZ/wclTvM9q889wL7SokfMHV2VYAGvFvO/9JoAj0+KUG/OG7xV5kLk/RlTTrKMV+41AMvzwegO4TR6Xp6kL2h/EKaWSixZPBwUE89hbpuZAk86p3mwAqNJmLQE5GX4fIeve7AhUOTFExCC+Y4D4sTzimYGDAKQMRO99ZBeG8htgJPLrO+ITAOBQJCU1bXR7Nz0JOPZuKspwdziA6UaNNz2wHB/r+2VIEDX7Zm0/PBjpmnZzlMaELQHnyXYSW/6LtgX073WrDAdIHUr7f/DUPNJFXmX+SClZC3cC65dJqBtMBwXOosIWAzohSY8wNWepAPwVIaZpLSmi+tNxbY6LlYkhfEgaPq7aKbdFspX/aDrXy4sORXr7qjWRus4XvCaSxTxS/YxKnMx2cMLNHPCIk7zbdp2rMCrKKfvIRQtWIaI6r1iPV1kHblw4NT/Kl+41F8ZdgmtbVaLK4+qE3A4upeswDq1uTlOu9jXeZ3INh+/W89yl6YGGxhhEHdvvjzz0SnZhcY59M4RJcjt4G2S4kamnrUZNbyKQRWPiUmMBDSJZt7af2q/BM/JzBxKDEV/SvKX9QNXQjkc/ksly5yGKSMWBEHH0T1ZNFdO8JZ+Az9dd1i4orG1fr+uI18= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR13MB5568.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(136003)(366004)(376002)(39830400003)(346002)(396003)(230922051799003)(186009)(1800799009)(451199024)(64100799003)(2906002)(5660300002)(8936002)(8676002)(83380400001)(66556008)(66476007)(6916009)(316002)(66946007)(54906003)(41300700001)(478600001)(4326008)(6486002)(44832011)(6666004)(6512007)(6506007)(107886003)(38350700005)(2616005)(1076003)(26005)(36756003)(38100700002)(52116002)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kE2mu3lmLhbfj7LVwuLSOMyWOrfNZGCB+DlIOJ7e0E1olVd+94LwMOjJ8W1LmHHgQV8/koYZkdzf0ncp8Oo5uiJ/afoy6c5bXwfAPzly5MRhwrl91oYqzfKLTCXLmEygeDgBcduk/kBE+gpSrBS7y6uija+EpgUNTFRqSTeWmXw1sDcaaBWVJHDpOmXerYxCNbDCeEWMyQ6b02BV1y/e6oKA8Yt5zAmTgwqI4CAGjkBg8hZ8qgJbaOiE0CkUaOcx9N4RJ278k3DN9CZoihta6jq7v3Cdv4ZUGMsYG/qQ3DJNzyV9jkPBlfd0Jux1nWW6LKhLXVPci3KdmTl+GPIXDjKg8E0J95A9WGYtCgRQjTsQqf1sF/HEufxqXhDgS7DIMbvaeo65MPBFg6j0vvzz5INMnMdcVxNlElzZ8AmNvwFdM2FxSmsBDBx5bt5J1TVz0G1BCProtDWCYDroNBSegcEImpnisIqvPa2XZJ5xZo4G3gqBgiz3pI9LfwMkAMuFhuHxCS966shDLj07D4BDjE142UU1q9j0Xl22e4cwf5TpOtP2xojf4YV5lQJipASi6RuoCozYQyc+S+Ae0JuzRLOnELKQviN6Wp08a7cP5kmPW3NPz0mqI7yLYFrNj9GLQqSK+0+o3F547QrPqJvAO5WKvyrDYbmBwYKiRq0U5b1Fw9ytUzW8xLWeIsDgiOorrqcPIPrxdW8nlufyduGka7MtICtiy7ZWDg1T30MdWiMswFZlTw/FLWEo6xm95tKr8XSJo72WJ6gt2kHY7Csz5DGTlnAoLogiaLzvHUgI4ADtTwkSXns4Ihs48wUENT52IE+Nc/q82nxXIZzP1Dp412kv4yrkeU0xjdWfJL6m0ZcArb12wr7+EjiNhIklplW6GB094wsONO+nQW1WJaOJ5sRGq5g1P134k2W3McjD80daubecDSKzFt0jXxO2tBV6eSLNrisNBLCTkHDuDZXj/Yw9E0A5UBQaoxTP2jx3C5VjFtjFP6+oQbjgo+zF3/pM7C25t5Kl9LUALyac9uZoeFyY3n+PkY0toTddzzRg06xXPH1XrxPfHx/Mqp1AciP8e5b7uI05yU6tDInTQoTYTT4zQs5BfAQEp3wyHzo0q83TVvx14NEkXdQV6AG2Q5yhL3LHF+8d6+EIImL5CldRoCMWXAEz+iM/nisasc1JPVa6WawCOMJNly2xu7lZ7UPHkNjjP7q5oCfN7MXdCMXPbLEtKzPpW99uRppUE2KTqfcNGwaPm7RGQOwoD//kc08S581YlGWVR5I+FnkLDYM5WRtf8OhVPLGmtSVZRfyFwdInz2Nkxb13MDqmQLcYwvGN9hx4x+8roXWrQvd8quaCYDGUceLCqDfC3m547waRiFSRPUe+qcGl6d7hD55Xuxno+lGq8k1uXajszDT42K7irXfflYcRiPZtcYNNvrUw81s5GS610NcxptaDdkoeXBvZZ3bPqBtY2VKRHQQmjcyXqrll2EJe2UtE1p11b+sH91X8jy0n/5U4/zW9Fvt2ed/qKhoY6NOzET4TqNdMn04Iz6pNb0VbDu0oGNASqkZM56r+pLM5KQBYq+/QUK+pkIoNtlJwc1HIim8eGSLzz3HVsg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 19e618b5-4088-4fef-ffc7-08dbced47cd4 X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB5568.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2023 05:47:03.1021 (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: u+jlLEOE/hDJnZG7eKRrnd/08esaMYgyevD8dGUItRc6u1P86DBb/f4cTeNvZdDB6F1PF7apJpsqzbPhffFUgfxQ9llmvdgLw+9+SJWiS9g= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR13MB5904 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 55ef81701f..cedd34974e 100644 --- a/drivers/common/nfp/version.map +++ b/drivers/common/nfp/version.map @@ -9,6 +9,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 0ded35a874..aae20d1d6f 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);