From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0088.outbound.protection.outlook.com [104.47.34.88]) by dpdk.org (Postfix) with ESMTP id CEC16F963 for ; Wed, 18 Jan 2017 11:35:20 +0100 (CET) Received: from BY2PR03CA079.namprd03.prod.outlook.com (10.141.249.52) by DM2PR0301MB0749.namprd03.prod.outlook.com (10.160.97.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.860.13; Wed, 18 Jan 2017 10:35:19 +0000 Received: from BL2FFO11FD022.protection.gbl (2a01:111:f400:7c09::177) by BY2PR03CA079.outlook.office365.com (2a01:111:e400:2c5d::52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12 via Frontend Transport; Wed, 18 Jan 2017 10:35:19 +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 BL2FFO11FD022.mail.protection.outlook.com (10.173.161.101) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.803.8 via Frontend Transport; Wed, 18 Jan 2017 10:35:18 +0000 Received: from tophie.ap.freescale.net ([10.232.14.39]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v0IAYYhV003396; Wed, 18 Jan 2017 03:35:16 -0700 From: Shreyansh Jain To: CC: , , Shreyansh Jain Date: Wed, 18 Jan 2017 16:07:51 +0530 Message-ID: <1484735880-17178-4-git-send-email-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484735880-17178-1-git-send-email-shreyansh.jain@nxp.com> References: <1484660264-6531-1-git-send-email-shreyansh.jain@nxp.com> <1484735880-17178-1-git-send-email-shreyansh.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131292093188388159; (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)(336005)(39380400002)(39400400002)(39410400002)(39450400003)(39860400002)(39850400002)(39840400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(48376002)(2351001)(53936002)(6916009)(2950100002)(626004)(33646002)(77096006)(5660300001)(76176999)(6666003)(38730400001)(86362001)(106466001)(92566002)(105606002)(50226002)(8936002)(305945005)(356003)(47776003)(5003940100001)(68736007)(50986999)(2906002)(4326007)(104016004)(81156014)(81166006)(50466002)(110136003)(36756003)(8676002)(97736004)(8656002)(54906002)(189998001)(85426001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0301MB0749; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD022; 1:hyQR7vln8IbbKF0WomqwUPDtqRECBNcm4kp9huC8nvM+Vo+jON9/Y4cAfWwuJUyZjUUDihTw8x/Y0V4Sk1DPch04XMfiUrl3lJjJdQMGI/j5H92lEE7COh8qfUIOhvDoU4r3TEn9EnIOYpU+DTN1zu4PZBFTrCfgiLa17OX6Ufi438R4ZuNxoucUUs4ZU1G4GttyPqyP0qkddkkTWIxmSvb1GpTBmDv0XUpL+eKzVuqCbwM0BMJkN/D7L7oKWBaL5eOUC9WMiEE32Sj16+0laWs0XDRS04NHBsCrtbx60Hw9UpmZA4fx5b7uanWXwVFP8FjnV0KLBRN+rkhuh/lkqfTDM4LsbRn2JsKsdXOG4ccHuX3mVvKxpEjvoNXatkftVd4oRgECY6hnZFPv+WuKvTxpEUsqZVV9/WhlMk2ADjxBJjP9i45njp/I0B1/lAXwnjmRkvkpHgclB6GRsQ3sAiB1XoeKQvZaAFQYXX/QVNgJH3/CFRtf/+u7AU/fQvfYzR5L7EChNPWfkpNMogODFmNjpOfcqmow1/F0ksZcxyhpLmRK9/7D1UT/bmgUbWYzqE0O7Wg5SD1G/nqzBAzP7C5CrSQ/mexxZAdNAW4fKfi8KC8ELEw7m0p5lkkTF1cJ3poGXu8kKB6WapTsyBAbwlTGBbqabCod+SeGqu/mSXmeZeDHcdrdlu+ldZBWDvM+txjRR1SqAtxiFKNbcKLnVg== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 2a4239f0-d3c7-4d7c-b53f-08d43f8db2c6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM2PR0301MB0749; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0749; 3:SjmA8BKtjj7TMUTvIScPuRp1NHrBGsseq9BVOalWvPvCBOOMwA30qDAHd+2pfFUq8OerTsnddoHByw+yULZgWqq0/ITWk3L+D+uN1oumdKmcumkLbTMQDyWA6RmHB19TpsEodacZZ4u4WhWf8Jux9FIGoa9eYEu4hofS4/akb7+Z22UIRKzlc3KFGnG8cmwvuc1JNY/2W+aybdf3s1mJqPbcSyAACUjC7b5zV/XFpol3xdAdY5LWoy1b3wprlgJs0CGUaH9FXLyB6yfLfSXXe9genhaHuhtGVL5261RVXVtmyLGGI1wk2dhDFgX5opTwD7AfLpeJ6HhWPe33kM0n7PkeuHJ44R7DwfafWQ5NNO0weAfIkXQOzFScMtrObSkB X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0749; 25:uc9HLEfdIwzMvlhV2GZRu8uY6TYHbQUz+bAcWR9AkSOxfzzQnemQIdle8IbDWxJBbLMYHFikUN3T420KSPmwrKox3mWXVWiNnShTUQAfhlbbvEwXlkDlzLwTkoG3QEz68qYVGVIMKr+b+eqkbYw4OnDsN7hrpuVYBt74x4jm1/f9uWWuzThYSKrKem+eYfF4noPzzcWsc54R7DT294HSHZwiN6uwbhMAbxfYuRDbKud8cuM8+y2nC39zHspZ9FMshR83IqJJvIRyqxH0t0uaknjNem+0ZkyyH9/ovUOKZ0PEX42D/pWz2B6JMvfQ839eqAGxT+5LFPmxkmNOOZ5oOGTXy+xmRRdnTJLHJlf6Pv18grHJY4g/pDNgnvSQ/NDqlxw5OybZ3VZ4G1x1ZWAjdh4O0/G6YbdPRbNhu1FhjM8Rbstcg7f1W2lGXhNi9CFtalkliyge4U3gfHbL63360QApMKtM+zTGw2o5D/pziIdVEXUIZEKKVLRCuP6MuYRdrOh1zy0CPnIRBm5dG1AGTqNtZwufsS4mf9vyFLGcQr9Uo1BJfe8c2Hgw4576IOkjSK3wrBvLnXBol46xXD1S1jXfat2bEjzWXbigyVf9pDmF9/4MWUW2N991dNLYiUXu3ygAgeygP2j7XSsqkuv0su05LrgSuj7oiX+hNsjDZY8mClnDuS6zQNtvW7LipqErhHZmxHAHX9yPvipuZcLQ9J2lVD6pgW4bKB1ro1qKjVrJUICHhpeYeEwhRBn2TbqY8Pb8Il5il/xMR0e0Yt7RRddxG40HURmKvV3zsRPf5DY= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0749; 31:b0MLIEaxoWHC1KTUazvgO+4njUekK4ApzMeJd/Fr4arwCsd5oluqcK3RuokIaeLTKuP8FIXLycUmBPJ1Oqy9kU4j6JFqa9CzuXKor3bwtr0tPZUagW07/nnYWp3srrx8brBUVNeRAdbsPYiBxHekeUIHXWALW6yGwxu6n9Z0bNPDQcGjo/+KlteUmDXoBJGSgvCNHtT5zZLhpJBxDPtRDjmGPybyjAHKmpUFya+z9p+Gc3j0QnW0a43A/O08ZYyTeUR02bh06zXU2d95+Stzpw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13015025)(13024025)(13023025)(13018025)(13017025)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6096035)(20161123565025)(20161123563025)(20161123556025)(20161123561025)(20161123559025); SRVR:DM2PR0301MB0749; BCL:0; PCL:0; RULEID:(400006); SRVR:DM2PR0301MB0749; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0749; 4:Zb8x2xp9ydRI78ObJBAn3H4WwwodFx3jbHI4xvfbExmHnK0kspmUk4Anel0QFDFtLqewb6OWVYz/MD5p/MhNX7jZaCTu8b2822nQ6rl1HgORQy3CBirBwNf4erENWD522wq5gqP13uF8jP1ubnGZLrAZHEd/vcuGGjha2IxUGie2vYOC7x+X1KOYOohdM98vvB7PkubA8qcr0oQXu9cFcaarLM4cGMBsK+JPatLtK0FQHHv1BTyHfZa3quLmPEFQy2NzAIicoiiH5PS4XpT3fJFfV8txX1/5dXJI1eW9f35p3x2dS5xpFpIBkMk7tc56MUBgk73oSrlH/eKUKD86nc4Az7fiCD16pt1un7xrSkeHzlgSwzk/DXCphpgyKxQGnrjtks29V7ho7AtGuuIx2vizWMPwarPXE2rOPGezk8p3bTTB4bkqKCCEO7+CByySwQyiB0hGrsYJzbpxW+or2MNLgN2wa/XMCexrhMKnaAi+5GzwTNbbvrB02ip0jHZEONYONLYmtnX0XMRer0Bq5hhfDAwV1zNdFOFS67Hz26L+9fLpN4gpfdfcDOPxHlf7MqkPUV8Vjfp1Ol9M5gdlP35FIUxN9tXAOLXkb36rwliumwL/kanPQvkBlDOcKlt/37jUJMD6T2XYvxT1MBGuy2y7OV2oyRMkstwdvx5fk1TbCTjqa8Ffw9WkockKwsxmkQ4eViC0SUZF4JGXpHJvm0KvU5oJRKgEd1RdnKi+esbYWi3WgHEqHF7RsJ4aZUUI2YeI+FT4mnM9IXij9a0m5g== X-Forefront-PRVS: 01917B1794 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB0749; 23:RnE1uoQD8bVm/v5UTM6ykDm7ll7VhIEcaSLSVh/?= =?us-ascii?Q?dS65fjiHPTJBlekXIqOSI0IeZUG6/K83Ctw9Om7CFK3l4NkG1TokWgHSFOtT?= =?us-ascii?Q?BEUL0PxIAo6gq76oHwl3qOzWiL2x5SWQ4KE1QOtE02NZzo3ayt3MKSZOPdOr?= =?us-ascii?Q?Tu3DY0awKQJI/bUJWdv7ei6G6K4/gerWP3zsNg51qH9Q22fn3iWWO9LcqRqL?= =?us-ascii?Q?WPP6vywh64DEp0+3zmgdMFFAICMpS8LGyyTiZV4abLAfWjtX1uauwo6Sr6gJ?= =?us-ascii?Q?RvtaU9jLokX2W33ajOQiwmeALPNxaZoY63kXq04DCojhNg6jTVTykajPR/ZG?= =?us-ascii?Q?jXstGGfwTCiGpPkAOYuJVbrcERyotfyYp5pEBAIHvxfRBBtIX0A8R//bo91q?= =?us-ascii?Q?cbAlAwz0N721uC7NS9y8b4Z2ujxjj1Cz6E5AcqFmC4goFPFI3UjKKoc3mP0q?= =?us-ascii?Q?2aFqNA5NpqbS10kxEQnZBiXQAE+b1tEPrgnRJ9BERe+Kn9oFAgRl+UQjhlzK?= =?us-ascii?Q?QFWbSNgJDlbWdYhoAUJ4cW9W8f747g/NFWYRZ5fHpXpevfntNMuBNyiVhVpT?= =?us-ascii?Q?7qdxb4ACmVanURFguUDSBTh0fPbPQTcXCbLEW4LBNTCPRFZGc2gZdsgA4sIJ?= =?us-ascii?Q?4CKMzGfYWd/+8idUV9fTBu1TUtbcYL2CZXWqQj3Oo6yWJRSE1Sywo5+egrtm?= =?us-ascii?Q?Fbk4+Z2A0lIUmbLNSnzmKNooQ7UrEzKR3R1/9c4vas1YZDnEdWKUCH46rZHx?= =?us-ascii?Q?hkOcp7TsoLmXjsDb/nqTcWGob0h3T6oUuan3p6T8xn2uz4wyI5B7uTeN39rG?= =?us-ascii?Q?gy4Hmwv2MN/qLohJDM0czEwk9RokMR1AEIwgJ+Oy+N8A/L/F1xH9CpqWH92O?= =?us-ascii?Q?8zROhFPi6m+A47lSl0YG5WvTg/wefcTKPiHIF5QBCQg9Kllq3QWZdEtPb/xw?= =?us-ascii?Q?I4W+ginGuM+QU3JQKJiouSPEcYfqeaeN/w2xRmaY1jIxLSMHROaXzg0YN27S?= =?us-ascii?Q?8IEaUBlYd7zxIShgHLHUj80VA0dK5PDCBCyRZbqnCVn6Lc5VKqzEk4eHRFKv?= =?us-ascii?Q?Vl32SYxphrGXq+JnJMRWrxplzWa5blEXuT8qpukCSAviyYG4uEVZSCe2pLkz?= =?us-ascii?Q?xHWAl2L504XbkfBcoDeaGtY1Pk7bdNTpEYzqAIW3P8ERYgaSKflMCTtPwCiT?= =?us-ascii?Q?6dlfylh6iWWM7y7RAq+pJ1e8cqR1G1UiaIxDDU4c4JCcB/md6oVUL6BpGjyd?= =?us-ascii?Q?37YStIFzQCC2NdrFAeSNf77ABTcTV+Bs0iRaCOj2I/pVhtEcsJ72zP6SDA0Q?= =?us-ascii?Q?jzO26Ik5dmbYpdFj94uNJFTE=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0749; 6:ALh5EDOf04JwNZYUw+lrVtukH01P0qiOyk9VqxKSBU1BTvOAZicJ/awbC348/9DrQmBaBWeRvXjfyWmoHNxKWWgV/lOanvBlPNMsBDhfY8juoRwr2c/oVFjs3FV/ZVfzYarzLO28vlGBw9k22mY83BHqj3s6meKzYq0+plJMNorUzKYUGu2iaHbEHH7IpOKO9Jz2susZcLzeCpF+HvqEeRRIsrxVuNsCPAl7S2Qv79Onm1R9mhEMMCVJ0DPWVWj2JzN7P8FX1nGb0t9aBiynnGDAYLWmFbyfX9s10G+629K+OivdN6X8g1N7Lx1fB5aoDJFOx6alkeKCi5rJnUTLkJkpGxgtIK2byy2o0n0RxewaR0VWb7JRbVfq2XbVYhkYZPt6QRkgQJjrxy34NvrJ0EUzlHr1BmADURC+/8Ud2w1PXHMWMJEbUm/PDuyuMAh6; 5:d4BLNzawyOnvSV2EpNrmIyODvrSQfQFopyHodJpv/fI5gUGfi2Rh1OVwkig01Sbz60fWNK6iBrR0khDT9rCM3jxEXpT9iKPB63Pg803gNSg9lqG8pJ0VK3AlT5PfCenkhAtrX20t4ppt3w7Sl3/Nhjr6jPkGmquejmyO/tKFMeQOH/7oET4nh8DiAagFCj5W; 24:JsbwuRQYv4joUTva0iHGqdCBojxfKZTwOx1uVpyTfrrBvaPPqfIGpYbFrJNEW8S/7yPewGooVD8TRBfNZIKdK5Yxl9eVDmvY9Ts+HBUQeiQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0749; 7:qzBbtccjq8nup6ZTTzuJ09xUJqYs+ELKTWzdq+MWeE3ya/zi5SPDdEAhQWv+hRSn9BxxOjzfP00WEDhOY+R0c6/6cDhjl4mlk4/91blxK1jN+Rc8yJ13gO3nPpXhTL5Lh7BIVYDMgTxphyPLnPNTUbTg9abn1dVc9tJg3PfuE/RQl2vj6taIG+NM7JylwYVVOmmis/c0HwaY/HY4xmFSk3lVNvC/jt0f/x0T+ZvSt+yP4Ym/splYIRyrhEBb0S+2w807H/oRKUGgIwSxjx/V/CoWImMC2k/GT+l2fD35uefuF6R+/7XKySUjqGV8Oe8/Okr6R9JBeyTeTqr6yfBK08JtrITsEh1ui2YLny3wVKKYNECT1Z4OQKNekE3EH12pen0Bx/UkhKMbc8A7K5se2CH+ihMm7hnPtDN4qI5eaiUU8eX7FuziDfFhKviNPz6iTXQVevQcuzwhaN3nXSxrkg== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2017 10:35:18.6516 (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: DM2PR0301MB0749 Subject: [dpdk-dev] [PATCH v9 03/12] pci: split match and probe function X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jan 2017 10:35:21 -0000 Matching of PCI device address and driver ID table is being done at two discreet locations duplicating the code. (rte_eal_pci_probe_one_driver and rte_eal_pci_detach_dev). Splitting the matching function into a public fn rte_pci_match. Signed-off-by: Shreyansh Jain Reviewed-by: Ferruh Yigit --- lib/librte_eal/bsdapp/eal/rte_eal_version.map | 1 + lib/librte_eal/common/eal_common_pci.c | 189 +++++++++++++----------- lib/librte_eal/common/include/rte_pci.h | 15 ++ lib/librte_eal/linuxapp/eal/rte_eal_version.map | 1 + 4 files changed, 121 insertions(+), 85 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map b/lib/librte_eal/bsdapp/eal/rte_eal_version.map index 4dcf653..c015889 100644 --- a/lib/librte_eal/bsdapp/eal/rte_eal_version.map +++ b/lib/librte_eal/bsdapp/eal/rte_eal_version.map @@ -182,5 +182,6 @@ DPDK_17.02 { rte_bus_dump; rte_bus_register; rte_bus_unregister; + rte_pci_match; } DPDK_16.11; diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c index 72547bd..4f155c6 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -152,129 +152,148 @@ pci_unmap_resource(void *requested_addr, size_t size) requested_addr); } -/* - * If vendor/device ID match, call the probe() function of the - * driver. - */ -static int -rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *dev) +int +rte_pci_match(const struct rte_pci_driver *pci_drv, + const struct rte_pci_device *pci_dev) { - int ret; + int match = 1; const struct rte_pci_id *id_table; - for (id_table = dr->id_table; id_table->vendor_id != 0; id_table++) { + if (!pci_drv || !pci_dev || !pci_drv->id_table) { + RTE_LOG(DEBUG, EAL, "Invalid PCI Driver object\n"); + return -1; + } + for (id_table = pci_drv->id_table; id_table->vendor_id != 0; + id_table++) { /* check if device's identifiers match the driver's ones */ - if (id_table->vendor_id != dev->id.vendor_id && + if (id_table->vendor_id != pci_dev->id.vendor_id && id_table->vendor_id != PCI_ANY_ID) continue; - if (id_table->device_id != dev->id.device_id && + if (id_table->device_id != pci_dev->id.device_id && id_table->device_id != PCI_ANY_ID) continue; - if (id_table->subsystem_vendor_id != dev->id.subsystem_vendor_id && - id_table->subsystem_vendor_id != PCI_ANY_ID) + if (id_table->subsystem_vendor_id != + pci_dev->id.subsystem_vendor_id && + id_table->subsystem_vendor_id != PCI_ANY_ID) continue; - if (id_table->subsystem_device_id != dev->id.subsystem_device_id && - id_table->subsystem_device_id != PCI_ANY_ID) + if (id_table->subsystem_device_id != + pci_dev->id.subsystem_device_id && + id_table->subsystem_device_id != PCI_ANY_ID) continue; - if (id_table->class_id != dev->id.class_id && + if (id_table->class_id != pci_dev->id.class_id && id_table->class_id != RTE_CLASS_ANY_ID) continue; - struct rte_pci_addr *loc = &dev->addr; - - RTE_LOG(INFO, EAL, "PCI device "PCI_PRI_FMT" on NUMA socket %i\n", - loc->domain, loc->bus, loc->devid, loc->function, - dev->device.numa_node); - - /* no initialization when blacklisted, return without error */ - if (dev->device.devargs != NULL && - dev->device.devargs->type == - RTE_DEVTYPE_BLACKLISTED_PCI) { - RTE_LOG(INFO, EAL, " Device is blacklisted, not initializing\n"); - return 1; - } - - RTE_LOG(INFO, EAL, " probe driver: %x:%x %s\n", dev->id.vendor_id, - dev->id.device_id, dr->driver.name); - - if (dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING) { - /* map resources for devices that use igb_uio */ - ret = rte_eal_pci_map_device(dev); - if (ret != 0) - return ret; - } - - /* reference driver structure */ - dev->driver = dr; - - /* call the driver probe() function */ - ret = dr->probe(dr, dev); - if (ret) { - dev->driver = NULL; - if (dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING) - rte_eal_pci_unmap_device(dev); - } - - return ret; + match = 0; + break; } - /* return positive value if driver doesn't support this device */ - return 1; + + return match; } /* - * If vendor/device ID match, call the remove() function of the + * If vendor/device ID match, call the probe() function of the * driver. */ static int -rte_eal_pci_detach_dev(struct rte_pci_driver *dr, - struct rte_pci_device *dev) +rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, + struct rte_pci_device *dev) { - const struct rte_pci_id *id_table; + int ret; + struct rte_pci_addr *loc; if ((dr == NULL) || (dev == NULL)) return -EINVAL; - for (id_table = dr->id_table; id_table->vendor_id != 0; id_table++) { + loc = &dev->addr; - /* check if device's identifiers match the driver's ones */ - if (id_table->vendor_id != dev->id.vendor_id && - id_table->vendor_id != PCI_ANY_ID) - continue; - if (id_table->device_id != dev->id.device_id && - id_table->device_id != PCI_ANY_ID) - continue; - if (id_table->subsystem_vendor_id != dev->id.subsystem_vendor_id && - id_table->subsystem_vendor_id != PCI_ANY_ID) - continue; - if (id_table->subsystem_device_id != dev->id.subsystem_device_id && - id_table->subsystem_device_id != PCI_ANY_ID) - continue; + /* The device is not blacklisted; Check if driver supports it */ + ret = rte_pci_match(dr, dev); + if (ret) { + /* Match of device and driver failed */ + RTE_LOG(DEBUG, EAL, "Driver (%s) doesn't match the device\n", + dr->driver.name); + return 1; + } - struct rte_pci_addr *loc = &dev->addr; + RTE_LOG(INFO, EAL, "PCI device "PCI_PRI_FMT" on NUMA socket %i\n", + loc->domain, loc->bus, loc->devid, loc->function, + dev->device.numa_node); + + /* no initialization when blacklisted, return without error */ + if (dev->device.devargs != NULL && + dev->device.devargs->type == + RTE_DEVTYPE_BLACKLISTED_PCI) { + RTE_LOG(INFO, EAL, " Device is blacklisted, not" + " initializing\n"); + return 1; + } - RTE_LOG(DEBUG, EAL, "PCI device "PCI_PRI_FMT" on NUMA socket %i\n", - loc->domain, loc->bus, loc->devid, - loc->function, dev->device.numa_node); + RTE_LOG(INFO, EAL, " probe driver: %x:%x %s\n", dev->id.vendor_id, + dev->id.device_id, dr->driver.name); - RTE_LOG(DEBUG, EAL, " remove driver: %x:%x %s\n", dev->id.vendor_id, - dev->id.device_id, dr->driver.name); + if (dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING) { + /* map resources for devices that use igb_uio */ + ret = rte_eal_pci_map_device(dev); + if (ret != 0) + return ret; + } - if (dr->remove && (dr->remove(dev) < 0)) - return -1; /* negative value is an error */ + /* reference driver structure */ + dev->driver = dr; - /* clear driver structure */ + /* call the driver probe() function */ + ret = dr->probe(dr, dev); + if (ret) { dev->driver = NULL; - if (dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING) - /* unmap resources for devices that use igb_uio */ rte_eal_pci_unmap_device(dev); + } - return 0; + return ret; +} + +/* + * If vendor/device ID match, call the remove() function of the + * driver. + */ +static int +rte_eal_pci_detach_dev(struct rte_pci_driver *dr, + struct rte_pci_device *dev) +{ + int ret; + struct rte_pci_addr *loc; + + if ((dr == NULL) || (dev == NULL)) + return -EINVAL; + + ret = rte_pci_match(dr, dev); + if (ret) { + /* Device and driver don't match */ + return 1; } - /* return positive value if driver doesn't support this device */ - return 1; + loc = &dev->addr; + + RTE_LOG(DEBUG, EAL, "PCI device "PCI_PRI_FMT" on NUMA socket %i\n", + loc->domain, loc->bus, loc->devid, + loc->function, dev->device.numa_node); + + RTE_LOG(DEBUG, EAL, " remove driver: %x:%x %s\n", dev->id.vendor_id, + dev->id.device_id, dr->driver.name); + + if (dr->remove && (dr->remove(dev) < 0)) + return -1; /* negative value is an error */ + + /* clear driver structure */ + dev->driver = NULL; + + if (dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING) + /* unmap resources for devices that use igb_uio */ + rte_eal_pci_unmap_device(dev); + + return 0; } /* diff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/common/include/rte_pci.h index 8557e47..adc20b9 100644 --- a/lib/librte_eal/common/include/rte_pci.h +++ b/lib/librte_eal/common/include/rte_pci.h @@ -371,6 +371,21 @@ rte_eal_compare_pci_addr(const struct rte_pci_addr *addr, int rte_eal_pci_scan(void); /** + * Match the PCI Driver and Device using the ID Table + * + * @param pci_drv + * PCI driver from which ID table would be extracted + * @param pci_dev + * PCI device to match against the driver + * @return + * 0 for successful match + * !0 for unsuccessful match + */ +int +rte_pci_match(const struct rte_pci_driver *pci_drv, + const struct rte_pci_device *pci_dev); + +/** * Probe the PCI bus for registered drivers. * * Scan the content of the PCI bus, and call the probe() function for diff --git a/lib/librte_eal/linuxapp/eal/rte_eal_version.map b/lib/librte_eal/linuxapp/eal/rte_eal_version.map index b553b13..5ed2589 100644 --- a/lib/librte_eal/linuxapp/eal/rte_eal_version.map +++ b/lib/librte_eal/linuxapp/eal/rte_eal_version.map @@ -186,5 +186,6 @@ DPDK_17.02 { rte_bus_dump; rte_bus_register; rte_bus_unregister; + rte_pci_match; } DPDK_16.11; -- 2.7.4