From patchwork Fri Oct 27 02:59:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133445 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 BCD1F4320F; Fri, 27 Oct 2023 05:00:44 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5859E41104; Fri, 27 Oct 2023 05:00:32 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2103.outbound.protection.outlook.com [40.107.243.103]) by mails.dpdk.org (Postfix) with ESMTP id 84CCB40E54 for ; Fri, 27 Oct 2023 05:00:30 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d30EjaYxg/lRZERi+1ug0V6n1/ErOvImYTAheLnHDrvlPiKQn4rwrfLY4ejVMRsk58r2q0DRlRpFzbQuqC2O7gnMS4xxRTVC3jhCdWhXbjY30CV2le2VqmHeTzosH2cznKBShb84Pkgoh43ZDZTRM6DOYB79HESgG1x6oI84opsViTreWjwxSupwizn13Be9cNBe2Ck41o6vrA2VXF3YUb6WlMXTZS/+LhfaYg4f/aqUR1WZviQB0nPFlqo8vqqQls3bN6PtFQQegCuNg080TJUgdik53xx2zhpEJA5aBGnhDDt/wOj/3y4VMHNpVpYCJBXq7ibcg9JSp4EskuJKBA== 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=saXq7zV6M0EuBG3CtFQd6JNiqoncBLswsLsHO1l9sxU=; b=hpMfOfBOwkPRkCMNJyQzWKYEq4DLvR/Bn86sxNhG0/pgfjtje3Huw2cGnCrioy+25kr6wb4Khnn3YtFnRbB+UQMp766ppXwZxJLlpNZjt0Pvbk+L8ficRtXXSYUAQU00iP7fyMsMHvEzQpLxP7GHPsmsI7XTvxWqMQuYOwYXhn/O2sxB806ucVvmIToQjMq19Iq+tCnf9+D7pzN1TZ+UkRfIGRSFKd121JlZFKWjQLjxvXRI3OgYKaqnU4Edg3BiKj/5K9QHPSsRYvEv9iQ8cs/yEjTyLGPphx1iSq3BSmNaBHnWQTA+7QSRpsVvogies80er0D4L5q9ft/crcxgPw== 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=saXq7zV6M0EuBG3CtFQd6JNiqoncBLswsLsHO1l9sxU=; b=qrQgB+5RMDuql+7c8Y8cLbH7WIqbWeEkYnQa2O9zP5pCnDPB67dyPqA4wiVLIH6A/QjlasclPP0SA6u5S0EV4CjAllc0OldWnECPiIxAmArGO15nlK3cJqJ7+zAiWOTT+6SKBYDbo9sVofc7uIYok9iZApoIfy6NBj1Y3D1APwk= 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 SA0PR13MB4048.namprd13.prod.outlook.com (2603:10b6:806:97::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.24; Fri, 27 Oct 2023 03:00:28 +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:28 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Shujing Dong , Long Wu , Peng Zhang Subject: [PATCH v4 02/24] net/nfp: make VF PMD use NFP common driver Date: Fri, 27 Oct 2023 10:59:39 +0800 Message-Id: <20231027030001.602639-3-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> 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_|SA0PR13MB4048:EE_ X-MS-Office365-Filtering-Correlation-Id: 456a6dd7-94b6-42cc-8247-08dbd698df70 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NgY+WetbOjiaVUfxB4LCU2JxbzVEsLvrF1T69cVPZEcvLHNavhw9OF4vkr2A32j5+lE4KPUfiX5+8/00TMZNkEEQCU3pp31cGiaER1I0fJnZoPqwufcZIC+0ADtoY7xgSE/WZCY46YnbCkZ+Wl2NHukofJYOqdtDB+fAP6+xClb7MCujYjqS4SdDCNNszdMapYS2O1l4kk654Hc657Uya8tRX7tfp8u2LWttJfj6nbP3pTkFSOWre73ZQbORyfyrXCymTZB5vBPJZwIU9evDDgsPJeuCkJJ3T/+kTGHx8nAX+ggjnd70FqdoWSBgVuXJGdpuiO/zIFO52+38ZC3tMDXogWWx9L3BT/SyDW4vdgvM9MfHcpPy04dk4C+8cRFx4hKLHVzDKKVcZPbDza8NuzJdriY1OcxomHbhHGuY+ngDNApcE8rdhE7e5qv0T4iY0BIq1sdEFjFxRoN/jsdz5ZW+4kUKdZOAvVKcm/Ub6X09HzfwzWVVyvRd1a33Ttt8ycN8zZXhFvesueVTwV5ZjebAVy1OviaiMheYwGh+rL/bjkgF/cDGW9/PoYxVjqWSzRQAd7vk3Bt2ZexNapPBvkkTScuEaGZo8F3Sm49rUzBK02dIX97hzT4kKsn2kESGv5dO1vL1TluMV2tZFbs48g== 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)(376002)(396003)(39840400004)(366004)(346002)(136003)(230922051799003)(64100799003)(186009)(1800799009)(451199024)(6512007)(6666004)(52116002)(6506007)(6486002)(86362001)(36756003)(478600001)(38100700002)(2906002)(6916009)(41300700001)(83380400001)(1076003)(107886003)(26005)(2616005)(38350700005)(66946007)(316002)(66556008)(66476007)(4326008)(8936002)(8676002)(44832011)(5660300002)(54906003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Lb+89ULUn/5ZVlRNBS4tQSmdCS0PKtkYHj27zA/FgnNQPNrAxyRKTdcJL/A2jEkuXXG/34If1z5/Jrt8rZr2OiVWLxzS6KOsHyN4hM+XyhbWS4iYXvKsCgOsD3grJ0FKr6Ddio9MhBoXFOMHdHa9faa8dDgLoApbfjPCbHApcP8zM/PdtBmUWhZHLU4H+mQ1/FifnKkAxvNUG+zdGK32PPp9FaHu+mAsSnRPM9Aczcr3/4jTitRZ1UMg8PhGSQeVouWbNhBv79HmoTfVm/5hFyiFYbj4o0AvZLcbrX2vNMAtcYdKFvDX1jVXsbp/A540tb+4KqPx7GeWqXfh/40/Noie9lBnlD/noTmCKLXHFTeSzuH2GYna5euYGi5KOJbnfw+teoSQTV4cTjX/rvVgzjPP8vzUbOxwB/gXYy9zrhWzMHEtHSyXrsroodPpUWWmV7VdQFxR6znfdj76tfMjNWUjWCKj2fGw2q3JKbte2j7MmtcXGCC+yj65Xh2969juyXWfqdufunVVSSW9ahOn8Z2uofkDJGl8AM0gxok1mgnWAILm8N36v+xR4MpERemEN+ksN7KGFpSIBty3S5BUxfwmO8PbIUEDAX6EYAY7xlMcx67VNkUHszQNiV4j+yRCAfO7yc/eeNzF/iG0h/ZvRoCaCycYiHf3Md4DbgpNk45YBfbiYnAF/+QDNxPTi3h5IT5Q3kgHkk2XRshR84MTzCGpNbuogJIMc0R6zQoW8mQIHCAR75LNBTlSp7CsB5RyTxHFyOXfusP7xFeRkyfM7V6aaESy4nhdy5ntmgY/Wfwmy70YFsVud3ZoIpFbKUVT0uchzl3gTToSdf3g8WswOp5Oq4ev7svgenBBOIxgwCYm55zltJBpViAMF24G4PXKzgZ+0NpVFolDOty8U+gPWJDyzsHxsMCeec6hG3/LwK0rZ+GxNaFprL9FvgeKj3/O8az0/ZkXEEsg5nCkwJ//ManFJGmvEXXKZ1g2DUMJ+yBEIH4qlx6Nfe1ec3V5Z6lHlm31Hoga2f0La7nPewbTd84C9mm/9YOcn9HhUwAVrDKowb/E/FRJSnV8sPJPUEmQ1WRq1CeMomwEQzRGFR2eNBzS4h3yWlQusKGfvJiLBQuSwNKP4o7/4i2WtwKz2Nq4nrI3UbOSJKp2icHyAvAJUk9KzR1dqWGPCf1Cmp/6ceaJ9VaPWk7ZsXXYOG4afX0R4YeH/bENiCH7Q/ntugoh5N7lLWyPsY1t8ZQffGrELOJHwR9g3PuuO9b3fy4k2OJfdmWJWaLBQbT3LLdi0I0olDXZi6Wes+nO+SO/Y5RDCz3q5QJ8hPj/bJN4EJBf1UureRdijUY9RuhLN5qrFugi62NFPiMcvDc9JkF+hESQ8Gq/Ay3NACRABaaw8k7WJIUgtJx0en7HZLNXg9zcVMAYzQWPHBRBYLBDtIYn2dO5biwDdFV7UeLDAJVF4USsu+4y48ie8/UY+nBk0d7g35ZXqdYRKglYZCRPKNeST1xQZexv0tayHnKodF32Mh+OYihkZmW5oDhAR6WYMLlNO6F/SiTz7bDWPCTgxt2YV5LnCCa2uv1d2JnHORDCKNkvwIId6Dom3pC0SMQSQikkxv/BUw== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 456a6dd7-94b6-42cc-8247-08dbd698df70 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:27.9580 (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: MWHyQLaspca2GeDEEQZGxhctmdJGlrTqI/El/lWnXLmeg4bW2LWMtTjgQUZcIuv2jvmFaAYTW1nCsiID2BdAAHangfKI+Q0N8PwBdoNehFA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR13MB4048 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 | 2 +- drivers/net/nfp/nfp_ethdev_vf.c | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build index 40e9ef8524..4702f1cdf4 100644 --- a/drivers/net/nfp/meson.build +++ b/drivers/net/nfp/meson.build @@ -40,4 +40,4 @@ sources = files( 'nfp_rxtx.c', ) -deps += ['hash', 'security'] +deps += ['hash', 'security', 'common_nfp'] 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");