From patchwork Mon Jan 16 15:38:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreyansh Jain X-Patchwork-Id: 19429 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 711D737B0; Mon, 16 Jan 2017 16:35:32 +0100 (CET) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0089.outbound.protection.outlook.com [104.47.36.89]) by dpdk.org (Postfix) with ESMTP id 2F2F85320 for ; Mon, 16 Jan 2017 16:35:29 +0100 (CET) Received: from BN3PR03CA0095.namprd03.prod.outlook.com (10.174.66.13) by MWHPR03MB2477.namprd03.prod.outlook.com (10.169.200.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12; Mon, 16 Jan 2017 15:35:27 +0000 Received: from BL2FFO11OLC010.protection.gbl (2a01:111:f400:7c09::175) by BN3PR03CA0095.outlook.office365.com (2603:10b6:400:4::13) 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; Mon, 16 Jan 2017 15:35:21 +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 BL2FFO11OLC010.mail.protection.outlook.com (10.173.160.154) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.803.8 via Frontend Transport; Mon, 16 Jan 2017 15:35:21 +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 v0GFZ4mj019448; Mon, 16 Jan 2017 08:35:18 -0700 From: Shreyansh Jain To: CC: , , Shreyansh Jain Date: Mon, 16 Jan 2017 21:08:22 +0530 Message-ID: <1484581107-2025-4-git-send-email-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484581107-2025-1-git-send-email-shreyansh.jain@nxp.com> References: <1484581107-2025-1-git-send-email-shreyansh.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131290545212303574; (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)(39850400002)(39400400002)(39450400003)(39840400002)(39860400002)(39410400002)(39380400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(5003940100001)(626004)(50466002)(4326007)(92566002)(36756003)(8656002)(48376002)(33646002)(86362001)(54906002)(2906002)(27001)(85426001)(97736004)(77096006)(6916009)(6666003)(110136003)(2950100002)(356003)(5660300001)(38730400001)(305945005)(106466001)(8936002)(8676002)(189998001)(81166006)(50226002)(47776003)(68736007)(104016004)(76176999)(50986999)(105606002)(2351001)(81156014); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR03MB2477; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC010; 1:+Hn11W3ofGy7J7YiljEFMjmx3i5ItmHiFU4tI2qnmylMn9CBgyxLGhnLwlMdLbxDboSiePhBzcQOm7QXR3Qb3qBqF3W2nQD/brQxZzxHwyCLJKMhfQDRBcbXr/p1YjpO/5LSUWTkWZb+lYjHAhuWRgGd8mlM0QqCURep74S224LS+oVOplnmriof9ChRel55+oMPKsyLS33+8VcvPROtygMf28q+xzxyDfEGC4YnZMkJSU0jxlky5RK3euI1IymqR3wmTjJmYnnzlXOw0AshiSkwFXBg3aYrW3HJZk6v6A7nniLnwvmQeVlNTAj1O5Z5BQ7tKl7M78+AnrZsOkc3h6yENXFNqA3ayQkaIx+Im9PSJf7eg5pS7g0DnmJv/TMVnqbdteRNJguCi8fyHihvebp1pfDtJReyhzoQel9e0rpAAz+WUrxxueDLf3Y/OK4dqXFwH0mTwim1A6ttlUUfSDPDTxcrJPmDyl6GVVG6I9kxwHMPSCURohOMbsDG9jQYMNLSDgqwy9efjl0/dlc97O+nHgmatgdw/N85X9YVwpmHpyVoMTPP5TN6BTyvcC1WSaJDl0H+2g9w8CCRHfc5ItgZ2/Wid3wcHhJNL4zdxcslFG+vHI6lg6FoqDX1Dxwd2Pyhqt36ScWjWxOBiKcDT5pPt17tdXyUGPfYe8/AfXsxGMzfMCaJsFVuN2ofBpx8JN34FFMHxEPTG4sXrjUrjg== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 1c9e9faf-8798-474f-28d6-08d43e254836 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:MWHPR03MB2477; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2477; 3:y0ov5R/n5JwO92qMcmG1YeUbu1LFXHzBJE19gND81AXH73ePHEjPYPD1/Uhq3aJqa7Z+QZqc+RuPlaJnomF+XzS99xeQqE5oA4OI539SwJvtuR8IbHOFUAFpHdNfBRGBEaHx0EMGbVb0v4nzb+BzMfio0YzALGBbpCB1W/G7KVH27FZHxRTCsoOf9EmdCINJB+jcXPGTxiTGqfhyALzhMWCyG14OQajxcDuUQLmSBslSOb887p0Y30vvIEZiRq4/G+E48CQEEj5dHD8a5Dnmg/QuOIkI/4TQs/vJd2y5qVWSygJCpl9lTBFcBp0V1ukDgERiJZ/gThF3JwhYJbQ3rB/I78Ote2VrjGroZ5f2ec9x615FySqbthsodEDsqFpw X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2477; 25:2JKMc3HiOYVbMAjrRJSrbKX6zBKAdrOirKuW+Ke14FyWwRpLHrdSnHdHJo3o6L90poGa2VUCoveCtytApHxet7LHqOvIhobulFMe56doRvxvbrxPyJB5NolM+jKE5NreG0yL4ZxYOgF6bOrhjZvI8hnTsthSiEoOa+Mb9RFZQdcrSnZ1HnZFDa6kmSAZQzMLMnhtLtR7XMjc9UMNC/4Mr+y0yeJj8sIJ2RlGm1gHLL42QA7/WYF44TLAPoVsga0fPFEz9HgM0BnEN38+mYDVdDwtFD8dq4Kl0b4jMWzGnAeZ0kw5uCBklERLOsatMb+7eX/bxIdfuwTAd5gtMhV6CRr7SBb6RTkHCtNIU0BpUERwvugV4KQXfm9LmW0YeMay/NnpiV4F/+Beye6P8H1II1bmH9YPl+x4dmlfaqYBvvhlZGcyXd9GgzfXHeUOox29f6/lXdiTvKEAUkCXZY9/Jcj9DohSUf1VuazTr8/e4d1APf2KO+ObU6jRDfq3ZOcEIWaukrsOdu9gZn3VXw1g6u2mRy5pbYN3yxdQ9TAWD5KaqRYyDEqX2QEWz6lj7QUmbpjkXK9rouvlJLN0jTDHEvxM0ax7O/liwuX7Ty1QHvhLHj9ftg2wt2wmFEtus3parDOZ+vuyikGoSeUuaglRa7mhc0WRioopv3/AIFAFxtpQ9NwbxMDmn1j4ygrl31F+VgAFo9HbU92Sa6K43WgEIVBSKetFcy2k6ARxlV/h/NlQybNQzbFcAolqVREqOg2xBVUy1PihXHZS+mS2hD+a4/w547g9d90G1hDjMPRvWq0= X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2477; 31:hTwSlMv+5pEqAye2jQTCqNm0wONU6gM0APzVeWUbsj3Q4uHaWPYa7hDqUc64fzNFlhwxkN8p3yoZZoHpxE1h5YoDGhGmWpBoquuikpd0IE8AKp2+uW2/cWWG8Ys+oyYXKoBmlfJD17hJ2VsvElYEO4UthHUwXhWUT+/iM4z29YaMmgon70GfaRO1MtK8Oi6csow97dnjFTduRMyLwSR9s8U6Ktp9WMm9Med5oTSF478t9mPOeQYOE4zrd4ojufq0+79HuS1j2ZwpSbd+wrlYbqDBTKL7/9SGYfGVXJleqCA= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); 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:MWHPR03MB2477; BCL:0; PCL:0; RULEID:(400006); SRVR:MWHPR03MB2477; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2477; 4:q3xArsAF4rwnYOlqjpIaMjlS67aFbL2s4qBEcCns+whYsUWTcmDbYhjrmTWwZF2D2f45VQkrDJee78OWG9T45UtJ6GALpg9pAvuLMurQr/vlPzPZDyKZeMWxI92FtMh6qOONABur1B/aUW1lGBey2CCpNMuVelr/UbCaK32E2LWEoPWMSsyQ7fit11+sIBr6woJObtAw3zN+qKjQmE//mM6P4dSSDRvQVnAEgzeQfroMd203kQPnR8UZcqNc8MO07l6NNyFxcUqZR8VL0h/L8lLP+UKDPz5ePop7G4AL6vYhKvv3UUnmwcLe1/MDdDCoEwH1linWrgJ3dlWV6CVDZDR4bZcCiW4JGO1mb+IByU0gH4T7tb9gZWjHh8feaCl46UFV8WLq5RVr4LdFi8GgjOfbvvn1hbgSPG8LkyA3y7Zz5900Y4EpmW4cSs+zxERQeMHL9gImbFJI0MiDysuWnsNAdnx1a/D95FHi9UPzb4rKSc+yeAP1xREeZMbv5sRIYGoz2C4fZrztENtRg6aaIKDhawVB7bK3kU9be8yhC5WQhrDRScnFOppt/JlOn28xZjpJnemtUxS/Geo1lW6qIRbfxM7nvEqAXggFYmDkpIUtu7e7VXhJBEr0iO2f99MGqLTG+oG3ktvHnCGnGPVVtkJOkXEzh8A3XeN6MmBN/gfJSLHTfhGAiwe9/sbsa7LtZukQCOsWflL6qRexWTGosQkIhZltOFwbYqKhgp24rZgt2FqvG/53sOEMnRjq9cig X-Forefront-PRVS: 01894AD3B8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB2477; 23:axW9Ny5D9zI3Mfp9cD9X/W/o78enslRbyTVC6YSMg?= 89DNhsXi6jirMjNFMMhzbEonBIyqLINC2Tb02FFQCsFqqte/MVnPLP87qRrtzjYpKWOoFKJk2l8GUv/y029FwF5e2yVRB8XsbMxry6mgfnhA6h4kXietIJJND0xkMsUv5Qp2Owh1lfbWL/kF/3QDzseSUIK+1brxxgNcUkixqRwLvEQ8D5dY4aru+qwqSduG5eBszKjS8L20cx6h7pZ10U6qHje753lSliYbadme1Ysi9g4fQz7YFVvLUULzrMgCuYtLbnZnVaxJRQm9I2XclYGLkQCV4i5PCUDV6cXuJh7GtlcXUYRdzAYDMoELRL59n6PCtGzRbisxGRUbHcWWhVx4L9u4lBlmLgfBAwbSUFLFmgoQPY2+vbb/EWdJ2OYO1aB6TrkK9r8ZJFEASVGqjhYikCXKTjsRzOWLSE4o9RHXKWdpno9kmBsHXwdlUJoeqSb3P6yVBZlmYOIw3/s4VIKxCzl+Co5dtKw8htWKDuXuTq/GW3Tq/UsxNrqV3jVXNNnoXFcIa0rO/LIpBWpofBbExvohVOrVf+gcGADr2eyde9AQeoFHKw1cYbHEoRPVNg/e0emBfem5i/x/ZJXI3cu430FWyKcrygcS7B0Ilj9AUQB23G4vvecR38oP+WpAQwHUhY8ZT3C7JQGy5rN5SqTpRZq5rQZ0aV4aB/P6kS4V0ZpQpWrFVeUABjhHF2at3EihqE0e6bMedJf3H9Vgjh9FjtzZVXpk9aENdKr5XHaGIcqMDPGgk/j8HyUcg61u7oTHGMEAwj5UhoVj43bb4cTS40dU/wlavF8/W21Few+p41SfzJhI9mv9ugaQPAt9PmxxWRo9PkUBVuf73INEZraMcxvHVZIqatBZYCbiPpN214aIP6niCCddTDpy7AxW3NWgCZC5LtGDB6zeWCw29S01+kSBeGUcmTgo9d5UaapTaXdqz5HMXJ7Zd3tLprU5jdJVn8Y8Chz0XQWdOEfaozmFeApx8kq0D1vJGNkc3LVbuKPAovdEzrgNEr+vJfXjJc6zzeBTPG2vaxV3dCbHv6qgKUAQNYju+CKIY00imyNRQpI65JrzgUoJYSV1trmlXKAnFlZX4jFLFonEGfLdkrro9P5C7VX6k3TgIvephV/iA+FpNS1PtleyVFVMp1k8gnKJxx2krmJQBXGGc4fMK7gR8zPSTCGVt7DvOKOXXFgJqX6ghbMVf2F0ShJr5Aq3aV6V2WDICxu52TKTMbVQte94JUN+RN+eDm/JSRl4f7gqw== X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2477; 6:5q96SA+FfWJffW9J0dpxVyZW97nBABXvxWWvF0nxZyPPWxnJCOOnesERsti4fmdeFKdrnAEymcJvfjXICa95ACklATaXP3xYMsk/mHEeoHOlbLAqRLkg04CZYsGPVHcMj6DDXsR9j4WoO6+Df54NpUANPaekpLURKWsUcQ4UqV7O00g9eT5f66ZanEpesSek7oQhpKx73BcG5R8uNZ71l1cvVaD9KUnRv7fnZhoFF73t8fwLs0abWGUag1Hzfp2lh9yoQsqJsAQAoJU0esjZCU/xtTC6LQ1oOQRtq+3tJEtOVKyQXox05nss/ivbRQBFnQfIFKrmLEJEJdJIKaV0VF/fWMQwlOcvvvhWRD9UTW3D9RxG8e8N9TkllsV93CVG7VHAdp+aQ33nCEZcZNIjnnYmBXMXVnX4PJrYJeyb/kBxshic5cSz/cAQ2ub/5gS1; 5:0aY33WmfqUKXitSOpJf4+5vkyCDKk8aFMkap7Jfo7s/S4qoa7m0BAXC3ehAh7cKH6YlSkRDKewAb0rXoVZRCZeu0l+z27ryTwBM4ldiyj8lO+oXcyI8JCyTyRjysIfJhCaHEOELcyICk2J9lAyi59qcAhRZDSRKfwi6uXurkoBWleGaeQJAT1XUBi6aF72A9; 24:OJHrPnEcLjtccA709M01X5R4ACd3/H5JXL3njjITCxo4SAdX45XBZq1tspTZ5WhfiBDy1/S0L4hnWS3XwSXYJoVm8T7XFlJCVYr6W7NpD94= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2477; 7:2FLJ2gWcwetlgbmj2DId8zIuCcx17xFjEMieqq/TJXaMOzDPM4glqEgO+xFXnH2kC4kBV+VETGbFewaqQeeMjTK/ouCE68mwEzUFx9DxHApkTNtkfNbHUuPIaCtlk966IuJ1xvZ/1wRLln8BZetXCyW6BP93OkSOOppgCz+NQqk23Du3uCtu+At9s37cfVDzptbw12KAmv5BWuN815joq0XCsmiwAjl9uMDhjRDzRJ2CFYoeZb/jrl4zeXloVkVQulokm3rNvdcW05iceyylIUDh6ctrHFWqPu3GP7IM4oAFeH42klywu1uGABodNSyAfujE/OmUMXxevu2cO/PH0+1axa12JaLVi1XHtfMC2E0ic/GJv6fzHs+OGIfBEzaF+yoPDKaw42j6C0PGSTmdJCDRBQ6IQXb48g+y/A6Ka+Wo1svte222ogycEr/4OIulyyJF/bG59CGgLFOHmDQbGg== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2017 15:35:21.0119 (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: MWHPR03MB2477 Subject: [dpdk-dev] [PATCH v6 3/8] 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 --- 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..0d799be 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(struct rte_pci_driver *pci_drv, + 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; + 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); - struct rte_pci_addr *loc = &dev->addr; + /* 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; + } + + /* 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..6c9ec39 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(struct rte_pci_driver *pci_drv, + 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;