From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0080.outbound.protection.outlook.com [104.47.38.80]) by dpdk.org (Postfix) with ESMTP id 0F5A45589 for ; Tue, 20 Sep 2016 14:42:34 +0200 (CEST) Received: from BLUPR0301CA0003.namprd03.prod.outlook.com (10.162.113.141) by BN6PR03MB2435.namprd03.prod.outlook.com (10.168.223.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.629.8; Tue, 20 Sep 2016 12:42:29 +0000 Received: from BL2FFO11FD012.protection.gbl (2a01:111:f400:7c09::160) by BLUPR0301CA0003.outlook.office365.com (2a01:111:e400:5259::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.639.5 via Frontend Transport; Tue, 20 Sep 2016 12:42:29 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com;nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD012.mail.protection.outlook.com (10.173.161.18) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.629.5 via Frontend Transport; Tue, 20 Sep 2016 12:42:28 +0000 Received: from Tophie.ap.freescale.net ([10.232.14.87]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u8KCexsa006559; Tue, 20 Sep 2016 05:42:26 -0700 From: Shreyansh Jain To: CC: , David Marchand , , Thomas Monjalon , Shreyansh Jain Date: Tue, 20 Sep 2016 18:11:20 +0530 Message-ID: <1474375296-26078-9-git-send-email-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474375296-26078-1-git-send-email-shreyansh.jain@nxp.com> References: <1466510566-9240-1-git-send-email-shreyansh.jain@nxp.com> <1474375296-26078-1-git-send-email-shreyansh.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131188489490140768; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(97736004)(50226002)(11100500001)(92566002)(87936001)(68736007)(36756003)(19580405001)(19580395003)(2950100001)(586003)(4326007)(105606002)(104016004)(85426001)(106466001)(229853001)(5003940100001)(2351001)(77096005)(2906002)(305945005)(626004)(7846002)(5660300001)(8936002)(48376002)(47776003)(575784001)(86362001)(50986999)(76176999)(110136003)(8676002)(81156014)(189998001)(50466002)(33646002)(8666005)(81166006)(356003)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR03MB2435; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD012; 1:nLTHuLYCdqqXR9xn+hoYdaIDN9Puz59cFvpaXX+ntD47zkrrdJH4ok0Ao1H2QuWiZGLbi441ouXeb+LX8PgZLDZdflyHP4F4kIfaa6HqSuw1cOc7jovg3xXWctQ4iDRiqu21slenVp0elV9eJaHv/HV+JVP47oMwkiHKOeuGPeguEF+iP82d7Je490pa7FIPgPTtKS3gwa9EgehePBnylqbWQzY0bZCqH3tQtyEjs/6yEvlSBKrd+2pA0vcRiQJmZCPCPU5ebK2mx55bnWw+IhBX8xcHAW4GFX4g/nviyuzSGt3cOnFhh+2r5pE/rF5NwgdnpeDztNRwkor/IU+rh5VScY39P12OTuxaLonFxSXleAa7haYkwo4s3bbsdshyV+ZZFy99tZ6ImlsOc3vs8r+mbzv9zhQP3nkMujAJXbwX8mNH6nKu9vVXXfw11M/ETe4ejR1p3SZ6v7ooCNQj1FxsIb/pdfzHxh6NwBfFNE+V8wYfV0FWydvSKFjjOQVi53Q2vrJ0V69Ibg6RyUKytlXgCjQVVh/43U6lJnn1/xQjf+0Bk6bvRbjzl85bMD4Y4MOtbSK/XpPqDvRVbT+XcCjSu38qRx0xugP3ROvyB+GEFaaTIY9s0QrFKhU6M0h7UuAplQfgCnOMzCgjzXWuxnNHOBfYU32QmpPZqv2UwmSaxDxmlwmh6eKHnBgiVzSwfxYDeXBuqHzGazFLsw8ra4tlupUGYQiAOhDBum8Qg4E= MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 9f3723fb-0794-4982-acff-08d3e1539522 X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2435; 2:4IVFflsCBLZs1t4uH8lzz0s5Z0fXXc2gVvjUGvHPTz4kMogwE1N6sw2o1qaXVvySJ1DZ59wozg70HXBlCfVmjmFgOPchoixt4rE0KE7P2+EP5KpFP0WpNsswLT2GB3X5CaIon7k7UQKHVTmsULwSPoi04KBIwF7eoSmTwa72EStjnAXpdXhMWK+vzTQzsSuM; 3:82zd4OJullOpMgvAc92S7bK+VUM5xjKx7hVyXPpPOio8k4Bkh49IcP3qbguPHoullK7kliQyoW445OPIHSW+2G6Js2SECDABEd4uO+D+CM/CA5nhGrdTLGZkW7SMT8bSfJe+Jy+xLNxTIk3giYFi94OyJkbq1K826vLbTiFaADW2e/uOMu+prA00FbdlxWlGnQpeIt9ufzUEJOUopsTQ3drjjN8PUV/VnQ8752sBiHw=; 25:U6DhMZlMDWG2u9ygkUJbQcF+2r6GOc5g6/BrSYm18EDVRPeWnEsbwcqnj4HGlMbVIe47K92tldMQwZy8NwDca8Xt7TZgF70+8Mq8cK5Z350v1W7tlieO0SUqv5v3la6NjwVSy9L2r/JVsHUB23DvB8SqjFlO4NdfmgSioITkb/75oy/khvwO9CzPazP+gd+xQyOlg50gq7Rs/qt7fxGlPrR+Y67SzFvPYmzHhA5k9E0pvvqaW/N30peGC4iOJK0dXDQ97UQsUc6IR0CYkUY/DD/iLEcn43Xq8Lbdsbux2PziPvcKAvVXvqgXtbTx2+BUKNsrvVXUQ8/G9nT8Uy3JB8knuwa29EBMioX0KWybsWa79beHMhD2q0V1xEPmn8+EN+ZtMIA10s86zzNWyhH3PxQvxyJAiWPIxe6Uv4mZ/Bc= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN6PR03MB2435; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2435; 31:0dmib2HV+8xkjSzJZJhRLcaHcab/6z83BqaDcY/5uXf21U3Xl9rFj5xjYwFY+JzwnjJ3ob0+DDzphkBvZbZsBR0JExCCfSfUrkecmlKgBjcJXwQAdT8PqsccojtdRvCpHR29w24sB9k8wuJcHEekZUm00hDT892aXoxWd7dl7aYZaeJjlZTQbjtUcZ5iBkA6QFSALo/ahKDum8gYNyqLkLw2Iz6q49O9i6PDm/oypb8=; 4:P4+F3H/BZKFywjN3BM5BuAC+aM9mELY8QVotJK6WhmBoekc/2FRW9lPXa6xthOpfVG+QfBu11jg/G4/mn5gKGFlHUFfv0030/QNrcEguDp7Na3jwC/PINtL+xp5Ae3hJ/UHm0LE88/HyBygn/Xbnd5tNFClvwXKbUuRfoksnDHjzluhz0rmQzBMuRMIzlKGEUR244e21qxT9/FJWRSJu+8bdI+GeEASVh15Vq2cPuGu72bSwG2+V1Q2L3Nl2byoXxU8tnp8CoFCcUxnPa8NmUfLBaFZ/lB2uofYEI3Tvs7aveWPr5Z1WMWWBJRM3N4W4JJ2IAPmyEZ30+Nh8o5TjSm8aR4wX10652sSSy17a6NA/zFKpZoKZdHBL96n2k1x+gE3dEd+tHEfYELgJulJt5clNQq7zrvhYiETgGqD6yDtSzQNtdDGupEnn86p9ysqotbMIiKuRv9gfSjhRUUEky1vyX8mq/BtPvoqlM8YBJ8mWoT7UMAWr1FfQQOR8oGnoArO8conP5ZAc7gPAbnc3B+MWKjbaed+PdOSi8XLtCvk= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(13017025)(13024025)(13015025)(13023025)(13018025)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:BN6PR03MB2435; BCL:0; PCL:0; RULEID:(400006); SRVR:BN6PR03MB2435; X-Forefront-PRVS: 0071BFA85B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR03MB2435; 23:lWJIe57hES2QzR52RF0XLcmUozA9xrAvF9KKU0NaB?= =?us-ascii?Q?r0xEb0J6jlvF3pqityMXrfYNFxcNiZMbqBu7wKscuVfPAGot84cfk5LLLSf/?= =?us-ascii?Q?Orc/SEw/Ai+/8urCrZha3Y12yw6Cfsg8jx27i60QpS4hBsjBMFh3q8DHL3Kb?= =?us-ascii?Q?zvqocM9CEJgR+K3XIvaTW/DCqF/4tt3PwW88qegHJAHhxObPW8ssnpu03a5D?= =?us-ascii?Q?VQM0VEVwxnuyVeXizkUYwVUi1PVkFW17ydklqQysUA4MJPdS77+NsNhjW9dq?= =?us-ascii?Q?wGbty6UeIysOuRbpE2etzkgqGxOVHULmuqfOrywjtJoU525g8uFDPBpBdCx+?= =?us-ascii?Q?TModmEjI9vR42cAK1eqhYyPd8uUVYg16Hk+AIcnph7JtWioZpfW7knTEZu4F?= =?us-ascii?Q?JkmbuMDD6hGHIjovfG0rF6+SAkp1yEVYgV5QvZg6gxwvRRQJmakOGlGxnSry?= =?us-ascii?Q?OQAWuWbCJd6Dcou0ZVoiJ+oC1aTGZZHiMCEY8k/npgmoIMyTHlQ+7fz8ggS+?= =?us-ascii?Q?bRFVnMBEybyFaz7bX0Ga790z3BzP4yBwULwOBRB22gTOaOo5lHyYNNct2cXg?= =?us-ascii?Q?sMNo9/ChqLdaTlJhFZ3BMXsNRnmcFBJ0ai9y7xcrO5A/47HB9VCQ3zQN8SuG?= =?us-ascii?Q?kjZdU+LJiWTOsqSGT54ndDvUNI3xAZcQqDs2la1tJ3Y5y6Q51r5GVTBvu7kr?= =?us-ascii?Q?YhC8R9+DeH7zYl6CpXFKYlLGFgk3wmvTNyfYYoQyQjzP3IvhLftW6k69UHIU?= =?us-ascii?Q?/iUgPful0WCoRB0YE8TztwudXg6E/+vjAmclCfvf0HMCzA8csOC3//OozXNi?= =?us-ascii?Q?HxB+O/xygPPYCgYkP7PKhyPpfQAh/vGRhS6aQLINERwCQHHR8hrvNf15geUY?= =?us-ascii?Q?t9SKmej5lnuaqlF4nRqfQk/x4JvHXoPP85T5ZhR6bJzCMCMueZE3oW518Fhd?= =?us-ascii?Q?3FgHaCEtoNJTIzXORW6QRN7EIZB5dLgQXvccMB2IgtrvIKv9dwhsbWmjWAgN?= =?us-ascii?Q?vA5mtAtdj7edFzZ9JtgPokOczRbdaJEUbGHELZP9lRpWV76Vz5EC5GvuwkLy?= =?us-ascii?Q?5mYutXJX8ms1t2GQ3XVXlg7mULML2oZSDahAyAjn+it0wE05jZkYFEG5Vs2g?= =?us-ascii?Q?KIudVJI542LuK+Bt4P70m+sdwE1UajS2aurNjxHZWttjpp03cyE5hM9d/rSj?= =?us-ascii?Q?590p0+MUb/J50jDIK10n+HWfLvFj4Onj4Ic?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2435; 6:5NAMOkHZe5eGuGdRXu38R2l+Kxk6Iljx924G/oynyqDbZ5jeqdIY0dE4FLT2iRDnrj7uWvQnx5t920Ri0F8xzzkFwEM+EnpomDESMenqT2pxqQKB7d0nWgkK8tSrTkmyWAvasx3BW43+uSqaHJqOJy+TEexOGThq66xDwW7LjKfVPHDNfNMd6mzwBNowxQcdk72X4lJWuWWe/uKRh/RYk2j/twwILdm5cJcBLbd+Bqo7BlbL0Uo3aqYYnZFQHglNXjkFYkHTwz3BMwnNyJbPDlwqVo9dZC5blxwJYRl3SR8=; 5:knhjfwj4zZKuIKt3YoygBFX8XTo8S5LHMvcDYmuv7VGeziZycUjskcKDXpfgxljqHSyj6/fTZ2HzaVQlR0wmgn6HMrUIl3WCRyL/3lgAfR5rp6RDqNYvsADZYSMuf/WI5xbaLrkl43BNqY1QsqPxK+5Hz0poyzjD8UhRDsmV0qg=; 24:5Uf8mXy0SeUsRAdQyy/rUi0wu4nQ6CWSOj4+jV/ufsyotMkbbB7uY53ndwF+oxwipSbyQjhFZBgQVgJ2/E4XsjupJ2bQCCk5u3XB0icyfZw=; 7:dkkGlNdm+74zNirNoCEffOlzJGXZpm9H6MAY9Fn3O0N3vWFKIaPZQ6pTJsBcKZwjA7LJ/UdgCyNJ1YcB+4XFfzrqxE2yWl8lCPvYgHF/b8mXCPgtMP7EZ7y1Vd25KmZIKFmUrmDHzuyvG8OVJd+3Jv4taBPiXrd48VzzezDqdP5ULQNO7Ol88DUA9plfwny0gWnnl3/qPqX8Qxveeq3OZpuvAwtnIEuch/bi/KHfVZP3t1ZChcjiJxhw7Gb8d7b80sWdXjnr+AZg1trWjUSKga+MCHERxRHoutjV5fYJKAega/sqj85zV+nBg1piSBHJ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2016 12:42:28.8268 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR03MB2435 Subject: [dpdk-dev] [PATCH v11 08/24] drivers: convert all phy drivers as PCI drivers X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Sep 2016 12:42:34 -0000 From: David Marchand Simplify crypto and ethdev pci drivers init by using newly introduced init macros and helpers. Those drivers then don't need to register as "rte_driver"s anymore. Exceptions: - virtio and mlx* use RTE_INIT directly as they have custom initialization steps. - VDEV devices are not modified - they continue to use PMD_REGISTER_DRIVER. Update documentation for replacing an example referring to PMD_REGISTER_DRIVER. Signed-off-by: David Marchand Signed-off-by: Shreyansh Jain --- doc/guides/prog_guide/dev_kit_build_system.rst | 2 +- drivers/crypto/qat/rte_qat_cryptodev.c | 16 ++------- drivers/net/bnx2x/bnx2x_ethdev.c | 34 ++++--------------- drivers/net/bnxt/bnxt_ethdev.c | 16 ++------- drivers/net/cxgbe/cxgbe_ethdev.c | 24 ++------------ drivers/net/e1000/em_ethdev.c | 16 ++------- drivers/net/e1000/igb_ethdev.c | 39 ++++------------------ drivers/net/ena/ena_ethdev.c | 17 ++-------- drivers/net/enic/enic_ethdev.c | 23 ++----------- drivers/net/fm10k/fm10k_ethdev.c | 23 ++----------- drivers/net/i40e/i40e_ethdev.c | 24 ++------------ drivers/net/i40e/i40e_ethdev_vf.c | 25 ++------------ drivers/net/ixgbe/ixgbe_ethdev.c | 46 ++++---------------------- drivers/net/mlx4/mlx4.c | 16 +++------ drivers/net/mlx5/mlx5.c | 15 +++------ drivers/net/nfp/nfp_net.c | 21 ++---------- drivers/net/qede/qede_ethdev.c | 40 +++++----------------- drivers/net/szedata2/rte_eth_szedata2.c | 24 ++------------ drivers/net/thunderx/nicvf_ethdev.c | 20 ++--------- drivers/net/virtio/virtio_ethdev.c | 26 +++++---------- drivers/net/vmxnet3/vmxnet3_ethdev.c | 23 ++----------- mk/internal/rte.compile-pre.mk | 2 +- 22 files changed, 83 insertions(+), 409 deletions(-) diff --git a/doc/guides/prog_guide/dev_kit_build_system.rst b/doc/guides/prog_guide/dev_kit_build_system.rst index 952146e..05358d0 100644 --- a/doc/guides/prog_guide/dev_kit_build_system.rst +++ b/doc/guides/prog_guide/dev_kit_build_system.rst @@ -264,7 +264,7 @@ instance the macro: .. code-block:: c - PMD_REGISTER_DRIVER(drv, name) + DRIVER_REGISTER_PCI(name, drv) Creates the following symbol: diff --git a/drivers/crypto/qat/rte_qat_cryptodev.c b/drivers/crypto/qat/rte_qat_cryptodev.c index 1e9e0ba..170ae78 100644 --- a/drivers/crypto/qat/rte_qat_cryptodev.c +++ b/drivers/crypto/qat/rte_qat_cryptodev.c @@ -116,23 +116,13 @@ static struct rte_cryptodev_driver rte_qat_pmd = { .pci_drv = { .id_table = pci_id_qat_map, .drv_flags = RTE_PCI_DRV_NEED_MAPPING, + .probe = rte_cryptodev_pci_probe, + .remove = rte_cryptodev_pci_remove, }, .cryptodev_init = crypto_qat_dev_init, .dev_private_size = sizeof(struct qat_pmd_private), }; -static int -rte_qat_pmd_init(const char *name __rte_unused, const char *params __rte_unused) -{ - PMD_INIT_FUNC_TRACE(); - return rte_cryptodev_pmd_driver_register(&rte_qat_pmd, PMD_PDEV); -} - -static struct rte_driver pmd_qat_drv = { - .type = PMD_PDEV, - .init = rte_qat_pmd_init, -}; - -PMD_REGISTER_DRIVER(pmd_qat_drv, CRYPTODEV_NAME_QAT_SYM_PMD); +DRIVER_REGISTER_PCI(CRYPTODEV_NAME_QAT_SYM_PMD, rte_qat_pmd.pci_drv); DRIVER_REGISTER_PCI_TABLE(CRYPTODEV_NAME_QAT_SYM_PMD, pci_id_qat_map); diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c index dcd2d77..7d9ecdf 100644 --- a/drivers/net/bnx2x/bnx2x_ethdev.c +++ b/drivers/net/bnx2x/bnx2x_ethdev.c @@ -621,6 +621,8 @@ static struct eth_driver rte_bnx2x_pmd = { .name = "rte_bnx2x_pmd", .id_table = pci_id_bnx2x_map, .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC, + .probe = rte_eth_dev_pci_probe, + .remove = rte_eth_dev_pci_remove, }, .eth_dev_init = eth_bnx2x_dev_init, .dev_private_size = sizeof(struct bnx2x_softc), @@ -634,38 +636,14 @@ static struct eth_driver rte_bnx2xvf_pmd = { .name = "rte_bnx2xvf_pmd", .id_table = pci_id_bnx2xvf_map, .drv_flags = RTE_PCI_DRV_NEED_MAPPING, + .probe = rte_eth_dev_pci_probe, + .remove = rte_eth_dev_pci_remove, }, .eth_dev_init = eth_bnx2xvf_dev_init, .dev_private_size = sizeof(struct bnx2x_softc), }; -static int rte_bnx2x_pmd_init(const char *name __rte_unused, const char *params __rte_unused) -{ - PMD_INIT_FUNC_TRACE(); - rte_eth_driver_register(&rte_bnx2x_pmd); - - return 0; -} - -static int rte_bnx2xvf_pmd_init(const char *name __rte_unused, const char *params __rte_unused) -{ - PMD_INIT_FUNC_TRACE(); - rte_eth_driver_register(&rte_bnx2xvf_pmd); - - return 0; -} - -static struct rte_driver rte_bnx2x_driver = { - .type = PMD_PDEV, - .init = rte_bnx2x_pmd_init, -}; - -static struct rte_driver rte_bnx2xvf_driver = { - .type = PMD_PDEV, - .init = rte_bnx2xvf_pmd_init, -}; - -PMD_REGISTER_DRIVER(rte_bnx2x_driver, net_bnx2x); +DRIVER_REGISTER_PCI(net_bnx2x, rte_bnx2x_pmd.pci_drv); DRIVER_REGISTER_PCI_TABLE(net_bnx2x, pci_id_bnx2x_map); -PMD_REGISTER_DRIVER(rte_bnx2xvf_driver, net_bnx2xvf); +DRIVER_REGISTER_PCI(net_bnx2xvf, rte_bnx2xvf_pmd.pci_drv); DRIVER_REGISTER_PCI_TABLE(net_bnx2xvf, pci_id_bnx2xvf_map); diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index f4eedfd..d389fc8 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -1048,23 +1048,13 @@ static struct eth_driver bnxt_rte_pmd = { .name = "rte_" DRV_MODULE_NAME "_pmd", .id_table = bnxt_pci_id_map, .drv_flags = RTE_PCI_DRV_NEED_MAPPING, + .probe = rte_eth_dev_pci_probe, + .remove = rte_eth_dev_pci_remove }, .eth_dev_init = bnxt_dev_init, .eth_dev_uninit = bnxt_dev_uninit, .dev_private_size = sizeof(struct bnxt), }; -static int bnxt_rte_pmd_init(const char *name, const char *params __rte_unused) -{ - RTE_LOG(INFO, PMD, "bnxt_rte_pmd_init() called for %s\n", name); - rte_eth_driver_register(&bnxt_rte_pmd); - return 0; -} - -static struct rte_driver bnxt_pmd_drv = { - .type = PMD_PDEV, - .init = bnxt_rte_pmd_init, -}; - -PMD_REGISTER_DRIVER(bnxt_pmd_drv, net_bnxt); +DRIVER_REGISTER_PCI(net_bnxt, bnxt_rte_pmd.pci_drv); DRIVER_REGISTER_PCI_TABLE(net_bnxt, bnxt_pci_id_map); diff --git a/drivers/net/cxgbe/cxgbe_ethdev.c b/drivers/net/cxgbe/cxgbe_ethdev.c index 7b7bfdf..bb929a9 100644 --- a/drivers/net/cxgbe/cxgbe_ethdev.c +++ b/drivers/net/cxgbe/cxgbe_ethdev.c @@ -1042,30 +1042,12 @@ static struct eth_driver rte_cxgbe_pmd = { .name = "rte_cxgbe_pmd", .id_table = cxgb4_pci_tbl, .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC, + .probe = rte_eth_dev_pci_probe, + .remove = rte_eth_dev_pci_remove, }, .eth_dev_init = eth_cxgbe_dev_init, .dev_private_size = sizeof(struct port_info), }; -/* - * Driver initialization routine. - * Invoked once at EAL init time. - * Register itself as the [Poll Mode] Driver of PCI CXGBE devices. - */ -static int rte_cxgbe_pmd_init(const char *name __rte_unused, - const char *params __rte_unused) -{ - CXGBE_FUNC_TRACE(); - - rte_eth_driver_register(&rte_cxgbe_pmd); - return 0; -} - -static struct rte_driver rte_cxgbe_driver = { - .type = PMD_PDEV, - .init = rte_cxgbe_pmd_init, -}; - -PMD_REGISTER_DRIVER(rte_cxgbe_driver, net_cxgbe); +DRIVER_REGISTER_PCI(net_cxgbe, rte_cxgbe_pmd.pci_drv); DRIVER_REGISTER_PCI_TABLE(net_cxgbe, cxgb4_pci_tbl); - diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c index c5bf294..d4914a5 100644 --- a/drivers/net/e1000/em_ethdev.c +++ b/drivers/net/e1000/em_ethdev.c @@ -395,6 +395,8 @@ static struct eth_driver rte_em_pmd = { .id_table = pci_id_em_map, .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC | RTE_PCI_DRV_DETACHABLE, + .probe = rte_eth_dev_pci_probe, + .remove = rte_eth_dev_pci_remove, }, .eth_dev_init = eth_em_dev_init, .eth_dev_uninit = eth_em_dev_uninit, @@ -402,13 +404,6 @@ static struct eth_driver rte_em_pmd = { }; static int -rte_em_pmd_init(const char *name __rte_unused, const char *params __rte_unused) -{ - rte_eth_driver_register(&rte_em_pmd); - return 0; -} - -static int em_hw_init(struct e1000_hw *hw) { int diag; @@ -1799,10 +1794,5 @@ eth_em_set_mc_addr_list(struct rte_eth_dev *dev, return 0; } -struct rte_driver em_pmd_drv = { - .type = PMD_PDEV, - .init = rte_em_pmd_init, -}; - -PMD_REGISTER_DRIVER(em_pmd_drv, net_e1000_em); +DRIVER_REGISTER_PCI(net_e1000_em, rte_em_pmd.pci_drv); DRIVER_REGISTER_PCI_TABLE(net_e1000_em, pci_id_em_map); diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index f7cfa18..c54c8e8 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -1082,6 +1082,8 @@ static struct eth_driver rte_igb_pmd = { .id_table = pci_id_igb_map, .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC | RTE_PCI_DRV_DETACHABLE, + .probe = rte_eth_dev_pci_probe, + .remove = rte_eth_dev_pci_remove, }, .eth_dev_init = eth_igb_dev_init, .eth_dev_uninit = eth_igb_dev_uninit, @@ -1096,19 +1098,14 @@ static struct eth_driver rte_igbvf_pmd = { .name = "rte_igbvf_pmd", .id_table = pci_id_igbvf_map, .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_DETACHABLE, + .probe = rte_eth_dev_pci_probe, + .remove = rte_eth_dev_pci_remove, }, .eth_dev_init = eth_igbvf_dev_init, .eth_dev_uninit = eth_igbvf_dev_uninit, .dev_private_size = sizeof(struct e1000_adapter), }; -static int -rte_igb_pmd_init(const char *name __rte_unused, const char *params __rte_unused) -{ - rte_eth_driver_register(&rte_igb_pmd); - return 0; -} - static void igb_vmdq_vlan_hw_filter_enable(struct rte_eth_dev *dev) { @@ -1120,20 +1117,6 @@ igb_vmdq_vlan_hw_filter_enable(struct rte_eth_dev *dev) E1000_WRITE_REG(hw, E1000_RCTL, rctl); } -/* - * VF Driver initialization routine. - * Invoked one at EAL init time. - * Register itself as the [Virtual Poll Mode] Driver of PCI IGB devices. - */ -static int -rte_igbvf_pmd_init(const char *name __rte_unused, const char *params __rte_unused) -{ - PMD_INIT_FUNC_TRACE(); - - rte_eth_driver_register(&rte_igbvf_pmd); - return 0; -} - static int igb_check_mq_mode(struct rte_eth_dev *dev) { @@ -5084,16 +5067,6 @@ eth_igb_set_eeprom(struct rte_eth_dev *dev, return nvm->ops.write(hw, first, length, data); } -static struct rte_driver pmd_igb_drv = { - .type = PMD_PDEV, - .init = rte_igb_pmd_init, -}; - -static struct rte_driver pmd_igbvf_drv = { - .type = PMD_PDEV, - .init = rte_igbvf_pmd_init, -}; - static int eth_igb_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id) { @@ -5255,7 +5228,7 @@ eth_igb_configure_msix_intr(struct rte_eth_dev *dev) E1000_WRITE_FLUSH(hw); } -PMD_REGISTER_DRIVER(pmd_igb_drv, net_e1000_igb); +DRIVER_REGISTER_PCI(net_e1000_igb, rte_igb_pmd.pci_drv); DRIVER_REGISTER_PCI_TABLE(net_e1000_igb, pci_id_igb_map); -PMD_REGISTER_DRIVER(pmd_igbvf_drv, net_e1000_igb_vf); +DRIVER_REGISTER_PCI(net_e1000_igb_vf, rte_igbvf_pmd.pci_drv); DRIVER_REGISTER_PCI_TABLE(net_e1000_igb_vf, pci_id_igbvf_map); diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index f2e7c34..85c5086 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -1689,23 +1689,12 @@ static struct eth_driver rte_ena_pmd = { .name = "rte_ena_pmd", .id_table = pci_id_ena_map, .drv_flags = RTE_PCI_DRV_NEED_MAPPING, + .probe = rte_eth_dev_pci_probe, + .remove = rte_eth_dev_pci_remove, }, .eth_dev_init = eth_ena_dev_init, .dev_private_size = sizeof(struct ena_adapter), }; -static int -rte_ena_pmd_init(const char *name __rte_unused, - const char *params __rte_unused) -{ - rte_eth_driver_register(&rte_ena_pmd); - return 0; -}; - -struct rte_driver ena_pmd_drv = { - .type = PMD_PDEV, - .init = rte_ena_pmd_init, -}; - -PMD_REGISTER_DRIVER(ena_pmd_drv, net_ena); +DRIVER_REGISTER_PCI(net_ena, rte_ena_pmd.pci_drv); DRIVER_REGISTER_PCI_TABLE(net_ena, pci_id_ena_map); diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c index 6cbecb1..9006197 100644 --- a/drivers/net/enic/enic_ethdev.c +++ b/drivers/net/enic/enic_ethdev.c @@ -616,29 +616,12 @@ static struct eth_driver rte_enic_pmd = { .name = "rte_enic_pmd", .id_table = pci_id_enic_map, .drv_flags = RTE_PCI_DRV_NEED_MAPPING, + .probe = rte_eth_dev_pci_probe, + .remove = rte_eth_dev_pci_remove, }, .eth_dev_init = eth_enicpmd_dev_init, .dev_private_size = sizeof(struct enic), }; -/* Driver initialization routine. - * Invoked once at EAL init time. - * Register as the [Poll Mode] Driver of Cisco ENIC device. - */ -static int -rte_enic_pmd_init(__rte_unused const char *name, - __rte_unused const char *params) -{ - ENICPMD_FUNC_TRACE(); - - rte_eth_driver_register(&rte_enic_pmd); - return 0; -} - -static struct rte_driver rte_enic_driver = { - .type = PMD_PDEV, - .init = rte_enic_pmd_init, -}; - -PMD_REGISTER_DRIVER(rte_enic_driver, net_enic); +DRIVER_REGISTER_PCI(net_enic, rte_enic_pmd.pci_drv); DRIVER_REGISTER_PCI_TABLE(net_enic, pci_id_enic_map); diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c index 0ecc167..8d55c43 100644 --- a/drivers/net/fm10k/fm10k_ethdev.c +++ b/drivers/net/fm10k/fm10k_ethdev.c @@ -3059,30 +3059,13 @@ static struct eth_driver rte_pmd_fm10k = { .id_table = pci_id_fm10k_map, .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC | RTE_PCI_DRV_DETACHABLE, + .probe = rte_eth_dev_pci_probe, + .remove = rte_eth_dev_pci_remove, }, .eth_dev_init = eth_fm10k_dev_init, .eth_dev_uninit = eth_fm10k_dev_uninit, .dev_private_size = sizeof(struct fm10k_adapter), }; -/* - * Driver initialization routine. - * Invoked once at EAL init time. - * Register itself as the [Poll Mode] Driver of PCI FM10K devices. - */ -static int -rte_pmd_fm10k_init(__rte_unused const char *name, - __rte_unused const char *params) -{ - PMD_INIT_FUNC_TRACE(); - rte_eth_driver_register(&rte_pmd_fm10k); - return 0; -} - -static struct rte_driver rte_fm10k_driver = { - .type = PMD_PDEV, - .init = rte_pmd_fm10k_init, -}; - -PMD_REGISTER_DRIVER(rte_fm10k_driver, net_fm10k); +DRIVER_REGISTER_PCI(net_fm10k, rte_pmd_fm10k.pci_drv); DRIVER_REGISTER_PCI_TABLE(net_fm10k, pci_id_fm10k_map); diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index b04c833..56bd2c6 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -667,6 +667,8 @@ static struct eth_driver rte_i40e_pmd = { .id_table = pci_id_i40e_map, .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC | RTE_PCI_DRV_DETACHABLE, + .probe = rte_eth_dev_pci_probe, + .remove = rte_eth_dev_pci_remove, }, .eth_dev_init = eth_i40e_dev_init, .eth_dev_uninit = eth_i40e_dev_uninit, @@ -701,27 +703,7 @@ rte_i40e_dev_atomic_write_link_status(struct rte_eth_dev *dev, return 0; } -/* - * Driver initialization routine. - * Invoked once at EAL init time. - * Register itself as the [Poll Mode] Driver of PCI IXGBE devices. - */ -static int -rte_i40e_pmd_init(const char *name __rte_unused, - const char *params __rte_unused) -{ - PMD_INIT_FUNC_TRACE(); - rte_eth_driver_register(&rte_i40e_pmd); - - return 0; -} - -static struct rte_driver rte_i40e_driver = { - .type = PMD_PDEV, - .init = rte_i40e_pmd_init, -}; - -PMD_REGISTER_DRIVER(rte_i40e_driver, net_i40e); +DRIVER_REGISTER_PCI(net_i40e, rte_i40e_pmd.pci_drv); DRIVER_REGISTER_PCI_TABLE(net_i40e, pci_id_i40e_map); /* diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index 2e1c64a..8177626 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -1557,34 +1557,15 @@ static struct eth_driver rte_i40evf_pmd = { .name = "rte_i40evf_pmd", .id_table = pci_id_i40evf_map, .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_DETACHABLE, + .probe = rte_eth_dev_pci_probe, + .remove = rte_eth_dev_pci_remove, }, .eth_dev_init = i40evf_dev_init, .eth_dev_uninit = i40evf_dev_uninit, .dev_private_size = sizeof(struct i40e_adapter), }; -/* - * VF Driver initialization routine. - * Invoked one at EAL init time. - * Register itself as the [Virtual Poll Mode] Driver of PCI Fortville devices. - */ -static int -rte_i40evf_pmd_init(const char *name __rte_unused, - const char *params __rte_unused) -{ - PMD_INIT_FUNC_TRACE(); - - rte_eth_driver_register(&rte_i40evf_pmd); - - return 0; -} - -static struct rte_driver rte_i40evf_driver = { - .type = PMD_PDEV, - .init = rte_i40evf_pmd_init, -}; - -PMD_REGISTER_DRIVER(rte_i40evf_driver, net_i40e_vf); +DRIVER_REGISTER_PCI(net_i40e_vf, rte_i40evf_pmd.pci_drv); DRIVER_REGISTER_PCI_TABLE(net_i40e_vf, pci_id_i40evf_map); static int diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 73a406b..4b9e3d4 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -1566,6 +1566,8 @@ static struct eth_driver rte_ixgbe_pmd = { .id_table = pci_id_ixgbe_map, .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC | RTE_PCI_DRV_DETACHABLE, + .probe = rte_eth_dev_pci_probe, + .remove = rte_eth_dev_pci_remove, }, .eth_dev_init = eth_ixgbe_dev_init, .eth_dev_uninit = eth_ixgbe_dev_uninit, @@ -1580,40 +1582,14 @@ static struct eth_driver rte_ixgbevf_pmd = { .name = "rte_ixgbevf_pmd", .id_table = pci_id_ixgbevf_map, .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_DETACHABLE, + .probe = rte_eth_dev_pci_probe, + .remove = rte_eth_dev_pci_remove, }, .eth_dev_init = eth_ixgbevf_dev_init, .eth_dev_uninit = eth_ixgbevf_dev_uninit, .dev_private_size = sizeof(struct ixgbe_adapter), }; -/* - * Driver initialization routine. - * Invoked once at EAL init time. - * Register itself as the [Poll Mode] Driver of PCI IXGBE devices. - */ -static int -rte_ixgbe_pmd_init(const char *name __rte_unused, const char *params __rte_unused) -{ - PMD_INIT_FUNC_TRACE(); - - rte_eth_driver_register(&rte_ixgbe_pmd); - return 0; -} - -/* - * VF Driver initialization routine. - * Invoked one at EAL init time. - * Register itself as the [Virtual Poll Mode] Driver of PCI niantic devices. - */ -static int -rte_ixgbevf_pmd_init(const char *name __rte_unused, const char *param __rte_unused) -{ - PMD_INIT_FUNC_TRACE(); - - rte_eth_driver_register(&rte_ixgbevf_pmd); - return 0; -} - static int ixgbe_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) { @@ -7409,17 +7385,7 @@ ixgbevf_dev_interrupt_handler(__rte_unused struct rte_intr_handle *handle, ixgbevf_dev_interrupt_action(dev); } -static struct rte_driver rte_ixgbe_driver = { - .type = PMD_PDEV, - .init = rte_ixgbe_pmd_init, -}; - -static struct rte_driver rte_ixgbevf_driver = { - .type = PMD_PDEV, - .init = rte_ixgbevf_pmd_init, -}; - -PMD_REGISTER_DRIVER(rte_ixgbe_driver, net_ixgbe); +DRIVER_REGISTER_PCI(net_ixgbe, rte_ixgbe_pmd.pci_drv); DRIVER_REGISTER_PCI_TABLE(net_ixgbe, pci_id_ixgbe_map); -PMD_REGISTER_DRIVER(rte_ixgbevf_driver, net_ixgbe_vf); +DRIVER_REGISTER_PCI(net_ixgbe_vf, rte_ixgbevf_pmd.pci_drv); DRIVER_REGISTER_PCI_TABLE(net_ixgbe_vf, pci_id_ixgbevf_map); diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index ab7ed23..18da84a 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -5922,12 +5922,10 @@ static struct eth_driver mlx4_driver = { /** * Driver initialization routine. */ -static int -rte_mlx4_pmd_init(const char *name, const char *args) +RTE_INIT(rte_mlx4_pmd_init); +static void +rte_mlx4_pmd_init(void) { - (void)name; - (void)args; - RTE_BUILD_BUG_ON(sizeof(wr_id_t) != sizeof(uint64_t)); /* * RDMAV_HUGEPAGES_SAFE tells ibv_fork_init() we intend to use @@ -5938,13 +5936,7 @@ rte_mlx4_pmd_init(const char *name, const char *args) setenv("RDMAV_HUGEPAGES_SAFE", "1", 1); ibv_fork_init(); rte_eal_pci_register(&mlx4_driver.pci_drv); - return 0; } -static struct rte_driver rte_mlx4_driver = { - .type = PMD_PDEV, - .init = rte_mlx4_pmd_init, -}; - -PMD_REGISTER_DRIVER(rte_mlx4_driver, net_mlx4); +DRIVER_EXPORT_NAME(net_mlx4, __COUNTER__); DRIVER_REGISTER_PCI_TABLE(net_mlx4, mlx4_pci_id_map); diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 9113121..4eaabcd 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -739,11 +739,10 @@ static struct eth_driver mlx5_driver = { /** * Driver initialization routine. */ -static int -rte_mlx5_pmd_init(const char *name, const char *args) +RTE_INIT(rte_mlx5_pmd_init); +static void +rte_mlx5_pmd_init(void) { - (void)name; - (void)args; /* * RDMAV_HUGEPAGES_SAFE tells ibv_fork_init() we intend to use * huge pages. Calling ibv_fork_init() during init allows @@ -753,13 +752,7 @@ rte_mlx5_pmd_init(const char *name, const char *args) setenv("RDMAV_HUGEPAGES_SAFE", "1", 1); ibv_fork_init(); rte_eal_pci_register(&mlx5_driver.pci_drv); - return 0; } -static struct rte_driver rte_mlx5_driver = { - .type = PMD_PDEV, - .init = rte_mlx5_pmd_init, -}; - -PMD_REGISTER_DRIVER(rte_mlx5_driver, net_mlx5); +DRIVER_EXPORT_NAME(net_mlx5, __COUNTER__); DRIVER_REGISTER_PCI_TABLE(net_mlx5, mlx5_pci_id_map); diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c index 8421925..e140074 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_net.c @@ -2464,29 +2464,14 @@ static struct eth_driver rte_nfp_net_pmd = { .id_table = pci_id_nfp_net_map, .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC | RTE_PCI_DRV_DETACHABLE, + .probe = rte_eth_dev_pci_probe, + .remove = rte_eth_dev_pci_remove, }, .eth_dev_init = nfp_net_init, .dev_private_size = sizeof(struct nfp_net_adapter), }; -static int -nfp_net_pmd_init(const char *name __rte_unused, - const char *params __rte_unused) -{ - PMD_INIT_FUNC_TRACE(); - PMD_INIT_LOG(INFO, "librte_pmd_nfp_net version %s\n", - NFP_NET_PMD_VERSION); - - rte_eth_driver_register(&rte_nfp_net_pmd); - return 0; -} - -static struct rte_driver rte_nfp_net_driver = { - .type = PMD_PDEV, - .init = nfp_net_pmd_init, -}; - -PMD_REGISTER_DRIVER(rte_nfp_net_driver, net_nfp); +DRIVER_REGISTER_PCI(net_nfp, rte_nfp_net_pmd.pci_drv); DRIVER_REGISTER_PCI_TABLE(net_nfp, pci_id_nfp_net_map); /* diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c index 3b2d8ea..696a32b 100644 --- a/drivers/net/qede/qede_ethdev.c +++ b/drivers/net/qede/qede_ethdev.c @@ -1482,7 +1482,9 @@ static struct eth_driver rte_qedevf_pmd = { .id_table = pci_id_qedevf_map, .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC, - }, + .probe = rte_eth_dev_pci_probe, + .remove = rte_eth_dev_pci_remove, + }, .eth_dev_init = qedevf_eth_dev_init, .eth_dev_uninit = qedevf_eth_dev_uninit, .dev_private_size = sizeof(struct qede_dev), @@ -1494,41 +1496,15 @@ static struct eth_driver rte_qede_pmd = { .id_table = pci_id_qede_map, .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC, - }, + .probe = rte_eth_dev_pci_probe, + .remove = rte_eth_dev_pci_remove, + }, .eth_dev_init = qede_eth_dev_init, .eth_dev_uninit = qede_eth_dev_uninit, .dev_private_size = sizeof(struct qede_dev), }; -static int -rte_qedevf_pmd_init(const char *name __rte_unused, - const char *params __rte_unused) -{ - rte_eth_driver_register(&rte_qedevf_pmd); - - return 0; -} - -static int -rte_qede_pmd_init(const char *name __rte_unused, - const char *params __rte_unused) -{ - rte_eth_driver_register(&rte_qede_pmd); - - return 0; -} - -static struct rte_driver rte_qedevf_driver = { - .type = PMD_PDEV, - .init = rte_qede_pmd_init -}; - -static struct rte_driver rte_qede_driver = { - .type = PMD_PDEV, - .init = rte_qedevf_pmd_init -}; - -PMD_REGISTER_DRIVER(rte_qede_driver, net_qede); +DRIVER_REGISTER_PCI(net_qede, rte_qede_pmd.pci_drv); DRIVER_REGISTER_PCI_TABLE(net_qede, pci_id_qede_map); -PMD_REGISTER_DRIVER(rte_qedevf_driver, net_qede_vf); +DRIVER_REGISTER_PCI(net_qede_vf, rte_qedevf_pmd.pci_drv); DRIVER_REGISTER_PCI_TABLE(net_qede_vf, pci_id_qedevf_map); diff --git a/drivers/net/szedata2/rte_eth_szedata2.c b/drivers/net/szedata2/rte_eth_szedata2.c index f665248..9302200 100644 --- a/drivers/net/szedata2/rte_eth_szedata2.c +++ b/drivers/net/szedata2/rte_eth_szedata2.c @@ -1574,31 +1574,13 @@ static struct eth_driver szedata2_eth_driver = { .pci_drv = { .name = RTE_SZEDATA2_PCI_DRIVER_NAME, .id_table = rte_szedata2_pci_id_table, + .probe = rte_eth_dev_pci_probe, + .remove = rte_eth_dev_pci_remove, }, .eth_dev_init = rte_szedata2_eth_dev_init, .eth_dev_uninit = rte_szedata2_eth_dev_uninit, .dev_private_size = sizeof(struct pmd_internals), }; -static int -rte_szedata2_init(const char *name __rte_unused, - const char *args __rte_unused) -{ - rte_eth_driver_register(&szedata2_eth_driver); - return 0; -} - -static int -rte_szedata2_uninit(const char *name __rte_unused) -{ - return 0; -} - -static struct rte_driver rte_szedata2_driver = { - .type = PMD_PDEV, - .init = rte_szedata2_init, - .uninit = rte_szedata2_uninit, -}; - -PMD_REGISTER_DRIVER(rte_szedata2_driver, RTE_SZEDATA2_DRIVER_NAME); +DRIVER_REGISTER_PCI(RTE_SZEDATA2_DRIVER_NAME, szedata2_eth_driver.pci_drv); DRIVER_REGISTER_PCI_TABLE(RTE_SZEDATA2_DRIVER_NAME, rte_szedata2_pci_id_table); diff --git a/drivers/net/thunderx/nicvf_ethdev.c b/drivers/net/thunderx/nicvf_ethdev.c index 637794c..9ccf59e 100644 --- a/drivers/net/thunderx/nicvf_ethdev.c +++ b/drivers/net/thunderx/nicvf_ethdev.c @@ -1762,26 +1762,12 @@ static struct eth_driver rte_nicvf_pmd = { .name = "rte_nicvf_pmd", .id_table = pci_id_nicvf_map, .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC, + .probe = rte_eth_dev_pci_probe, + .remove = rte_eth_dev_pci_remove, }, .eth_dev_init = nicvf_eth_dev_init, .dev_private_size = sizeof(struct nicvf), }; -static int -rte_nicvf_pmd_init(const char *name __rte_unused, const char *para __rte_unused) -{ - PMD_INIT_FUNC_TRACE(); - PMD_INIT_LOG(INFO, "librte_pmd_thunderx nicvf version %s", - THUNDERX_NICVF_PMD_VERSION); - - rte_eth_driver_register(&rte_nicvf_pmd); - return 0; -} - -static struct rte_driver rte_nicvf_driver = { - .type = PMD_PDEV, - .init = rte_nicvf_pmd_init, -}; - -PMD_REGISTER_DRIVER(rte_nicvf_driver, net_thunderx); +DRIVER_REGISTER_PCI(net_thunderx, rte_nicvf_pmd.pci_drv); DRIVER_REGISTER_PCI_TABLE(net_thunderx, pci_id_nicvf_map); diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index ef0d6ee..1c2bf01 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1307,29 +1307,24 @@ static struct eth_driver rte_virtio_pmd = { .name = "rte_virtio_pmd", .id_table = pci_id_virtio_map, .drv_flags = RTE_PCI_DRV_DETACHABLE, + .probe = rte_eth_dev_pci_probe, + .remove = rte_eth_dev_pci_remove, }, .eth_dev_init = eth_virtio_dev_init, .eth_dev_uninit = eth_virtio_dev_uninit, .dev_private_size = sizeof(struct virtio_hw), }; -/* - * Driver initialization routine. - * Invoked once at EAL init time. - * Register itself as the [Poll Mode] Driver of PCI virtio devices. - * Returns 0 on success. - */ -static int -rte_virtio_pmd_init(const char *name __rte_unused, - const char *param __rte_unused) +RTE_INIT(rte_virtio_pmd_init); +static void +rte_virtio_pmd_init(void) { if (rte_eal_iopl_init() != 0) { PMD_INIT_LOG(ERR, "IOPL call failed - cannot use virtio PMD"); - return -1; + return; } - rte_eth_driver_register(&rte_virtio_pmd); - return 0; + rte_eal_pci_register(&rte_virtio_pmd.pci_drv); } /* @@ -1563,10 +1558,5 @@ __rte_unused uint8_t is_rx) return 0; } -static struct rte_driver rte_virtio_driver = { - .type = PMD_PDEV, - .init = rte_virtio_pmd_init, -}; - -PMD_REGISTER_DRIVER(rte_virtio_driver, net_virtio); +DRIVER_EXPORT_NAME(net_virtio, __COUNTER__); DRIVER_REGISTER_PCI_TABLE(net_virtio, pci_id_virtio_map); diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index e6873aa..f15cda5 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -331,26 +331,14 @@ static struct eth_driver rte_vmxnet3_pmd = { .name = "rte_vmxnet3_pmd", .id_table = pci_id_vmxnet3_map, .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_DETACHABLE, + .probe = rte_eth_dev_pci_probe, + .remove = rte_eth_dev_pci_remove, }, .eth_dev_init = eth_vmxnet3_dev_init, .eth_dev_uninit = eth_vmxnet3_dev_uninit, .dev_private_size = sizeof(struct vmxnet3_hw), }; -/* - * Driver initialization routine. - * Invoked once at EAL init time. - * Register itself as the [Poll Mode] Driver of Virtual PCI VMXNET3 devices. - */ -static int -rte_vmxnet3_pmd_init(const char *name __rte_unused, const char *param __rte_unused) -{ - PMD_INIT_FUNC_TRACE(); - - rte_eth_driver_register(&rte_vmxnet3_pmd); - return 0; -} - static int vmxnet3_dev_configure(struct rte_eth_dev *dev) { @@ -948,10 +936,5 @@ vmxnet3_process_events(struct vmxnet3_hw *hw) } #endif -static struct rte_driver rte_vmxnet3_driver = { - .type = PMD_PDEV, - .init = rte_vmxnet3_pmd_init, -}; - -PMD_REGISTER_DRIVER(rte_vmxnet3_driver, net_vmxnet3); +DRIVER_REGISTER_PCI(net_vmxnet3, rte_vmxnet3_pmd.pci_drv); DRIVER_REGISTER_PCI_TABLE(net_vmxnet3, pci_id_vmxnet3_map); diff --git a/mk/internal/rte.compile-pre.mk b/mk/internal/rte.compile-pre.mk index f740179..c7ee5df 100644 --- a/mk/internal/rte.compile-pre.mk +++ b/mk/internal/rte.compile-pre.mk @@ -87,7 +87,7 @@ endif PMDINFO_GEN = $(RTE_SDK_BIN)/app/dpdk-pmdinfogen $@ $@.pmd.c PMDINFO_CC = $(CC) $(CFLAGS) -c -o $@.pmd.o $@.pmd.c PMDINFO_LD = $(CROSS)ld $(LDFLAGS) -r -o $@.o $@.pmd.o $@ -PMDINFO_TO_O = if grep -q 'PMD_REGISTER_DRIVER(.*)' $<; then \ +PMDINFO_TO_O = if grep -q 'DRIVER_REGISTER_.*(.*)' $<; then \ echo "$(if $V,$(PMDINFO_GEN), PMDINFO $@.pmd.c)" && \ $(PMDINFO_GEN) && \ echo "$(if $V,$(PMDINFO_CC), CC $@.pmd.o)" && \ -- 2.7.4