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 DF2E8431EB; Tue, 24 Oct 2023 04:29:53 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 636F9406BC; Tue, 24 Oct 2023 04:29:45 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2115.outbound.protection.outlook.com [40.107.95.115]) by mails.dpdk.org (Postfix) with ESMTP id 9D48A402E1 for ; Tue, 24 Oct 2023 04:29:42 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NFiD1qzV4ePHLDQne9lranld0ZDf9j3LoRXvBRXSap6lpzlGdywC6OhvpWmRKaVYH9DYkRB0hx7NnguL/VOKi2NVVxVxET1j960Qd31HLrrheDFyDToTGGs0Q5iOIAGCZnmfRopbZlHnQo84xUxNUWhUZHanujPUJqyj/PrTLrMCyKyDYJWM1HDaKG8UueeyM/TswCrMtJSNemATITJi0Xfvm4wz/cHvr+ZuRb41hhStWXyOc81aSDU5/XaHVyV0fmHHkyPWl2mH0oFCQlGtqjNdV6xcDNKL3gbaRwcXkhyToajQ/HqDcK2FdpH7SuTFGRcbxuyI6BAQwYbg03widA== 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=RKlLn0dayL19PSyHSLs5d1sLBz/qII9IyIYWofUGUte55/br3xCbzZKELwKkwsLkZXHJWRpfDzmMA93JnufdYBdGeYxeRyIe1IZDIHlv1MMdkH+xJ3UkSEAYfID1yDyQJN9KxH8gXaa1aHqyoHmwAw7Cw9FTHQyX6ayX60s4lj2mUbMqUig72auJsrvyqfxiPH++sdYCpbLS8d5U+uISt7BnFYVOg/GS4teeV2OThIQjRvdLG5y7OEaZ0XkzY7KD1VXKuCRnVZDw7NEo1lNYBhXeUJ2IdLZvtrXAaKflrhT1b9XL1trLheAXafaCWa0rnEpy3frqbbVgKoco3Qpw5A== 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=uwmLpiMiKOgor23IIyRQFuMWxrN7cR2n6nNbRd1ynjCuAfQlWc9tTKxZ38e0W5UtUGQAeEwni1Nn0a9lvweLBGBv6n75K4C9MolpxXdGBA8zAp9XqYpmYUz/rPgy08UyU9x6TlSWW5KG6GW/v1nruTZvk0ogQXYt4Fq3CJIb67k= 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 BLAPR13MB4691.namprd13.prod.outlook.com (2603:10b6:208:306::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Tue, 24 Oct 2023 02:29:41 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::142e:d47c:7320:8a9d]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::142e:d47c:7320:8a9d%4]) with mapi id 15.20.6907.021; Tue, 24 Oct 2023 02:29:40 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Shujing Dong , Long Wu , Peng Zhang Subject: [PATCH v2 02/25] net/nfp: make VF PMD using of NFP common module Date: Tue, 24 Oct 2023 10:28:26 +0800 Message-Id: <20231024022849.3092506-3-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231024022849.3092506-1-chaoyong.he@corigine.com> References: <20231017054545.1692509-1-chaoyong.he@corigine.com> <20231024022849.3092506-1-chaoyong.he@corigine.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: BYAPR04CA0015.namprd04.prod.outlook.com (2603:10b6:a03:40::28) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|BLAPR13MB4691:EE_ X-MS-Office365-Filtering-Correlation-Id: 3cdee279-14ae-4663-87b7-08dbd4391360 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bRlyfwi/s2tRM2NiEFABgK7NfHjK8CDdF965p1PJwHvYSGEx49ZMQppSaeWXdZw9TUX2KOAzIhaP1aPpr5q1mYTtblKIncGO87uVdDZ+aH8rbmoYmZP1qMrRCwx03ekI5NraHlqvKvFM4ti52qVVxtcVwFk8s9CesRWhbIw6jgLrCpYhuIjSkoMd//zwLdxb+GP2Z1Fbm2zsyKmrZOKAjUUL4BloByTpRTdiY6Eib/ZJ32fc9PyQzYXlsKouwpgaec9Vz9yrV+3PqOMNELQXC6D9EwradX014ooRojFADedUtDl1X82XJYRXuBZMIUOmzM/sLJ7m+UsGzzagqgdGe+bXGnUjgTa16Oc5b5EW0r6ytTVD/eYjC5PrxCcq4QFGIbrhqijdX6i0Qs2Dw/BJOBSJOJBlW8LKlNuZM9xA5v8Bk2K5bjhiYD1fgOyp23cwq8GGGEYtOV9ipUqduKmdliMo7PzQMUx+FYOfwDa+Lgdtw90pcTIsw0fW/vZk6HoySBTKeG2JwWEbYKnWoeyKiY0T2e/I/6f2XzOEBS9rvvQ90MXSaX0GLAcR9wF4Yy76TPdlIWUhsjH0J72599TY5atcIWwyNTXzCjTSMXRsWHoE3m/c4va2CNGj5a+I4U2UIaRzH9RoDilL60mAqCGlWUVsPkuqxdvrKbXBbqvYpQ8= 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)(39830400003)(366004)(376002)(346002)(396003)(136003)(230922051799003)(186009)(451199024)(1800799009)(64100799003)(83380400001)(38350700005)(2906002)(4326008)(8936002)(36756003)(44832011)(8676002)(26005)(52116002)(107886003)(2616005)(1076003)(38100700002)(6506007)(6666004)(6512007)(316002)(6916009)(478600001)(6486002)(5660300002)(66476007)(86362001)(54906003)(41300700001)(66946007)(66556008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/reyTHvgarhTPZshEeQEGUDJorlnuULtIAmuLH39sB/onqqKKA8Ils1IpaHX?= =?us-ascii?Q?ITejXBXo3nYjEJdkw17HzMb120JQIiYULgPLj7HcaW49wqBNxu3EabED36q8?= =?us-ascii?Q?RX6pohx5XHCP14kNd0WvavRrRWvAB720K+Gy8Fb6EZ9fx0SfEl0unQbXCqe/?= =?us-ascii?Q?RtMsQobJOzLeLXZUPxI+bjzr5XeDuh9nFff2/eqVV6unY1sCSmZmK5qganAU?= =?us-ascii?Q?q+3MLqySEXToxjl9QkfCfxIJvSJfq+0yj3mgmmRrUwU11wytq18t1s4FFCYY?= =?us-ascii?Q?b1KAuyDAGAGQh0v0x8TE99W5+6ZGcfwBbYXutM1CAJPw+tdNRsGIXOx9YAy7?= =?us-ascii?Q?3Ak4u9j3ZTvV+T966m5ICfsL66wjKWXtUQHhgbkeIecaRxFDJ6AVd5UpoyLS?= =?us-ascii?Q?LwHnj4/vLjuFLzb307NEeD8TYC9FNpUbQ3DcPnVj612KNQt7oB4zDU21Gi8U?= =?us-ascii?Q?CPsfS4kSJqKDxUUFeA6XvQZFsAZ1Wgo/eFvXD8e1UFCC+CJt8v2GP9B1+WEs?= =?us-ascii?Q?N0ieDuOiKJeHT9lP+Hekni5xncIxcC7BSwmmu45ina37PVjcAhaCMngBV2vR?= =?us-ascii?Q?UTTPkTHP6yavEzBZvd3Jb+BDQWebdYYOBcNr67PMusuON3Ld7snQxzQJ8xQr?= =?us-ascii?Q?JF39BPEPRpg4E/XEh6zzD0i4qC62B0xEogeI3BheBz98hwvjvkQZ92Pa1g+L?= =?us-ascii?Q?hXnlodGC3UD99hKsfhS51rUxcjkKBg9g+wCWoZMT0xS1ErwRmazzC7qp+elk?= =?us-ascii?Q?smzg5Vcme8dovbyLop1ep3rY+yja00MGCwcTgASxptUrikKCNDYOStbw+l0y?= =?us-ascii?Q?M0meP1BoWxh94Ych4oINFgZ/WpfKPriOzmzsowj8ryFK6x8u0gx9DZtD4l2F?= =?us-ascii?Q?pRtPjOMlxT1ShPHhEDu5iVDTGUcaxoqlS6dEBOKEKjvDND2lg+9JnzhFm+Wi?= =?us-ascii?Q?O9v6QhfLV3bvsef6MNWrvQ421jgHAeeqqa+3JPqhY97NERwfv+AFE7F+at9K?= =?us-ascii?Q?EV1HugxfUahRR95zeNGCkmQYUzS3UWMnFM/6zbEaFBLPfl0vS7k/3sPIAbaC?= =?us-ascii?Q?/kZ1osC+BHpqDPwBsETaVw7mW/vsj2+sCAomW2IHfle5StuNLFLYTUVF2P+V?= =?us-ascii?Q?MtvVU/9suqT5Y+qRzFdF4BDd3i03rEGujepjy6NZtn4UUS9rCXaMFS9Ob3wF?= =?us-ascii?Q?+UqduFif6bhz+UDRA2QCx+/Jo8WK0e0mnQr2Fy345NeCfjeibPqMFxtmSRci?= =?us-ascii?Q?jMGun18/7b3P4q537CCdmh9APP3ac6CAP6tfnNqd0qm6+4YE1uiW0UXdwHxq?= =?us-ascii?Q?/PIzFkgjlkvXKRLCzJHUxA8wUFpdm5BfGE8/MY3am6IOW9s5rX88mSIoTpLp?= =?us-ascii?Q?AY+OlN0oKWUSpA0v4NCg+i7JN7EfcLNjHZEnnZ50OTvUTzFdIxqNjmytzZ3t?= =?us-ascii?Q?ehXCTYBKPYVb/UvRZNQ36Oa71z9yk9aRb4w27APUAoyQRUV302etvzFwi7uP?= =?us-ascii?Q?CpTU417n6v+r5pHP/URn5ptGDaZTWKc1dQAboP7Vma/BgXC1M/vEy9jztQHF?= =?us-ascii?Q?pH0xKzIL5HTbTmf7pV21zbEsNAM3ULiwfBYKQsxRXKtNidYfepRx3/jAzcaB?= =?us-ascii?Q?/g=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3cdee279-14ae-4663-87b7-08dbd4391360 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Oct 2023 02:29:40.9459 (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: rISLgHzPch5lk+P4QvbcMwUUgvExhnbkywfqUNarRbd8UczXW9mGtuaCB/mmmbgpNR8ffpHfN0ffodUi8QaMGvKwq0iMPz+/2lpEsftQyOQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR13MB4691 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"); -- 2.39.1