From patchwork Tue Oct 17 05:45:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 132692 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 C398543186; Tue, 17 Oct 2023 07:46:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E218340E5E; Tue, 17 Oct 2023 07:46:12 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2115.outbound.protection.outlook.com [40.107.94.115]) by mails.dpdk.org (Postfix) with ESMTP id DF3E540A7F for ; Tue, 17 Oct 2023 07:46:10 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YbyxsWhbhwJE9lXVL9CukfAk1VEpGrTHI1miBXW/xN+WaxkuL9xXf80nkVkfAeLRKFNIShmqnwXRbAdOiAaelJzDVY+GetOukr4v0VGb+bWxzag78CDRottdRGjOjdN7FnRtbD+eaqIQPukUat2b/Kk3XWjR+ZMWdMNS14cSjee6735Dm6egmxHoF5aeJN4HpTwqi30s4N/wVX8X/zXKXrwlOYuATmbSjpM5ll3kuLa/hS6OVpq4cvonFxP/l8lQeWWHNyzv6X9T6PDdahh/mtV74+FghVRo+mJubndddeX0sOeZriH9XYErE1ALGQz+XvJ5RIpxk9dAb7L1Zgd/yw== 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=1c5Wjtn2y4rsZ1S5MGhMj4i/iES/a1veJobXvPzui6c=; b=T+OvoAFXDu1dnV0gaTYM9ZPsmW30mfL5xpSQzml1f4ByzwH2lrzqOtWQUPT4jOygYFd/6Sz5X3rZMrKxyM8YMUr0DLuqnZC5RIMYOm/wWJhRBsYNR3qvLE/qXhH3DDnYX3vIz0Oa2Enb/S3PZntoXs74lyUy87gdfJ4yHcl49ASP1tu+DDuP8L8Nmw4eUUeXKBBCw2LVjWab1I/d6OE2/FfFSJQvHDcLXyfwCYaXAXn72Dr1aAgQJjrnTdjxdCnbxcztf2DJNUI3ctEHVguNBtT4+T9z7SrKlWogEB5oLelVNzRrJCndhHTZR+HgRB7TdJHUvGe2ZYu8//4RsB2sIA== 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=1c5Wjtn2y4rsZ1S5MGhMj4i/iES/a1veJobXvPzui6c=; b=e1asr8wvwi55kDB/va9Jr4mllrHskW3xbtrRQtKhi0+wA2F4Kw4bpBDipg1d7V7hB2pUb9lwsIXorD1hJ1bQ0dMf4V/0qWzSsawZbTxTldtXzqrnIFkvgnXcE+Fcr/vJjdbtY5Q+m7M6G71z4wTeV8XhnitL3Htu+WfklfcOMmQ= 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 SJ0PR13MB5272.namprd13.prod.outlook.com (2603:10b6:a03:3e3::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.46; Tue, 17 Oct 2023 05:46:08 +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:46:08 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Shujing Dong , Long Wu , Peng Zhang Subject: [PATCH 02/25] net/nfp: make VF PMD using of NFP common module Date: Tue, 17 Oct 2023 13:45:22 +0800 Message-Id: <20231017054545.1692509-3-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_|SJ0PR13MB5272:EE_ X-MS-Office365-Filtering-Correlation-Id: 6eae6df7-0b60-4a94-ff46-08dbced45ca1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kG4V6jExIL+wZ4XTnIORsNCdIPeU/EyovMhTeoZUF3lDMtV82UaNJ9aeyYDDqk0XPZyMmRRY1M1lejFrpLfCt3nahJ3vlo1ZKzSJmmP54nwZU5xwM+fCLahpFsOF90h1PMFfF4OGD45ODKYHX5fcCObrVdwZesDLTB9lHBRhp7O2S3cDZZX+iuhvCcP3FI3msAqP5SYc4JCR1yst4BKpfKOjlNOHMkKks09JWtd7UZzCUFBVh+biIS+Oklb5UX2sm4tcWGTC511blQm9oiauZ3JiEGC8TjGtNxrmrTiRiivlSrmNV+DYwtaGBfRgS1bzb3ZSQsww6RQpeDMAuZWazUAZp+S30/MbaTu2TUa9RcUyGWnBrlFwfsMqmpb/MfmUl39MLcU4odrojrsuDVWweSTWNA+4DZNXSXKNsnVw8G1Xh2r2HISOgf7x7KocTZOQ9vExSx4EzSgNmQ/RYXLq6T+vzDfD4TQJwGiNDpPu1rolpPCSfli4PUo1gjUsj29I7BqxRctdICsxuXBOXGWlHWClq1pL2qZ4t0Fj+pUmQx/Z2AKsqfq7jTolss3TSiifJI/10lbfuFxAaWvUj63dvS58sNJxyQwtxtCpP3AospAjr/PrFgJu0a0YUDQw63h6ofwsw7BOOd27zvqjoKmpi0lJ9l742ZQKZ1i73dxyW6M= 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)(366004)(136003)(376002)(346002)(396003)(39830400003)(230922051799003)(451199024)(64100799003)(1800799009)(186009)(38350700005)(6916009)(66476007)(6666004)(66556008)(66946007)(6486002)(86362001)(54906003)(2616005)(83380400001)(478600001)(6512007)(38100700002)(316002)(1076003)(52116002)(26005)(107886003)(5660300002)(6506007)(2906002)(4326008)(8676002)(36756003)(44832011)(41300700001)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XPzwGj0T4V797CmTsRo3GEcvYZvxz3myB4USOVOMqql9QOX2vJ3HnzdzjovxgZcb3w+rrsH9zjcIsHsMbg13F53jKtcIoQWX21BRSKFA2Vr+xIuQ2w44uaZDk/2mZIJLK9D9h7In4J36hJ7TE7SqALtZb/ioJ6+c0BrD/kGyhLqTlD97XGG9d+RJF/3vxSAffKzgAgha4KIsJn/IyVxblNmxXSHNEuBr5l6Pj/h4+9h+ipExhjQJoLFwpwT515LZCqf6ZaxIdNaVTb7jJA5XuRJsW2VC3ruRPdtdZl+pCMl0i0aNHVZr6YymLugXOSPfd7bZQ7GBoZ7uyhKsRLUgllM8MLcQ6FufcMvcMSNUTVATuzIUUnBozDJPIcXm6p3fSFFS+LRdsjDVK9ZQpdvRU48iLICp/ejPpEudXHoT4Vj14lrR3eXuFyKId2vHI3/XFxfOczYSyPRoCi+pzue7fv0HWRLhbhfbIbv5waJ/ivWBTt2jQQqXo7O3VUzupEGbbgWz8ce9FTrJLIrgV/4HRgQZtGf47Ydriax9kEe+dJANBNftz99zRcj0EZ2V25WYvzpbh9q35leNCP4y0wQZO+aR3bqmcNu5pmUAAHyo2Vt93KIqFJ2QYD+3J7QdR3ZC7qojJJ3h00Fs0M/IAV/vn9j9xwonFCs3NGGyh4hLQ0JbpWvqE4LgbEIgrRQlKsaNrIbe1I8F2cNlBlZG2ZhPCoN1QgSYvJ/QpbQdtmNSegUtw3RP4bDEL7l3sxQ96oaVaTpHZ6m95EleKLA4H6ikzmCcAF3TOZJBieT96W/BsqjKDzYd5XyW1gbKe2gpQLHaZj+1TKo6PaVaMLZDsBcPFj7x+acRT17Iw9+ebPvh6w5X5RQzNLigHM4Yk81Hrfo1jtwMRLvHGYxH6ePmKgU0MUcHerLrYMi9eAJxWmSO1sIdBpKVjTPx6j7ek3nPktiOAGuZagLOm/mzQhSiSlvkqYnJxHDGcwo1zmCdzk06uHLqJdtk1pHo7kDSBe0wBM8W3fBryBD/tnrLHfZR5P0eFJY9ynjuAzXbhU3G/sjSzvA1c5PIIoTcR/fHkcTldwWSGH17s1rw10VW9lHOJ4x2jHB/Tplm4RfNbE+xWEsiC1EWwDnjKBE4ggc01ji79/ICUm2C8zhwyFHAVaHVRjPhv9Ftyzfdu+dFKeq0wGdMmjtqs777PJVIXjyFlajssiBcJBSttkoUSwKBCJSzWmL+Nn9CbyLVLaH1I3s1DWk9BiajY8CzB1bH6UFmBorkv3Pp6z+TUbMh24UFx9OgGCNFtqB1j39G89qBbWTDYlKkyDQ4UumQo4SHivY+jUFBpQkO8Vt12coY+fe9QFpsF/V+Nciyscdby9JN85JRE58Wk8D47JDugZovoj7eQ2PWEbKQRtjl99vL3e3AzSTucZ3az6KFNda355yoqV3FcQrz6jYoKmCBp7tECgn0pQ+Zq7FrhlNp5mi6cBZlJRTzvyIyocZC5kIdOGRu1iGu6Q20gH+5cnwed0/28mzVtqnf3QEAPQ2oqW8e8LF8LFXFx2yVrTfNevYOSX3Fn0hZ08odopYfZxvqkkwDpo98xA1/3TxHmB9DA8Vz+bCgcO0tegZbcg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6eae6df7-0b60-4a94-ff46-08dbced45ca1 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:46:08.8623 (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: v/UhOKgdDaKh/erWCNtx4RFIurjSQwl6DKTOnaAw0baKD2YpphPXf0GgTsTjzAuwGn/05j2GavkDZErljAg0De0Q3wnuMUIvNcA4YPOymT0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR13MB5272 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 Modify the logic of NFP VF PMD, make it using of the NFP common module and link into the 'nfp_drivers_list'. Signed-off-by: Chaoyong He Signed-off-by: Shujing Dong Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/meson.build | 6 +++++- drivers/net/nfp/nfp_ethdev_vf.c | 14 ++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build index 40e9ef8524..f8581403fa 100644 --- a/drivers/net/nfp/meson.build +++ b/drivers/net/nfp/meson.build @@ -40,4 +40,8 @@ sources = files( 'nfp_rxtx.c', ) -deps += ['hash', 'security'] +deps += ['hash', 'security', 'common_nfp'] + +if not dpdk_conf.has('RTE_COMMON_NFP') + error('Missing internal dependency "common/nfp"') +endif diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c index 3db35b90e8..b9d7a7c5c0 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -6,6 +6,7 @@ */ #include +#include #include "nfd3/nfp_nfd3.h" #include "nfdk/nfp_nfdk.h" @@ -399,8 +400,7 @@ nfp_vf_pci_uninit(struct rte_eth_dev *eth_dev) } static int -nfp_vf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, - struct rte_pci_device *pci_dev) +nfp_vf_pci_probe(struct rte_pci_device *pci_dev) { return rte_eth_dev_pci_generic_probe(pci_dev, sizeof(struct nfp_net_adapter), nfp_netvf_init); @@ -412,13 +412,19 @@ nfp_vf_pci_remove(struct rte_pci_device *pci_dev) return rte_eth_dev_pci_generic_remove(pci_dev, nfp_vf_pci_uninit); } -static struct rte_pci_driver rte_nfp_net_vf_pmd = { +static struct nfp_class_driver rte_nfp_net_vf_pmd = { + .drv_class = NFP_CLASS_ETH, + .name = RTE_STR(net_nfp_vf), .id_table = pci_id_nfp_vf_net_map, .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC, .probe = nfp_vf_pci_probe, .remove = nfp_vf_pci_remove, }; -RTE_PMD_REGISTER_PCI(net_nfp_vf, rte_nfp_net_vf_pmd); +RTE_INIT(rte_nfp_vf_pmd_init) +{ + nfp_class_driver_register(&rte_nfp_net_vf_pmd); +} + RTE_PMD_REGISTER_PCI_TABLE(net_nfp_vf, pci_id_nfp_vf_net_map); RTE_PMD_REGISTER_KMOD_DEP(net_nfp_vf, "* igb_uio | uio_pci_generic | vfio");