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 E171B43204; Thu, 26 Oct 2023 08:44:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 059DE40A72; Thu, 26 Oct 2023 08:43:54 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2136.outbound.protection.outlook.com [40.107.244.136]) by mails.dpdk.org (Postfix) with ESMTP id CED92402CD for ; Thu, 26 Oct 2023 08:43:48 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TR19fFeWLo2cn6lXE4xytnrFJWZid0bCTfh2BCoCcaMwfALxhuzlkrDfNZQVipzbwpdCDCvl6asJmc57ZyyFCGXIlDfEFwMA3F+A3xvcESDTo9C8AWidVWstsWsAL3X0DBdztCb3En48oLOjQy61p0DR0+k1dnjx5QlfhHtcpXKUCwhaWHKmXqc5Mi3rLx3X/Sz2vJwbpeTrYr0lD0bWCiVdPxrKrfX3mRjlrKq7tFjYTFT6SH/RstusrgY6tTj8dXD5tZjtC2188ly07PDWmxTk1moP0Fkd+gDtDO/y8J4418KA6OISGP1c+/Lbe1D5CX8qUxCyutCYz+zFPOvGXA== 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=XKSk5yiD5C/9SmpTMb5li2g3EtGzMo/7yEoHH/l5Cu0a+SE2vzheoEgMm1corocim1XPTEA+HDZ+DLw+EPpJ3dNmnNmF5k5eHotYVj6hLMwEI3IeIk3f64sPcPBd+femrFDgpefdI3wKs1jrqgeO31mysWFg7Fqrud5xdYge6nAKndpRarAS8y+zFcgVnmoF8nQp0sPdXOqQPJLv5qM++wwHqPyhDWsyJnahfoJggFMS+rCbseKQw+4hJV53iQBRzsJZko7D8fSCKA2+HCWR3FLB7ZeV1eUtLtfuyEfUfkBOiZWtGdR6DRnYTDLqznGDjGNom8mqA1DuF3O+2nUYtQ== 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=GJARWMF0svEFR8F7er+8zZ6AGpGTa2UPTa9E0sAa/3U2zFr4/DGbjFkhkkl0abhe1QO6cESwADcoVxW3ZARbI8Ddi35ejtXSp1v4Uvoc2e/iortSWLxeNlGX5pnUmeP2alkmczeD44S3tK81MDvHJMtzIeJ3OWVNKYguTzb+9xQ= 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:43:47 +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:43:47 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Shujing Dong , Long Wu , Peng Zhang Subject: [PATCH v3 02/25] net/nfp: make VF PMD using of NFP common module Date: Thu, 26 Oct 2023 14:43:01 +0800 Message-Id: <20231026064324.177531-3-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: b0b170bc-7754-4743-6150-08dbd5eee7e8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NGy3SP7kNXTyTw0G5CkZjuz89KW+JcwdPOnBvBD904uslwMXR810jNC3Xg1i9XlENR8gw6ETcPOWa0dFa48DKZYZXhg4RU6Dq8AOJCx2D/ReVmlYzQtVVQh+421NV6UM3ORSqfSyxmxMRLZzimM+kJ7Ruy7kLS7+DD5fg4fWdwWQeak0FRf6G8YqrX/qUFM38a5SMcMPF2ruNcfoj+7pmP4uU2Pwl4lmKmBSloAaYg/lzQBsUwh1Qp78uqKpjdqejmE5XLxJuEJPbmbUKazkY84shoAGeKBG8CNzceygvyFafFJW+Wzo2aDPXJN51oWqhDw7B2b6Ox3j616HbBieHDbnP3yBKRc6A7bHnzoeoc1DW2nD26SjolSIZS2nN5mPw7wPSPRVmio8Ua+0MhB7YgZ42ftRObXqsayNmYq1amOrgZhLiS8uxzAtAA2MIaJqwLlly2/S5QSCDQfKad/e0J9ytw0OZtRr7w6DyecOkux9bPi0qDj8BNs8uuJnEo4Y6eHmeNwCNnfqxvkpoaG7X6XcioskNxjK7M4iaOI8FPt1s7MAE/abJFok3PSwzFIVSmz6T0W6atsel3QfsMtXKJ2MnMTAXn13U1z/JRDG8tCjNNdgO3e1EGrLTGa1EIiLC4tx56FBhv6ZO2zA7eNA9MPgO2Mgj6gTvvu1I6PLzxI= 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)(39830400003)(136003)(366004)(376002)(396003)(230922051799003)(64100799003)(186009)(1800799009)(451199024)(6512007)(478600001)(6506007)(52116002)(2616005)(8676002)(83380400001)(107886003)(41300700001)(26005)(1076003)(6486002)(5660300002)(6666004)(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?3UtN81yIOZAZkkRIPmQcAF3wkovIcvXjboX5+dosHoOGjQ2oDiByJ/SXV7b/?= =?us-ascii?Q?oP5hCFH7S6seDqOn+IN8HnGFqttRSMYE9e5vSM6AduNUtsnkpmt3kNMBJzVW?= =?us-ascii?Q?+sL1UHXZ2dz96AoTZL6pHnQgD4tOFZs+O94NOjxwLEo/OzqcFRmt3X0s0Raw?= =?us-ascii?Q?SBYBEKTCQCKebOSlHCfYyualS9s/0ytDmbMbna498xuMU6nsaox3mPBf51Vh?= =?us-ascii?Q?WQMd6dTPk5UIiVOrH+mSdrb+dKUGNWuNMw38xMhx917IGuZRVe1U3CIGGjTb?= =?us-ascii?Q?uT/ygLkfu+I8iNPXQPa66hxQWDqDKFs6zckY3psjczSLmCpR/uMgWhTqytj1?= =?us-ascii?Q?wkxkOjquqTwXix1GcuDPc4/eDvKVCgVONT4Kz2Odzbi/av3cVSWJrBSL8FFR?= =?us-ascii?Q?A/xoFelOsfWxCyJj17wajaOwccrD+WO13iXS+fY0Gj5/mwVMz7q2/XblsJsR?= =?us-ascii?Q?RkBZi1LdphAFkuExg1M6QakRsiXAYT+3h4sVBgnnibPSqaNZaRh+b87ugmYS?= =?us-ascii?Q?zFKXwGoFxsoY8+1Y+E0QRMcICyIn0yX62PD7vkDRU7rMnQacTelk8RKOL/7m?= =?us-ascii?Q?39cga5xfHpnIwN8DChrKku19QBSVTDOEOGy/dFiu4tKhkczV7f8GTGITAz2J?= =?us-ascii?Q?TcaWwdp1wd/mrIXa/pIu8GS86CaBdpuBBQd6Z4ih62Shjy1PoBPLie+w6exj?= =?us-ascii?Q?ZlblE+p1wD3SzWWMXyAyezmfebFEi2KYLT1egOLtqRhWXNG9HZ3J2kli252+?= =?us-ascii?Q?7AhpQYJvbmL9RYOw6RtdF33Um26cBZFV+VA5Z0yLBj5He0Rlcn/0m6EiX0wM?= =?us-ascii?Q?SbfqlFcrERa8iiuhKePFImy502OOoK0N9yjz+jFFQ4q/Gf0/VXe1uDpn7Tfh?= =?us-ascii?Q?/No0TzCrWY9l+/3ev3Xuo9ShJf2lc6oWf81cJVBh9BLCM0/4j5xwcWpsWu9a?= =?us-ascii?Q?LBRjexyW8jXAKzogMnyJwFW8Q01D07dJTXsVRJ+/52VAowXeaIPnChtrexWS?= =?us-ascii?Q?bWwsTOaqCuxzKZSiTRtVnD7ofUOiiF0XjJjkE6U3uNswpgWdgak9Tn0Rcbaz?= =?us-ascii?Q?h22nzcWZ04R2jruHU0YtESRluNtD00x+IQhQwFzOFhG87RgFaOl3A0h4uTR/?= =?us-ascii?Q?pKGdcO+UFAi8HB7Kc2L0qdNGV4HAVvX9EzK8FSukj/e3Kvw8HUfHliREjE3v?= =?us-ascii?Q?SJ9nlS462vK+ObtycDflsOcEepU7M1bmH0IDUIaCrxOAYLLi8jQ1RZIwZWXz?= =?us-ascii?Q?ahYVyCSgi2Nn4zcksTVv+ABI2aqvlBfG5/lQQsVgFnBjOt6HtvzppA5Ay8Gr?= =?us-ascii?Q?KlJpsCB/zuyhzEaweJQbtIHiqU9db/s8G/L3BcBaQBcjRmU0i1PrYslXFOXQ?= =?us-ascii?Q?SRGxhZvWh71uBiNKbdgatb88FHGH+FGkYupnsdfCJRNRqlrwwjxP6gpwIa/5?= =?us-ascii?Q?vFtZe6nEy6MyWI2RSJqqL58JlWctXRzEwARMHW49TImmQAkaWuOLuihIBqZT?= =?us-ascii?Q?4I3m6Y1cGr9agiZewQUpWCSjJb9hwIBeyWQXeTLl1kmj1LCcFKi9g/E1eIOC?= =?us-ascii?Q?CBoeU8LDSwb1/s1YMlGby8OOfWjhGTKwzC0aqCNZ8p11Ft1IZ4LEU9Wga1/5?= =?us-ascii?Q?2Q=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: b0b170bc-7754-4743-6150-08dbd5eee7e8 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:43:47.5540 (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: 9l9bazKlwGr5eU07zn6c+20wXgPRh4uIpjJIGrABhaMzEzmXjsaxG7mQuUzM4Sx3S47HZ5tFwFqdQkuMdy7z1Pnu51uaGQlDWENy7L7G6Wo= 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 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"); -- 2.39.1