From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <shreyansh.jain@nxp.com>
Received: from NAM01-SN1-obe.outbound.protection.outlook.com
(mail-sn1nam01on0050.outbound.protection.outlook.com [104.47.32.50])
by dpdk.org (Postfix) with ESMTP id 128902A62
for <dev@dpdk.org>; Tue, 17 Jan 2017 11:06:21 +0100 (CET)
Received: from BLUPR0301CA0035.namprd03.prod.outlook.com (10.162.113.173) by
DM2PR0301MB0751.namprd03.prod.outlook.com (10.160.97.147) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id
15.1.845.12; Tue, 17 Jan 2017 10:06:20 +0000
Received: from BN1AFFO11FD030.protection.gbl (2a01:111:f400:7c10::131) by
BLUPR0301CA0035.outlook.office365.com (2a01:111:e400:5259::45) 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; Tue, 17 Jan 2017 10:06: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
BN1AFFO11FD030.mail.protection.outlook.com (10.58.52.168) with Microsoft SMTP
Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.803.8
via Frontend Transport; Tue, 17 Jan 2017 10:06:19 +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 v0HA67Tg024558;
Tue, 17 Jan 2017 03:06:16 -0700
From: Shreyansh Jain <shreyansh.jain@nxp.com>
To: <david.marchand@6wind.com>
CC: <dev@dpdk.org>, <thomas.monjalon@6wind.com>, Shreyansh Jain
<shreyansh.jain@nxp.com>
Date: Tue, 17 Jan 2017 15:39:28 +0530
Message-ID: <1484647774-28984-4-git-send-email-shreyansh.jain@nxp.com>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <1484647774-28984-1-git-send-email-shreyansh.jain@nxp.com>
References: <1484581107-2025-1-git-send-email-shreyansh.jain@nxp.com>
<1484647774-28984-1-git-send-email-shreyansh.jain@nxp.com>
X-EOPAttributedMessage: 0
X-Matching-Connectors: 131291211792954773;
(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)(336005)(7916002)(39410400002)(39450400003)(39860400002)(39380400002)(39850400002)(39400400002)(39840400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(6666003)(50466002)(110136003)(5660300001)(68736007)(2950100002)(2351001)(48376002)(47776003)(30001)(106466001)(50986999)(5003940100001)(105606002)(6916009)(92566002)(36756003)(50226002)(305945005)(76176999)(626004)(2906002)(97736004)(38730400001)(77096006)(8936002)(4326007)(33646002)(189998001)(81166006)(356003)(104016004)(8676002)(85426001)(86362001)(54906002)(8656002)(81156014);
DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0301MB0751; H:tx30smr01.am.freescale.net;
FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en;
X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD030;
1:W2WH5TZgezi++EZbDLAluh7SnCWic0nXF/nxK7HsbNk0d6Ebze8q4DwvmynSAnbp8Ud+s3xBG7Bufr7f3jnueDiupHgDXi5q+c0tYEx94NDYYYzfttbx4t2MqGTDQG/ZNg23IN8aeLfehHZdhaCWt+YYKPU/Ks7EglGZj82bQgjnrfJz1xShBxLzfRqgnXS4uc2+cedQO+Ke3xXOLUwv/A99WYu0Wg/bEa1Nv2rPxGpBJWfpUs9x7zyiSdenNzToZg7rpqQA5t5YoZ4+Rbyk3aAdg4I1G6DmOLsuqSFRcGqdFHg6EMpYoIDWTv3uXBAZgavnpHDtV2e5Srw0dkGvoKgkTZHZGY79H9r3GkHwJtmcffxUWpf6dpS0ZIbId1uJ3LrrxUIlIqGFG5WnT3Nnd2pUsaPo+2a6y48wX8931Bd7VMhzk0FQZq//n1daznzGd3ZyWToH2YOWpPSyKp9mRoJqAnWwuo64+mw2+n48lIqsh8DAnCR78f09lDKbdz+ITccW3b+itgWpJzYyx88evqM94VjDl3dWxBTTYLUwyFGwCmls3u0RMWI4/BPhkGIeigqEflgg3edKiJxywMyIPRP4n7nC+aR2jV0NdgZj3KyOG+ZSLT90riTC4YirhdD80pLwsq0npZw+L9Vb+IOvm0W2clUslseY+4bD1A+s7fvRhohNzG7Ro1mmKwRmusZL0zhEm7ThpwLPLbreOlXy5A==
MIME-Version: 1.0
Content-Type: text/plain
X-MS-Office365-Filtering-Correlation-Id: 7171bb45-512f-40fa-5438-08d43ec07b81
X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001);
SRVR:DM2PR0301MB0751;
X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0751;
3:vE6ZZXLHJc4SXWiEZTSplW0Z1aVnmF/gVj8JPOPWuS9gPwGSZsVJBaCuJ6YSw9fviOBsv4hNFnjTF/0UJLezo8Ow/u8ZkS94gN0cKgeqLwsG0EyEW5gWt4Jij8jCvy+pxEguhNN60+n/KuI2dvmBrnBXW7hHks48aqvOYP4db6Uc1MIMzhSB6LF90COtSr0wuf2lTsotpwLJvlXFZghjqsECQAg1iz+bwPpEBi8PageHVYkUCZsmpQYmJUnxrh8Hhdt3u7JzPSEbWO2iN/Mo6I+DNEk3/RJ66Qi7UxeRpOGLWGFHaaroVEeUyHsxYw/IOthWZJMYXIbg35qNjYFNT5eDS4Qm2yiiUK1EO12V6TJJcJUfLr7g07Thxobkm7rs
X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0751;
25:gb3CTaEJ5PqyoEdbP10pCNKUM5nXRXh+IAQzvwZJvx8FNArVzyWKXgExaQ6NQYe0zL4x+tsWIgkvnHliO2PMuLStfDozP4TqvRM6T65yAHQ9L42qT95BwR6GBt5UzKGXtiOK2SHQhtc72nle8JJrxwnh/28wte0Y0C1fmZpJvXA+uSCvZWQvlyXDOvo2IhgxAFT4m/6dKzK/08qlN08bwlCUN+5PBj7WSrVN5d+G3p0f2qrT2tB76Ho4ezonbVcWLLKM1ZKtQiCV79f6OgcLqzRkVRQ3ciHw/Qo1bzMCw0NGwUW/EU1/cgnYebz23MUMmlST+XJv16XTRLZYl1i0PDadvfTzKPFnjO+M434yTL8Z6xlyiXuA1VbuVoZce9VcJsrulhaF7GEHHGsyjNMUgubS09frLSUZJOFnB6YW2sl+owZJu7cxqG4e+uV9zWpcgKaAeE8MtX+l/DMJdZnQCqvVJA+HYUhKcRkmvh/CoF8sh2LQqxVkLQsYFkFQSGnmLSyr5Cvf+JqYbmSQ/7LZmucL0xD8U8S+ZWk6ydZ8ej7kNJhBS840lCSP4VcGVz2hHF9PGMYnqr4kWr4DuWXLPankLOhDkT4PV8K0w0HIqSdzEvunEjaQw1Sd70JC3J8tUgvDjehWw7nUoDKUxpsMr2znVRBdcpAJc4SzaZaPb+PjaqOrIhYAkeo0C2iONOetP7FUwGg1pNJoDd6TWgFndaTwSxOioGAbXNK5wjYETXsx1RRFxsQWrUgIwKDG5Cr7ObE5UzdoWBbS2CQ1f6amX94gYwFfkudbTtypbkiZLVo=
X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0751;
31:9vZI1pmlHYKnrcEAulLmQQXYSRZ8YJgJXvXVe5UmvzgyDCEKuPga31FdB6PQ+Ux9Mkb7f5UCo3WD4ui1qdG3SwjRPJPWBhdjV6fVi4YcHfI9ZEh+E+I71R4rdA4w1m86mWZc5cIymmVEvaUTuG7v0U5YUQBf2zSp7iEH4rJmxfLhk2oHezYb821gPExqXA/PIRWPpepRUsXRUg4XieQq7lZYXYEWGC7BijzadhbuK7OiEvuY9/hSQTkSlGrrX01/SywDUPa2XmRO5riISB4KuQ==
X-Microsoft-Antispam-PRVS: <DM2PR0301MB0751A9314EFE0983455A1EEC907C0@DM2PR0301MB0751.namprd03.prod.outlook.com>
X-Exchange-Antispam-Report-Test: UriScan:(185117386973197);
X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0;
RULEID:(6095060)(601004)(2401047)(5005006)(8121501046)(13018025)(13015025)(13017025)(13023025)(13024025)(10201501046)(3002001)(6055026)(6096035)(20161123559025)(20161123561025)(20161123556025)(20161123563025)(20161123565025);
SRVR:DM2PR0301MB0751; BCL:0; PCL:0; RULEID:(400006); SRVR:DM2PR0301MB0751;
X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0751;
4:vgVUspw/SucUAhFpPOokQQQ0hiwcb37Tzg7hbKbXa66y+EUsTDvzgNtSm7ASrcwX2dxlcnsR/i4ecRbE5q6cF+3jKhw8jeQ8Ju9THgWZGEouzv7s000yGTpvqIf2Gvpj+OUabsHiMgT4dl3sVBG6g2WvdUCNKUWPsJCi4Nj2ogPPTtsrKuRElbO1G19tvP7RGAOgdvc4eobp81RIrcOEvAw97P9eLJoGL69LYCJXJ/LQT4R8hswH9ynzNckeGf5eqn4etgv9mchJFwlc9IMnewymBjEHrIT3teoB13ZJq9cSCCsIO7uh3of3AIXezA21UAfkp/xJw6Oora8qvD3TUfSMEtL8nlhse9PKa8SId5ihYyFTsBsV3UT2gBGjc70EAfikguA6Nq9Nx3kYIe8t4Vz3dKcej5r1/7ycsfYD6d5ToMx152ZpQslOG7FNpF3r3UC9POgzcDlwrEuSyBBpA/FXVxCQFeV5tRYbA7ItY7qV3pZF+LfZjNPoBw4U0gnkyVngZFDkE6gZWHS+AtHhT4cmya4H8LAQZuEHjkVzajnedinkYm4SSmD9Vaz9NsDw4OtLb4O445wxhS1bghKsAQxIu+3VErUd/3yI6W0pMidDMk4wrpJhIrcww1ivwCQiCn4hTJx0f+egQxlNzXfOIy/JmPbQD9PKNYq/jL3kGhiVhjHXGYv4NeBOFsUyJwANXxmAdpXKZppI1nXSafTQVu56/2agAHxSnTcPON3HDTfcNNvFtSftAEaLXstGiXC/
X-Forefront-PRVS: 01901B3451
X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB0751;
23:eIEjlZol5QWG4NCaJpZsgCAbB0TNxoDOtpnyoaO?=
=?us-ascii?Q?lPazfItP4Yo+RSCPmriFfU6G+28wrtICENECpl9GmAoyyO5eXEAfp/wGCVaB?=
=?us-ascii?Q?Fy005G0mKM9HTkmVBJGGt00ttB3CL7XpCQaDvEaygI+Of31LppPr8t+HWRqf?=
=?us-ascii?Q?yZFDm/rJShPkT0ygLvle+w7srXf/fx5p0ySJ81sz6/aKF6VsUgUMbzPdWTBZ?=
=?us-ascii?Q?pfKEhgDCmTJ0Z+ZVKBmddUQSltln6dVtPP+Ei20jnoHoe2c+WVOK2i0l/uBR?=
=?us-ascii?Q?KHDs9hU3jplLcGA8ThRgmbJepUXmVyEDAOrEYPFMrQrxvYFeJzCUo35IqKdI?=
=?us-ascii?Q?yHxze3Do7lXL4PHOzf84OPgc0/i8CupbbIGecrqOmCdWL+8k/EPWLdIx0Rkf?=
=?us-ascii?Q?tQ+GqkLrQpNpbEljPT0uQVTIIYjy+JZClJ9Z0NbsSckBYRVkErmGtgzvUkfM?=
=?us-ascii?Q?012v4/P00tw3OcN180lw80Tk59zkYXuTOPgobmlyEZlN9Z8cPI5uwAlVyM8g?=
=?us-ascii?Q?t8I5z2bl+LrRRiqnHNZVsgXz4qmxnzqGA/2+xQeZFSGN0zEtEOUj+EjViys4?=
=?us-ascii?Q?KbttM2l2xfM9dlpZF8XjuV3IHThwOzjGRUMVkuCcFw3g9VjyKSX2YkgYYsxw?=
=?us-ascii?Q?M9HWb53Uwi2zPLjqAJrdNmCgC+WDsinbNnffWLwBbFaW5cbOVI31+j94XJ96?=
=?us-ascii?Q?zsojvQpLFTy5ehT9c4n7X2B31q3AQT9rXW9DuSAbD0l/3WBnISuLd3EKo7uL?=
=?us-ascii?Q?C5jWa8x2JFpnA/jGoKKdWhlkhas2eSTVH3HclA90URhJuRVK9Iyvljdchv8K?=
=?us-ascii?Q?+3b/FoIpkLPJ39H1rWtYpjUh4JWNg2Vm/z1uWrEYRW3MvaLTfrgUKCdXCsYX?=
=?us-ascii?Q?jAURjG5Ajfow+1TlicKQvwVJ0BIvamWwThc5VRHbIvm5B6EGHQOEDCdbv2lb?=
=?us-ascii?Q?/wDCsXNnYuMUDrAO1bEjcWCejrQpccKRb7JssKIe/gj+IS7fly0XrjomydAE?=
=?us-ascii?Q?7f17dEdrwJdUWwtJA3Su6kNapHLCehbh0/xMvZjQlOyUwIoHC7bkQWAklGq7?=
=?us-ascii?Q?3RPxL9P0HSBtaPAMeakTn7kOTeh2hEFJrsqhL6FQ43ea7RKwQX+H/dURDbCD?=
=?us-ascii?Q?LOhFtqjmkAlPPpQN1DPFV+IBrxmu4N4R497/noln/FAZJJ3XetQL+qBNgPG/?=
=?us-ascii?Q?qtGrA+M3eICHGWmg2+4WpYkHy1suMzma1z9HiSy48uIGi9LGThHvNwEr0gUA?=
=?us-ascii?Q?AXQPQJxTjEh6l0FV3SPMijc78DZ6bA5L2W7LUb9m2Lj+ZmW3ZsDd+cb7vaUG?=
=?us-ascii?Q?mWA=3D=3D?=
X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0751;
6:P+QMV6aDrZIpN0ZxJJ1yv500RPnNuXtf+/NczWWQoG1okReEZwJZpkMUln3hesKx6wxlhw+3GLoT7xRfLdPIG67+GsbHAc8UBPtSlQjBfi3elwYUwaU0l0JJ94WPM1RuwAXinsU5jouuOUUReXf7P5yHQBg1d84T/CaCOdNWhtjKrQ4hFnNKmF7hg+moDzPfO/ILfqpZwqnc5IesLCBNB9ll6P9fEUv86FcCkicZtJCAFL3PerCoKLI97vb462xKaB+JRPx1/GkJ38HGZdK5gCVKZ9JSnsfrRjtgXJrFqpB6XvBncRKSikwoc7ZYGDFyWKrwgqLc6wuE+rMmnvBZvOxdUYf5Af6sW3oIMlSfYcuqiNpC4xIRFzvJODE09kxM4/v+E88eCa+Xu/cttiXC2JSy6mHP4G0fCjWA2wZzwHxF6xtgBZwhImRIfLJzzNrV;
5:THGoIKwCVC30Yl1XA2tceBWOyH8909LqvFvb/NbASlnsOZnsbNb9W0u5c4Bz4DTYaVpWg0ht9IB6Xmm70UryUPREul+CusPfse5N6HBe7bsGBNLr3adEXk7T/YugyUgLoNGz5dGROlBZzawpR7HFjYb+ShEAyXsZpY2lfniI7G1qSdInOeNhSb5I4BV47maI;
24:5ONup7PeN2tw1lM6ol2jYpWkOAdueqJriovy3JUMzi08+MwoVCo/xam3WAWeW0NEcyFLsDtVnPQL+dUJUO3hblljqWHJSF/bBsPoNMTDKJQ=
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0751;
7:GNuTu1c+G6c6kkSaM1Z1fIJj/VP8erJxTOds1Al7TfH03LPBqEL0Tbaw2F2egpW7oLPiDxbCjTE8hrzq3p8qI8z6BB+1dPsqwQnGdPqDeWEdIRkHLzWRkmqiG9VxcN2urxVwslwSosC2gwpYZnCJ83DrEu+5fjHi5O5hCwbW4LBTNikTx+sy5eebAFmDoOw1mMvWrCPPZaNSRQ8zMfe6rSOwB/3AvcHrwhQMGQSlg8z0w6h7HXfQIirf/iP8pcUuSNrkbALzuXwz1AnkhR65AcRHF4SJouKmnZ2L3o/l3QJ9FvvucUkhtQvTI5bXfabCGrnQwjm+gL1mSEcMbJlpqYQka8AMxRF/Zh4S7nutLpp3kr9b0bLIP1OLQ+R5F9R3d3vIz2h1EjLRhzC2QquN4FjthKE6OEacJd0KJp+b4jon6Z9FKhuVXbI3wPaz+opWmzCiRk5xLkkMEPAJ6vFDYA==
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2017 10:06:19.0926 (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: DM2PR0301MB0751
Subject: [dpdk-dev] [PATCH v7 3/9] 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 <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Jan 2017 10:06: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 <shreyansh.jain@nxp.com>
---
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