From patchwork Tue Jan 17 13:37:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreyansh Jain X-Patchwork-Id: 19608 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id C5F7FD586; Tue, 17 Jan 2017 14:35:18 +0100 (CET) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0041.outbound.protection.outlook.com [104.47.37.41]) by dpdk.org (Postfix) with ESMTP id A452C106A for ; Tue, 17 Jan 2017 14:35:01 +0100 (CET) Received: from CY1PR03CA0004.namprd03.prod.outlook.com (10.174.128.14) by DM5PR03MB2475.namprd03.prod.outlook.com (10.168.233.21) 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 13:35:00 +0000 Received: from BL2FFO11OLC009.protection.gbl (2a01:111:f400:7c09::166) by CY1PR03CA0004.outlook.office365.com (2603:10b6:600::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.860.13 via Frontend Transport; Tue, 17 Jan 2017 13:35:00 +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 BL2FFO11OLC009.mail.protection.outlook.com (10.173.160.145) 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 13:34:59 +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 v0HDYI2h005071; Tue, 17 Jan 2017 06:34:57 -0700 From: Shreyansh Jain To: CC: , , Shreyansh Jain Date: Tue, 17 Jan 2017 19:07:38 +0530 Message-ID: <1484660264-6531-4-git-send-email-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484660264-6531-1-git-send-email-shreyansh.jain@nxp.com> References: <1484647774-28984-1-git-send-email-shreyansh.jain@nxp.com> <1484660264-6531-1-git-send-email-shreyansh.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131291336998911916; (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)(39850400002)(39860400002)(39450400003)(39840400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(50226002)(68736007)(2906002)(47776003)(5003940100001)(81166006)(5660300001)(2950100002)(6666003)(8936002)(8676002)(356003)(2351001)(110136003)(33646002)(30001)(105606002)(77096006)(92566002)(81156014)(106466001)(626004)(8656002)(54906002)(86362001)(6916009)(48376002)(36756003)(38730400001)(76176999)(104016004)(189998001)(97736004)(50986999)(50466002)(85426001)(305945005)(4326007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR03MB2475; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC009; 1:3NLbIlUJ+VL6WHCP4bGFEAX5EmwgrnDTr6oeJEhm8T+XLazs8xC5KARpmfaNr6Pe86MQnbjDhFfv/xhnGYVpwZNUc9lv9S8xG4XidmFVtgNeliUJO5PK+N6BS2Csh7Z6JqvQBo45Lkx4lZGn0qiC1bAchLvwEk51m8RQmP+ptb/opNWYfsqYIlCpQhMuv5HX1EXlSmkWqu/XdGH2iOmZwjefKRU2JGP8iwkpIl/+8bN4zEUS6CRTBr+QtMrYdavlNKLC/o2bLOL3E1k+8Sn4Jej/5j4YfMj6rBbgFP2Suv5v90Y48MVJ7m5kWjZ3ZV+bIj46QwveHynLpfmLsiMxB1Feg4O2povhK02UOuIw8IvliM/CKkIG+oSOT+QJSgff2+jXEbgsl/2DOt4QIRbfxpKEGqji0I3prPJ85jecBVbTvY6HBSxBv6WwKyslF4Cu2hRGJC47iA/m0eipsjxeXB4mLNJWeg7pjtndxAkEAqK9oGhnLHzXnJfqTN56PUWylNFPZlVHaYHz31060YJ8yOm+4rDR0RTdqtxLEX3bEWX+Jqt/wMlGYLWrQ58B1Ua2h8tOlxYTojjZZQtE1sEPGHnQ5k721zSdru1W8B3k+DPlX5bTK4sgrc1CRkusgsKCT7mOTyyTmDXsJDnyTRL9XNMZ3kf1wE2ner8jryk0nX6fJ2j6UacZmIiJ86ezk58nfdri1Nj/DKrnpL6GY/UU+Q== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: c800f9fe-c1e7-4a6a-3cf6-08d43edda25a X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM5PR03MB2475; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2475; 3:PcK8UwAuJMNE2VfdEPjkvJGPcftY3HPHeJlzglsI+yDdanoM+62cSIgVLZktDkhJ8vhCFxo1D6v+1UEpY3HPJlL+gY5j8dbFuyA+pRee6LfsUge/xl7i34/mlDHSp5Om9UDGobx3AUU8CL7C72DgjO5evlc5+m0+HCAqVl+e30FdIvLe09VrZnvXq9CpmvrOrhTgC4Zp4KJ5sn4kEx4LCMQHrT5oaBAd4x766f3V6s0Cv17nrxfizQ3OBK4SuelbJZIvMPYktdTT+yKc2ay16gIyoTdgsu+eF1G7p/wqm5Q4O5AXY9JMPLiZCftKE0HHDYvhXCoA4SsPuAl50uBr4H1cGW+Ui139JO6UoCnEPcKdAHr5L5n7f4zvXmbak3fq X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2475; 25:QXTR4C1MrmZQoTOHm2T7+/NXKuqYJEFf7gJtLUw2Cv4IOuX7i5ulxKymrAsCcw6iVXzCeRIDQfcOQuBQw78zZOaLxdcibZfK33a1K6yiMMptKWL994r6s0PBLGX3t2HCx6x7s7RO8O6jtMO7ra5KEs1qBWqiuxSVJ6WrojKpfsokmo98QwjujSsWDySDa6xu9FUfkbwzqf0ObadVj+Dnn+bkqQBD3e3hMjmzB7LMLpxDRcJw8EEzhfMmVmeHoCtDuUC1yVJhxP5tsNlpnO1p7G+Kjvzy7cUIGSKAWH5vUq/VmdYAzDyEzomsjbkCKhigF3Jz2LNf58XbrhnSPTgWIUYWpsPV+kD/6QoOgYq6NNGqdw924aWKupZmcSwl1+DuLpNJlGPVzFaNKvyV8yMPIoUzc95AZWRZ29dV+jt1KW2Gb+9afVjGWfbBywqoMGFi27Ui3jZvTAplhdL7Hde2hxoLIFs8j7F4xW5jKEYST0ojp8LQJw0MXox7ZJT1jTDeEu4x+2p77eoqCxiE6JDzEg/WRxwhSkfQYDe7IdljXyBKRe9zMNHJGO8gW/mDDX1tI7RsHzVXKss69lyruQtXrRfi956hZT48nqWYmhMzyK28nu4JcvQNzobqwKKJpuyC2PJtDyQuLlCJ3YDL39Ffzwg5bVZDabNMqbxbt7jC4LUWuJiyITJmvcqyRn4gFH6RjO5YXrZ0NTpZxBSNWM9dGHMUjpgE+MtLfUokM2q7Rqsj9T3Bmm2A9l4QSWcPyxRm2OQ38thvAobWSj3u41T/Iw== X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2475; 31:lwFcvMCQxt/CGNAwCjOc0eM97z34UMCbgTlzeUrWmRa6ykRd3ZvC9xL4BoMZ0Vi0x/clIBjMwO0Pm5RXpLbuFn/jeyRxuM0DD9Mpm5TScsig7bFUTZDctP3wSQrYpOoW/zToEcq8lPwNI0SfVs4kJ6X+vyvp/hXMGaoG5LnTQ0rtWFuFs8GmjsjCY8h0+C9ghRNa2BjLcJObrXt7vzbhjGGcHZsXIn2kAmBQw9qPBFFJpH2A/yC1Udaba9SArvXf8YGi3MxXkDt8Oou3PqXOrQ== 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)(5005006)(8121501046)(13017025)(13023025)(13024025)(13015025)(13018025)(10201501046)(3002001)(6055026)(6096035)(20161123565025)(20161123563025)(20161123556025)(20161123561025)(20161123559025); SRVR:DM5PR03MB2475; BCL:0; PCL:0; RULEID:(400006); SRVR:DM5PR03MB2475; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2475; 4:zzVulpD0gXMYcr680katcF5QRgmEECA9XqhB+mG6TGSfOPA13/8MYGk+yjjcPzug/jxoxUDglhlIMoVUFOkVgl/fk0sC/CP6CrL+FUI3ZQq58ddOZV86C+BMH7pVeGnMVrLY0we4QAPJzP0PROVn5ACZXlA0tiiZ5GKZSk33DM7HEbzmuXdCRnvE8FYnuwBZrq7yq66rNUZGF+7tI8j+c8qdKk4IvYIq8O6xBMwkI4Cz9PpLlSuqQ3WXGjMhHEUNlHofMSAbTL5cnYYosLsnOFvrJk+82FSD8Y3gaqFnfwb9Upgc66sod1sojKKXNTX6/iqXE0si/wYT4zws04RPMvS7Y3riCsizcNSC43M2NVsDJ3VP0ck5rH/1STZvYUN93I47DBjuWAjtfz8ISukaYwbU8NpoQpxaBsJqspDssvfPre2R2OEuY2fU+NHHjAKaNcmmbM3iGViSIozqppt/tt6Klt+DUNHg6eLmvS87tv9j2efweSGBtQaKn2b5Z+JktYsL44DKMXOnBzmbOtsr8tHloyb3xyu/bV9Trf3M4JltwmNPMckYarNFCcalV1fFZ2YOTzmFeC/qRBChbIlcZySV5WE3zTj4SWbpJ2xX+M/41v3+VDp36mUjiLU7tRXMjJe9+34FXMDxfs+4l67PMK6zSAIhrdlhQMR1kzG5/9StQZoopWXZBkqirHVjX3RnXkLvuFubGKc7wdu7enVpV05qKjyq21EaqRaGYmqF5BQZ0fjMaAItn07FkDhgqUvFApm6qwkV7L4OTOAnsXLqSw== X-Forefront-PRVS: 01901B3451 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR03MB2475; 23:Szcbcyt/4cgtJP6e+Tb5373heZZ90bbfxT0se4U5F?= X7oRW6ta2d07D2PyoV4JvNLiVrtXnrdKlgvyMpe1yqZqNn1DB7uUCL6ka+MnSj33nqror8NVk3F9VpG0yDpgEs1Jt+ntW7eerx0enU7Wfhabk4l1VbAqlW2XtPzvoPLNLfmnSOIfu4uaHisA8KIKqfySgTRyhTwHT3qKYE+oFFDXOn6bsnIrep65NTx9FTwf17zKqqflxB77rlgvtoK5SypexihzkVfh5F+gzD4tRWSM/7v06ZG8Ah01bwU49n0eMsfXrNeeodLfTTnXwodEIfPj6sMoXS1bO+ssU+vDKU8yVONwwXjv2GxFRdBnvPIFD4OwtG9Y/KxChZx71kD5miYNwDlSo4FqUBOYr7niTtBEzLBTap9l+kiv5N/sT/s6GekT8r3xMlNemICmx3v8YVeEKQGkTWm6EhtamTkR86Srlz9aXCIOALetgY5CXOhcfU/i5+MpvDhhxinrQb59F5hFh5J400Z6ajEuMF5MkzhKXp9Dn1PxM8/+Orm6FH5l0nnnJ5fP3b5eyjEh0uYjlxrZrJCNBU59N90qPrYjEAQowZOX28Phk5G45788/WQG5VUAWX52H04OifuimAGp811vcZPTjJhJDrRqjLY85TnlU4udEjnIfJZW3V3Ydl3RSMl1KvtQkBhLfi8yf+0VPV49391jzQvVnL3s0dl2AP3eEs8T6llwBayDXxgvuVNEXRLyxYnAy+ViCzSMqhxFBV9NotE4slH01XVdijGyCB+e0RTIw229K+CJpAk5igyc15xdpsAaMOKJKZM9ynXTBBU8JYPMwTijqGzEqosni9DqS7ZlQHL2ssVdv/4o0hDli8b206Z4EteGDLdc5+UT+dLM8t6vI33isH3s+luAKzr6mhOR9v00y+3mn5DsGIku1A0iwCNlzhgjHVLNayJUF3X3/ssANQdPgDcaJsHvdH3NIEOaZvUhBdgbEZYbzTP+uwVPYR3Kgnu0rAgvSXeDHl53KzJlOHO5Hln8x0oeow1ydw8avGoguIn/+PyhynaTiYEXW78HkZKyak7KZhI/mxtgoZui5YXr0GG9wctFOZlOhzDuBpIYukKtFOlgv8XHlRXKskE4RSRtmTx6rrDZqhJjCkTAPNdkBfB/6zi/X/3R7PWn/utLMvK1jtFkS6F+cz6ypJxpzf5XLYhEui7sKlfwUr6EXZyQAcK+h3zom+A30NI8fZxEVE3XinxWVAjxmJWUP0tKMu5JjbtiZmhvfJEQWZwv2TzxIGNFTEKsTj6RQ== X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2475; 6:LmHvFpi7qV2I4Q/v3G+KPcIDL/IGNAn/vvNFmokXtdLJ8yNeTfHpZoQPTumxkHrcjUsvIy3tcCHmgCo3l5/ubYhYw2SbhtE0CfQjwrKFeSvkoLUjcm/aOjM+Wf2pPWe/q9wmdZtPRmWtWMazZekYvfc0vbAZf/p7/zxyGppmG7Ljg10QnNs8wSSXHB+mAl+sgrXzFDW5g5jkjqSSCYeRQBhlp1ZIVNNOcCcFk+JQkuTjO87x+K0Uhoxs2HxmFmvcfwc43g1TbFEAeJltIdI3QJzaDpdF5sAaAyBa2G30fQV/6HpKNZdZPmsTcONl0X6uyF1zwZogUTf1mgQSJJwggtXhnnRtnJ0d3bWBNgvp1nIyc+gxpCu9pY67d9dsI/bUp3zVRakVGiUJ8GBV0Ed2nm/Yj74Z/d+d/uImp2yq2PRPXFyPlY8oSJWbImOMAOYi; 5:RGWcgU92nVlmbmZ1gYa3ZDbR/pxekLh5AWeXQLQg0F3hpidmsgJSWFggCrRa+vC4Zmqux9ThKN5QN1fedP5nL/BIRR0ALGO8kmj5+++3NH6bpuPI2phKHH9HHPe350/BKnjRF+BIuNvG/ORoe1CItVwLi24tlgNmlJcNkdhEcFJCon31DdAxPvICMSF2Ysz8; 24:QJdF5JbyOuN+I9J1D077VzWRynl9u9gwn0dy7QIzVhUDaKnlai3odn3esnWg3DE02IIznJWurH9zJcRblj3H8rgtRw/aSgQXdStXAhK88cI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2475; 7:OagYizHvg2FXJWUODPA4FSE1KZR0hSihFoITi1PPPo96KvJdq9mB9578qQlMYmOXanclgSnN89EOeA1Kbq0rrQgPDvb+G9d3JJU/9r6ngdcgn6xzaCtmFmz6gJcUqHToWnTe1w1qti0MwrZ25rVTjQlDhCvuzcIPZi9wU7aNtVzgPu94alxC09I2c7fMKavRqU/tQFeQ9eoz7bZzGed/c+nho2LqZ7lM+1AWOTIwuhPn/fSGOuPBUOK/RUEok/QwPqh/hbIOmXNwvGAhTddDZBhyiBmksMHROlBvDkU41f/AmvA0byG4MZDkp/ZFKx++j9aL0Fnb2rN8iaTTspebQYe4kdAe3gvttKY6+fn3f7o+P9uzfTkIPauAV6J9Od93P9vre1QfrCISGg6pTQ6ytq/46NQEGzAoKs5akcfJaRbBdOipuZreh0EZc4mm3cBpJMRec5miRAi+09rG+LEuZQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2017 13:34:59.6883 (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: DM5PR03MB2475 Subject: [dpdk-dev] [PATCH v8 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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;