From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <shreyansh.jain@nxp.com>
Received: from NAM03-DM3-obe.outbound.protection.outlook.com
(mail-dm3nam03on0051.outbound.protection.outlook.com [104.47.41.51])
by dpdk.org (Postfix) with ESMTP id 9C408F95D
for <dev@dpdk.org>; Wed, 18 Jan 2017 11:35:44 +0100 (CET)
Received: from BN3PR0301CA0011.namprd03.prod.outlook.com (10.160.180.149) by
CY1PR0301MB0745.namprd03.prod.outlook.com (10.160.159.151) with Microsoft
SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12; Wed, 18
Jan 2017 10:35:43 +0000
Received: from BY2FFO11FD018.protection.gbl (2a01:111:f400:7c0c::108) by
BN3PR0301CA0011.outlook.office365.com (2a01:111:e400:4000::21) 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; Wed, 18 Jan 2017 10:35:42 +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
BY2FFO11FD018.mail.protection.outlook.com (10.1.14.106) 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:41 +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 v0IAYYhe003396;
Wed, 18 Jan 2017 03:35:38 -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: Wed, 18 Jan 2017 16:08:00 +0530
Message-ID: <1484735880-17178-13-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: 131292093413392281;
(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)(39860400002)(39450400003)(39400400002)(39840400002)(39410400002)(39850400002)(39380400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(68736007)(8936002)(76176999)(106466001)(50986999)(48376002)(47776003)(575784001)(92566002)(36756003)(4326007)(50466002)(81166006)(81156014)(8676002)(305945005)(5003940100001)(8656002)(2906002)(105606002)(53936002)(2351001)(356003)(38730400001)(50226002)(104016004)(77096006)(97736004)(86362001)(189998001)(626004)(33646002)(110136003)(2950100002)(85426001)(6666003)(54906002)(5890100001)(6916009)(5660300001);
DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB0745; H:tx30smr01.am.freescale.net;
FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en;
X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD018;
1:YE7p9COVgxY+OQ0vOSJlqzC2iGqPEP9oDTrXgovwzldOufv3hvuzVW3X9rTBEqSQR6AOiYZB1tFvloIw/+I1LTDsbUKXT9whDIYv6uFEADULT3UPfCwXixZJdDHl7brUp6c5InOzKjEuOujRnzKgofM3k3z3mxfxzJVX1GcVTaEWhF44OzE0wcIpFwFV4/PJGdfM35LBhQM7lbVEsm4xunwv1oqELPYaq2rwsa7GZRap/4x4PbdALLDz/qfE5eShydSfOkEFUAdLKjyd9YUMSC731MOO40p3B+XbHIEg2Bagpg8pHK+DP6pPF8uv3zxcEDd64JIq2BiXmbWtuT4okQaMM6qjuE2ycfCyyUZ1bbR45he2DCOf8nrEkwy4JA2bUTn9FqpAz0BYNDAx+Mjc0sF57mWlXUwRCaCVV/OZeGt/31HKrpCYClieX5BzLKq6yBKohkEIEccbALTojvjo/v6912eXeevxKSPDQ85Pn6Xc2Eec2iL/k/kfGFsIoQBr1mBwqO1IDLK0O3EYg2TnM+ISXlkghLD13jGfEQnHx5gEIUM5uLFUQ3YUnqCRaANHpppzmmg2EVHqVjUXbkNX+/BdLWariq2xupD+vVCmPJlIKTnT/hJ6XDpIguxbqyNgk7OlIt8ChhkF1xWftBamuj86f956s5B1ZEDXGb/VQCE8EkbCdtLSd/bOkt9vXr0gleTa2/EQyeUKu1/2/GeTSw==
MIME-Version: 1.0
Content-Type: text/plain
X-MS-Office365-Filtering-Correlation-Id: a774ab24-633d-4d41-9342-08d43f8dc01a
X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001);
SRVR:CY1PR0301MB0745;
X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0745;
3:ljfP+y/v6WxArleiTyNECbBGpJ01EW6XB7umm/EH/yjNCPExQmGH8l+eW/cQ5b7JR2Nq+DzY/r/2cg5CBlNIh75SASpQZyL8hFFyBExaeVPy1bwkeHtxIf/50A6j4Z3rxNQaUA/Gw7kBmh/kmkSbZWab8vZFKd46TFuKs+FP+2TJdVgHLVYjgWjk4vRH+56OnHQ4Ms6F2FOYw/6V5Ds//7gmdQQziXLEYAPndK05lRd+5x2yDwEjJ2sdBxu2Pb+1Dm289qW1z6zKPw4ClMzmSam5YEqkNl5ws5T9Ez+Px3X70BJxKbxPERTw8aw70JYyv5cgmcf9wI528tT965TI49vwMk8EXaHkEr5xuOhSGY3dBMVcZa6O+qMEVA1ylmx9
X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0745;
25:k/UVFRbW2KkGyTwy0YADH9+0CS4BJKdFSRFVf+53YrzvGjhOXlft3A3NtardJcW4EQNwWAnMfnSjuDrIMyPewA2BUMEbog+T2TCUUHJhSBxTuj1u5Rf78EWOUgsT83M02A22V5EeMCkA2QttFSXXvq/i44pWPSr/8PeMsFqayttSG5JOy5br2/66gTfohQADtCYbknGVywPNYPnGGcpQ0+LHcSdNjzCU10RbK40UjoPic9sj/aaAFaL4sXTiEkAGpkFFfQ3zsr1crvWV5ZafGrwEAZYiqnF8TghWsQQaRLuPvU1jbIUIeebDRxGLJv03i1OhYX0uLS16s0XlbGFNr7T3AFL+H+GSWoz9aPE/8SnMmnwPnz2TxADfIGDqqkUCO8nh4bx+w4rkc7zaFUV6T6i4tPtC+IXoagkSTw1j7kdlnWjflUkpvt5iSTMhPDw1uMe2Eyg3x+K2FMbARN3KP8siwZuj10Au8Wm7pDFrLF9AdEcsQZXgQ6+zP2dR1NFs6N9Av51YWwgq/gALeITwNXEE0zlGwUXrdhVGZf3Onfy/Ff9N1h/W2GBQhmVIz03ET5wcUgUfmhGPSU0FqUCH3L1u/bh7vvSdnRvJwnFriIFqdfiBBhbhl6OO/iBkipQWCt6r/x64gqPto2zElnpuPFw9dpVb2u9snw3UQL+mutra0jMZIpKF+PfUFkVOVgWqtzA7dxepsrqe6Iibj74F5HngFkL4qsoWX2TMs3csZOtM3losVv1gFZTJ99W08R3UA0xw8i28HJNDUpAoY+V2utDimhPEOZZnSNHoDb6e9u1u59sfQ0nZ2iWBCvzGVE+j
X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0745;
31:fBbHUigFZhDCFO1O4/NUFiaCTKmbFtTZcoiuxJOh8wHjOgS1bpg5ZkuRB/7DnpYcqKy0oz8c8h/y7d3S6TuJYMMXgl5+JtGlnym6OxIpSX5iGyW47teoYDsZcMNrkAlWyNlPyad6tLe82tk7MPSESGlqh4QxOy0i4/xdlGNJzooih9r3k+hSECfJPlIWHxIcVkUBTvhd0FsYrhjVeFOb5psK5e1HGVWcd0lgYa5fFeSXxFYI2sdAGhXgR84XmB112qnpFjeLrQPb3iM5mVHuDg==
X-Microsoft-Antispam-PRVS: <CY1PR0301MB074505FAA589057FCAD70D02907F0@CY1PR0301MB0745.namprd03.prod.outlook.com>
X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(228905959029699);
X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0;
RULEID:(6095060)(601004)(2401047)(8121501046)(5005006)(13024025)(13015025)(13023025)(13018025)(13017025)(10201501046)(3002001)(6055026)(6096035)(20161123561025)(20161123556025)(20161123563025)(20161123559025)(20161123565025);
SRVR:CY1PR0301MB0745; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR0301MB0745;
X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0745;
4:/+XRUl7Hpzo6GTts/80sp2tSaDA/B4u5turnfxYpv/mHwcdPNSWAT4xO+QexmnpEMgXkbSQcBEEZdWPFch99ISg+ZHw3ezB/yMsiasOgJadzNrmxR5hOYCmUg5pMQ3xqQKi44ssW97GSK0B7nH7nAmiPXGUvKlMN+lNzyptB1yNGtHqyHyyte6SMO2gZqFvOiN8RBzV22F6E1JOH9CKoftobP6E9McKRXHUsur0CXyfNAHHxSW1YPFf2c3ALSRZp4eUmEEMIgbAeXrtp8LDRcZKX7nkBPgjkK4/CugUwhXixpi1QFKQa+HBi3haR+M+34vYLG/aksfz31CexlsoBL5+sJUNPLVmml/GCbMjr0si1WbhnYc4zca2bulc8TmD7dZIbv28sYCWK2Yg5jiE6KLRmOIm88KSGEBKyF4AtH90mnQUDc+OlA7y9RSOkU/17CZYc9KORduQB6alH6bfw6PMQkPrFOyIDXW8aEK2MyuQKOKZ9T2pYxFHrQg15ln+7fqMA6RMOwXxLdJNefAgGNhGBMJ1In+t9pm08jsD8hDqWB9U7zzEkrWa/EahJSwaU044IluCn2Cqk8IaicFhWbMQepMw1++UzllnLw1jcqsGmpMsudVNT9WMx74BTu3yRgnZNmTf+lYDbuXKEGPtY0oBeESekFoVZABj47CUcspII5GCqD/jE5jZZ4LE2mmbbDVr8GZT/BGncE0w9Xi7AmpYzsnjTPEN6tyGT/oNKP1WiI1qMIedPKdV8wapSa6qvriZ7KjYK4zyWe6OtWUUCRg==
X-Forefront-PRVS: 01917B1794
X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB0745;
23:fnnKzsLRBxjGR15h4Tt6EMX9BaNuIYZXnKTF/wn?=
=?us-ascii?Q?j0UYr6eN+GDuAYTVPEisxss3HFxxj6lWLuyftwaAEDhBONT9EQ9w7j08OumF?=
=?us-ascii?Q?eSG43KsZ9AKaD2KbgOnUnmxuz4/C9rE5pQKnES3QGvUvAVlyGPRYZBW9Nz+X?=
=?us-ascii?Q?+A11blz3NIC1hr03Fpld0k/d4yITyZDlfcWu6H79HIEO41fR1p/lejdacIm7?=
=?us-ascii?Q?7qLO5WNnzS5ocU9ODIh2XWH3W5hnMsMq8b7BctIB6Js2c/irBF2ipZLdEx/f?=
=?us-ascii?Q?KGFdyvoS1HHy/GE4CVHvXcG3Tf3kohUmnfeSK3+lJAEzFKT2d/JVBHkT8qCq?=
=?us-ascii?Q?luT1c6+VLv2eZns2gBM1t9lC9OsQ+m/Yr+e6PwyF84//VmXf4Oyr60paNNvN?=
=?us-ascii?Q?0tcE22iJNxnU8btXToEC9kVcJ3G0B87rO28txi7eUOz/Uu8drYR08oiREwrq?=
=?us-ascii?Q?xzrMT6MsSxluBUGFK+6JmVL2V3WW4WqgNI83bhJP0aeqD4KO5A1wSIlBdd72?=
=?us-ascii?Q?5rshcnVwTTBA7dlVKcZ9eSIYd5dZj3d4RYjI0nUUgAgYKUpSlNKB1OVSGe5R?=
=?us-ascii?Q?sEtlYcMsnSUxQ4wYKPClazjcf5V/e/Mms811ge6bI3HhljtahpkOICbG5ONf?=
=?us-ascii?Q?S6QO0GaqyZ6n1VFLVKmm3VXGHcMmkz+gGjXlzZVAVYs+LONYe7tcZ/aoIfnb?=
=?us-ascii?Q?9p3mqlcUGUvE2BYK/WW7oeNHCLqW9ZDIH763RKgGzUBc8amqPExsILBVVNHU?=
=?us-ascii?Q?hfYqgGWsT7kwH5uUrA+HIHdZDcz/kf7g2Ku9xmpUbT0saLrygPURnphgxtR+?=
=?us-ascii?Q?JWxQE0pp7uasGpG/13bTFOZOWCbTouxVGllNG1T8nSmWLsUQMI0Wl6STmsSa?=
=?us-ascii?Q?ErbN5FED7fuCE7LdvApxIP1Ihqb/M7Y/jAhcQIYRUyTKNITJVxkO+wP6gsRE?=
=?us-ascii?Q?Q6f7A+0jQ73Xfs4z4geoEi9Ot6iTKlTRIk2YE4seS5r/SvUzpH/OupqNlAU3?=
=?us-ascii?Q?vQFvX+c0l/9dxuqnsyV7QXS4IsOKLcDHUy/WtE40Z5QvMMD8OLfAK3uNasEU?=
=?us-ascii?Q?MWDu2mtx/uyigO/xA6bHim0GZHxtpBF5TbeisBu9YbbTtqnrZVztm2Ap+1ud?=
=?us-ascii?Q?Q8fRca3LP88sKXx2cvW/Sf3AAJj83+RsmmRzh9PT7pktS++xOXQib/a2Up7F?=
=?us-ascii?Q?BJov5/Oaw0fnSGmEv3JlERwBTiQamrQ+nXFBqY4+fAF0p4ed9b1xU+a26JeC?=
=?us-ascii?Q?7twVAV5uCb6a2WGDqb16IJj2Z108AIVjI7tIFs6Y8pqrGTm04SvhK78ODF2t?=
=?us-ascii?Q?aEu7SdfZTNa9nAdBKDdUXhgBAVFD9cAaqgXOwoZ8Ptrl/RGe80UHZGXEZUsZ?=
=?us-ascii?Q?7giW+pQ=3D=3D?=
X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0745;
6:I1QUX4FATDDgCRex7i1G7zaf8KQ46XEj/8/KfPT/GN8MBmOOXzpl8fG5NNAvzzN4D1pNjsAxRusvSPTG6th/qq/pj29lD/hqVfcx1XfVpGCkPI+8IOal+6PkEVNuYcgEuoZLzBThwMmhN2WcFwYDXThT121eZ4+GKSm3mE2zqySUEK4sVby6spN9Lp4y890f7wqxw0gncOAVDYQn4bbbutkQwh3QnMX+upmZs4fboAX3lJwcg5QQxsKeXiQI/zPzWnW93PMuaZyAQk/Kw9HTMbOdT/kC6h5+d8LNTn1JWgQzS4U6foNKKxj2nUIl3Szf3NmDR7Zur8pOIbOEoR4MLXSlTa3w37jCO/+/3VyX/m0n/RN9ayZHmdYV42yAuiZVJBgahFU4uI8QRgADNdjeMx+PnC3p87RQzwHf5KQqnnlC8GTSuFkCz+xUZMwh3BXn;
5:XU3s1cMFCwixtiU530gS7GzQ8lu73s94vUMZRAag6jXnjV/iDT/WE4eF+I1vAy8LgRU2fom04HVFJKTvlmYMFRoGBMSIjdiD0KNYRwqG++Od7Z8ZY9G3dmIui82re4V7qY1yXjuBvc/ZMW9/jNxcLnH5lrjEd4zfiozBhzmKeKI1SfZHdTFpr3/tRUe01gsD;
24:LTfEyEwRZ9brYBf2LynS1GMFmXS4h1w9yxtva1d2lj79zPwxx2l8ktK0qW+s6H+4Dxb/SaliQ85La7+57U3b6zYlHZYj8mpKkTbAvMSQefg=
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0745;
7:sQCKNJnbesYiTVCNsvMtz5qH+cFnIdRwep8GrJtb6dkl5uq7IaIvgGov2xeUK78rgWDWKuv32tXSyOTrL6cLcWYpVj/vZl/Tiuhd03OeQowRgd0xx0jzZJP2Du503VGo4Sen9wQnYsN3L5cRZKwz5xvoDmvCWJgtYD4vPXf+varDNsCtn0xB80rauHh5R8y/w8nANQR+HutY1lmzS1Nk1DuetQlxGEmSoy9fCqZ+BAtkkqYRs204wvLKubp8+dvNrjHNiC1N1q4gv9cMwt/fsWlLe+kuL1zF7tymi2ydtqwEhy+5uarwXe1/5xXIMKTwS2SFfz4TAlpqT79eQiNVTn7Ww4qE+jdccD7TyqBDXjrR9i0w7pc6Znob/ElU61nhlrtn59pQOwxodcWYeRKVYaX5yJzvgcUsVrDPTACJZUAliPhw1YGzNgW32iFpcAkNylvbCfE2s79OMR1LbBNxWQ==
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2017 10:35:41.0116 (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: CY1PR0301MB0745
Subject: [dpdk-dev] [PATCH v9 12/12] eal: enable hotplugging of devices on
bus
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: Wed, 18 Jan 2017 10:35:45 -0000
Given a bus, attach and detach callbacks allow the implementation to
handles calls from EAL for attaching or detaching a named device.
Signed-off-by: Shreyansh Jain <shreyansh.jain@nxp.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
lib/librte_eal/bsdapp/eal/eal_pci.c | 2 +
lib/librte_eal/common/eal_common_dev.c | 56 ++++++++++++++++-----
lib/librte_eal/common/eal_common_pci.c | 89 +++++++++++++++++++++++++++++++--
lib/librte_eal/common/include/rte_bus.h | 31 ++++++++++++
lib/librte_eal/common/include/rte_pci.h | 45 +++++++++++------
lib/librte_eal/linuxapp/eal/eal_pci.c | 2 +
6 files changed, 193 insertions(+), 32 deletions(-)
diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c
index e0deded..7d7f90c 100644
--- a/lib/librte_eal/bsdapp/eal/eal_pci.c
+++ b/lib/librte_eal/bsdapp/eal/eal_pci.c
@@ -682,6 +682,8 @@ struct rte_pci_bus rte_pci_bus = {
.bus = {
.scan = rte_eal_pci_scan,
.probe = rte_eal_pci_probe,
+ .attach = rte_eal_pci_attach,
+ .detach = rte_eal_pci_detach,
},
.device_list = TAILQ_HEAD_INITIALIZER(rte_pci_bus.device_list),
.driver_list = TAILQ_HEAD_INITIALIZER(rte_pci_bus.driver_list),
diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c
index 4f3b493..97d0cf5 100644
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -38,6 +38,7 @@
#include <sys/queue.h>
#include <rte_dev.h>
+#include <rte_bus.h>
#include <rte_devargs.h>
#include <rte_debug.h>
#include <rte_devargs.h>
@@ -106,23 +107,37 @@ rte_eal_dev_init(void)
int rte_eal_dev_attach(const char *name, const char *devargs)
{
- struct rte_pci_addr addr;
+ int ret = 1;
+ struct rte_bus *bus;
if (name == NULL || devargs == NULL) {
RTE_LOG(ERR, EAL, "Invalid device or arguments provided\n");
return -EINVAL;
}
- if (eal_parse_pci_DomBDF(name, &addr) == 0) {
- if (rte_eal_pci_probe_one(&addr) < 0)
+ FOREACH_BUS(bus) {
+ if (!bus->attach) {
+ RTE_LOG(DEBUG, EAL, "Bus (%s) doesn't implement"
+ " attach.\n", bus->name);
+ continue;
+ }
+ ret = bus->attach(name);
+ if (!ret) /* device successfully attached */
+ return ret;
+ if (ret > 0) /* device not found on bus */
+ continue;
+ else
goto err;
+ }
- } else {
- if (rte_eal_vdev_init(name, devargs))
+ if (ret > 0) {
+ /* In case the device was not found on any bus, search VDEV */
+ ret = rte_eal_vdev_init(name, devargs);
+ if (ret)
goto err;
}
- return 0;
+ return ret;
err:
RTE_LOG(ERR, EAL, "Driver cannot attach the device (%s)\n", name);
@@ -131,21 +146,38 @@ int rte_eal_dev_attach(const char *name, const char *devargs)
int rte_eal_dev_detach(const char *name)
{
- struct rte_pci_addr addr;
+ int ret = 1;
+ struct rte_bus *bus;
if (name == NULL) {
RTE_LOG(ERR, EAL, "Invalid device provided.\n");
return -EINVAL;
}
- if (eal_parse_pci_DomBDF(name, &addr) == 0) {
- if (rte_eal_pci_detach(&addr) < 0)
+ FOREACH_BUS(bus) {
+ if (!bus->detach) {
+ RTE_LOG(DEBUG, EAL, "Bus (%s) doesn't implement"
+ " detach.\n", bus->name);
+ continue;
+ }
+
+ ret = bus->detach(name);
+ if (!ret) /* device successfully detached */
+ return ret;
+ if (ret > 0) /* device not found on the bus */
+ continue;
+ else
goto err;
- } else {
- if (rte_eal_vdev_uninit(name))
+ }
+
+ if (ret > 0) {
+ /* In case the device was not found on any bus, search VDEV */
+ ret = rte_eal_vdev_uninit(name);
+ if (ret)
goto err;
}
- return 0;
+
+ return ret;
err:
RTE_LOG(ERR, EAL, "Driver cannot detach the device (%s)\n", name);
diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c
index a17ecaf..e4f37f3 100644
--- a/lib/librte_eal/common/eal_common_pci.c
+++ b/lib/librte_eal/common/eal_common_pci.c
@@ -364,19 +364,98 @@ rte_eal_pci_probe_one(const struct rte_pci_addr *addr)
}
/*
+ * Attach device specific by its name
+ */
+int
+rte_eal_pci_attach(const char *device_name)
+{
+ struct rte_pci_device *dev = NULL;
+ struct rte_pci_driver *drv = NULL;
+ struct rte_pci_addr addr;
+ int ret;
+
+ if (!device_name)
+ return -1;
+
+ memset(&addr, 0, sizeof(addr));
+ if (eal_parse_pci_DomBDF(device_name, &addr)) {
+ /* Device doesn't match PCI BDF naming format */
+ return 1;
+ }
+
+ if (pci_update_device(&addr) < 0)
+ goto err_return;
+
+ FOREACH_DEVICE_ON_PCIBUS(dev) {
+ if (rte_eal_compare_pci_addr(&dev->addr, &addr))
+ continue;
+
+ FOREACH_DRIVER_ON_PCIBUS(drv) {
+ ret = rte_pci_match(drv, dev);
+ if (ret) {
+ /* Match of device and driver failed */
+ RTE_LOG(DEBUG, EAL, "Driver (%s) doesn't match"
+ " the device (%s)\n", drv->driver.name,
+ device_name);
+ continue;
+ }
+
+ RTE_LOG(INFO, EAL, " probe driver: %x:%x %s\n",
+ dev->id.vendor_id, dev->id.device_id,
+ drv->driver.name);
+
+ if (drv->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)
+ goto err_return;
+ }
+
+ /* reference driver structure */
+ dev->driver = drv;
+
+ /* call the driver probe() function */
+ ret = drv->probe(drv, dev);
+ if (ret) {
+ dev->driver = NULL;
+ if (drv->drv_flags & RTE_PCI_DRV_NEED_MAPPING)
+ rte_eal_pci_unmap_device(dev);
+ }
+ return ret;
+ }
+ }
+
+ return 1;
+err_return:
+ RTE_LOG(WARNING, EAL, "Requested device " PCI_PRI_FMT
+ " cannot be used\n", dev->addr.domain, dev->addr.bus,
+ dev->addr.devid, dev->addr.function);
+ return -1;
+}
+
+/*
* Detach device specified by its pci address.
*/
int
-rte_eal_pci_detach(const struct rte_pci_addr *addr)
+rte_eal_pci_detach(const char *device_name)
{
struct rte_pci_device *dev = NULL;
- int ret = 0;
+ struct rte_pci_addr addr;
+ int ret = 1;
- if (addr == NULL)
+ if (!device_name)
return -1;
+ memset(&addr, 0, sizeof(addr));
+ if (eal_parse_pci_DomBDF(device_name, &addr)) {
+ /* Device doesn't match PCI BDF naming format */
+ return 1;
+ }
+
FOREACH_DEVICE_ON_PCIBUS(dev) {
- if (rte_eal_compare_pci_addr(&dev->addr, addr))
+ if (rte_eal_compare_pci_addr(&dev->addr, &addr))
continue;
ret = rte_eal_pci_detach_dev(dev);
@@ -391,8 +470,8 @@ rte_eal_pci_detach(const struct rte_pci_addr *addr)
free(dev);
return 0;
}
- return -1;
+ return ret;
err_return:
RTE_LOG(WARNING, EAL, "Requested device " PCI_PRI_FMT
" cannot be used\n", dev->addr.domain, dev->addr.bus,
diff --git a/lib/librte_eal/common/include/rte_bus.h b/lib/librte_eal/common/include/rte_bus.h
index 4b4bb36..1214908 100644
--- a/lib/librte_eal/common/include/rte_bus.h
+++ b/lib/librte_eal/common/include/rte_bus.h
@@ -59,6 +59,8 @@ TAILQ_HEAD(rte_bus_list, rte_bus);
/* Bus list exposed */
extern struct rte_bus_list rte_bus_list;
+#define FOREACH_BUS(bus_p) TAILQ_FOREACH(bus_p, &rte_bus_list, next)
+
/**
* Bus specific scan for devices attached on the bus.
* For each bus object, the scan would be reponsible for finding devices and
@@ -85,6 +87,33 @@ typedef int (*rte_bus_scan_t)(void);
typedef int (*rte_bus_probe_t)(void);
/**
+ * Attach a device to a bus, assuming it is 'connected' to the bus.
+ * A bus is responsible for scanning for devices. Attaching a new device is
+ * for reenabling the device after being detached/removed.
+ *
+ * @param device_name
+ * Name of the device to attach.
+ *
+ * @return
+ * 0 for successful attach
+ * !0 for unsuccessful attach (or incorrect device name)
+ */
+typedef int (*rte_bus_attach_t)(const char *device_name);
+
+/**
+ * Detach a named device from a bus. Implementation would check the existence
+ * of device on the bus and detach it.
+ *
+ * @param device_name
+ * Name of the device to detach
+ *
+ * @return
+ * 0 for successful detaching
+ * !0 if device not found or can't detach
+ */
+typedef int (*rte_bus_detach_t)(const char *device_name);
+
+/**
* A structure describing a generic bus.
*/
struct rte_bus {
@@ -92,6 +121,8 @@ struct rte_bus {
const char *name; /**< Name of the bus */
rte_bus_scan_t scan; /**< Scan for devices attached to bus */
rte_bus_probe_t probe; /**< Probe devices on bus */
+ rte_bus_attach_t attach; /**< Attach a named device */
+ rte_bus_detach_t detach; /**< Detach a named device */
};
/**
diff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/common/include/rte_pci.h
index 53793f3..820b9df 100644
--- a/lib/librte_eal/common/include/rte_pci.h
+++ b/lib/librte_eal/common/include/rte_pci.h
@@ -421,6 +421,36 @@ int
rte_eal_pci_probe(void);
/**
+ * Search and attach a PCI device to PCI Bus
+ * Implements rte_bus->attach
+ *
+ * @param device_name
+ * Name of the device to search and attach
+ *
+ * @return
+ * 0 for successful removal of device
+ * >0 if device not found on bus
+ * <0 in case of error in removal.
+ */
+int
+rte_eal_pci_attach(const char *device_name);
+
+/**
+ * Search and detach a PCI device from PCI Bus
+ * Implements rte_bus->detach
+ *
+ * @param device_name
+ * Name of the device to search and detach
+ *
+ * @return
+ * 0 for successful detaching of device
+ * >0 if device not found on bus
+ * <0 in case of error in removal.
+ */
+int
+rte_eal_pci_detach(const char *device_name);
+
+/**
* Map the PCI device resources in user space virtual memory address
*
* Note that driver should not call this function when flag
@@ -494,21 +524,6 @@ void pci_unmap_resource(void *requested_addr, size_t size);
int rte_eal_pci_probe_one(const struct rte_pci_addr *addr);
/**
- * Close the single PCI device.
- *
- * Scan the content of the PCI bus, and find the pci device specified by pci
- * address, then call the remove() function for registered driver that has a
- * matching entry in its id_table for discovered device.
- *
- * @param addr
- * The PCI Bus-Device-Function address to close.
- * @return
- * - 0 on success.
- * - Negative on error.
- */
-int rte_eal_pci_detach(const struct rte_pci_addr *addr);
-
-/**
* Dump the content of the PCI bus.
*
* @param f
diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c
index 51522af..4c562c5 100644
--- a/lib/librte_eal/linuxapp/eal/eal_pci.c
+++ b/lib/librte_eal/linuxapp/eal/eal_pci.c
@@ -720,6 +720,8 @@ struct rte_pci_bus rte_pci_bus = {
.bus = {
.scan = rte_eal_pci_scan,
.probe = rte_eal_pci_probe,
+ .attach = rte_eal_pci_attach,
+ .detach = rte_eal_pci_detach,
},
.device_list = TAILQ_HEAD_INITIALIZER(rte_pci_bus.device_list),
.driver_list = TAILQ_HEAD_INITIALIZER(rte_pci_bus.driver_list),
--
2.7.4