From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0082.outbound.protection.outlook.com [104.47.36.82]) by dpdk.org (Postfix) with ESMTP id C575137B1 for ; Tue, 17 Jan 2017 14:35:15 +0100 (CET) Received: from CY1PR03CA0028.namprd03.prod.outlook.com (10.174.128.38) by SN1PR0301MB1583.namprd03.prod.outlook.com (10.162.130.17) 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:14 +0000 Received: from BN1AFFO11FD006.protection.gbl (2a01:111:f400:7c10::121) by CY1PR03CA0028.outlook.office365.com (2603:10b6:600::38) 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:14 +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 BN1AFFO11FD006.mail.protection.outlook.com (10.58.52.66) 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:35:13 +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 v0HDYI2n005071; Tue, 17 Jan 2017 06:35:11 -0700 From: Shreyansh Jain To: CC: , , Shreyansh Jain Date: Tue, 17 Jan 2017 19:07:44 +0530 Message-ID: <1484660264-6531-10-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: 131291337136556783; (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)(39410400002)(39860400002)(39850400002)(39450400003)(39380400002)(39840400002)(39400400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(5660300001)(50466002)(8936002)(106466001)(68736007)(356003)(2351001)(38730400001)(97736004)(105606002)(8676002)(48376002)(33646002)(86362001)(30001)(50226002)(575784001)(85426001)(77096006)(626004)(50986999)(5003940100001)(305945005)(92566002)(76176999)(110136003)(47776003)(104016004)(54906002)(4326007)(81166006)(6666003)(2906002)(2950100002)(6916009)(5890100001)(81156014)(189998001)(36756003)(8656002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0301MB1583; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD006; 1:avrJDuH2e7qjLmuc3izNmHNu6XMtv4k0LpP881x4e78dQcQKp0KEshg3/bLxaFucBHKfii6fuiTwXidCAS1Ar/jY55MhoD56r/8AOiKDnX8gG+CQ7XbuZm8+xy1WDIdOwqGk04LKazpcPP85HDQTmrpAskpEVD4a/EK5Jl0Q8pD96VL/RAx3YcSQYNlF2z5gV0anQgzCN5DVVHEciyJX7ddUzovMSE4Y6dFEoN5EPLBXHvhW4PEmHrwPBccLw2vddnaZ06BoWcm1agERewJ7SicsRvx2L0uVIDOmDAoZPziwS41ufbNIn1i+JiUfpDogIuysg/Zrrb55xqO2D/ex9i5ZOhp4OOmQJJE7SfMaIazrclcGuYACJZwPNZdxL0n6457y3zX4j7am/xGmrXZ3OQoyV0PQmXqdH0v9DRFnaVBLTLSKH1OIzKGAp8CGZiYxUwNnKLXp5dVDgrW5TVJlDDVYOYeS6WiKYIQ9zpEGJx0ahYLxwbm4vBtBkA1ffu0F5Bx3MT8IIljMeZBZAVjSUsSUmiZUqNiiFiSBrT2dT+hT/c34DVEy2OJylWzq+HsjR3rizBp3UfFg2bRWU5uv0vSwlX73AA3uxDhUbiS4fDHFyqzazw39oeO+P9KifkWH5gI+24ztptKYKignuRGC4mtYKsya4PRGWCM/ARWobR4i/G4QcOmX0HESvfdWEjLQvH5KyEUejlmE53yw/cwyHQ== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 9804bd3b-eb4d-4a5b-e992-08d43eddaa90 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:SN1PR0301MB1583; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1583; 3:HxSjbqdqMUiUDWISgRwnVfXUEkI/5q4TNHhqyIHWCiq99r5KYboisuc8VbLGdSYxGiWSmmX3suj7azOoAVSm/eSFC3TmtdZECZQ/U9onMGK+e9A5BZmyvO8JGUGrZCPuAWxoE/BFI9mVVcjBI0++jGi7rzbQmfGBQzrkmqHuq7qbD/jUORThpHpLE3C5DyDEDwdGVSNVUycIgszlwEqIzNEdw5b+awwGPMAlDvW0MQyU4DVd2W4DCxkiiB1LgUDEFyULYsHslGpSybBT2ErXCO3pUoQ92n/l5Nz5rieewlBJ23rBqNSi6Gt3SECIUSbzzywZ7O6ZmLHBHMAlapGmM/v1RQ4YjVgKPw9LdhOtT6/c8MB5TZMeOH51ZAalTLsS; 25:GRYQkX782q01VEB+GzqtwqTLXBf3euF77t+SoBKyczGm6h6vm82WEm1zztiR5k889VxJhOiUJeQl0V5qZ0TEqtbKrlGq5Xny8SEB0ALV5vRJD9N2SSLwQpIzMRkQlVmgc2eL5i9bUYV6kqo4fNRccFV5czo0QWs8klEHs4K713q61zxCKqzMX6YGNyIpxGxJktMOQix6aDJ/1O877uKSCoF//qbwNXQv1HVOdFSCBNrPn8sDFnZ4FX4dMugaL/254YMC7slTk8ebUFLJhb89LN3YWtlpkPQ6XNMfQhqh6xlAUeFplYImywjvkCEJ6Hn4WYAGYnBlaOp6/tRlKfxIoqf3aI/TZqVTHEmVgJcQH5PcIItLDesp42cjapXfyeQEf43yJRuL7uDBd8Kp0jE1K5JwIAeaNwL+LOr987roXrTtwDeFdFcFmMTiq9Fm/jRADf8TBtH0GR+p2e3iOXKOmQ== X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1583; 31:M/iYdDUZGL4W3s7vVuXnUVM997W22t1fus17qV1rSMtd2ngYiwlRfU2B8O5emCdJyCbDsbQE8srHja/knbgYxZy5ilBMuLTa/aPPQRFjEHoPFc5JVj1m5GVtUgueXPRNhA25kVqHM/bOOy0qyaxNdt6OkSu+u6PgeOYLdlNJ/A87TjjgmYL8cEsB5ctJk8TAy+zgwXCFxqbQbMvjul2N+oTGpWGpgB1M7E7aStsaiMrn2xMKZuCxkhavHVX7D0OBjZfPJzRDBkZrenlEp4zJuGuYb1c+ypQbvTsuvBkgEks= 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:SN1PR0301MB1583; BCL:0; PCL:0; RULEID:(400006); SRVR:SN1PR0301MB1583; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1583; 4:EfZ6pSs6fTYdM3nSJmcYcIBnNCLjQeyq4xL7ubk9YdpwLbVinXnCZc1m/pZkwYPfmTyGK1lwdO8QvoB/FdITXa4hCFeLuYiwn1iIPgqANqhnsELIobkPjYy5PI7MoQg49pH/5c9wYfwdrmSOO3DNxHDi/EQUyMrepQvCFdIY7mlO+khiR0vbDgmOmQO02Fn5emGg5bVj7iTmRwaZulOH6NFr13Y/zWRQQfD/bZwKNoEe3Ixjr6WKbOAGRMkSIp04ndhFVReyFsVLzzLkgX2NFc76MrTHzgimCBKmMfwJY6zEwgck7ZzfdXpBjolSuo64maTyG0ZT3eDCGxHB5hAhC1QXNzc0rSci7ha7xQrr5ipTfimvWZhWCN7zE3gY380HdvmWup53K95zDSn/NLvCn4p4Uh3JcMIEF5E5+Hm/akvAiU/XJUvfTbp3fnHlQY8XT5RI10txQAtNLU/V7WuP13uJY+YKd21gQDDq/RNmElfjSVVKvaPujAuoFX8Rl7aaz3KZx2pq7zMkoKlonWTXHuhWwKFny/9rHlr2Hdh+5CuQpFpDdJ0Cn2GBpwvmAqTde5vTmRbKNiNJ1UEgjE1VxNc5FpXYNPL5kNoh4PvU1NCmuTF3ntAeG0p2RYqGAJIm9n8h4AdjEDBMXdS57mBP2ghTq5dOChgpLkhL7azKBHZeonxrt/3wPC65tSoJ1eQ71oS7uzDrKFwQq2lWJUQvWgB1YNTNTZ8bid9/EtQrRL53xDWRP31Z+x5oFWWIqP/n X-Forefront-PRVS: 01901B3451 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR0301MB1583; 23:uhNHe18/NppHv06oXt87Xeu5r3HwPOQMjNPPcur?= =?us-ascii?Q?+IZGjOAkCPshPtpaPp/3KJAC/fKLkVVVzF7zuAIqKJJJuMUt3bLwcroZaQAv?= =?us-ascii?Q?7UkD/LWD0/7JScjWivQHDYe3piH+YNcpmM8ZFGJKXrEUNuL+q6e0f1pGJhV6?= =?us-ascii?Q?Ooe6DJ2zZdqXmaBXtBA1fpHVRPNq9m5tsw3arhrqGgJLEyIY0nko/zS1UbWs?= =?us-ascii?Q?/Js0UGPpd14yDBgggmpB1IYM3NGawAmqeFU8muA3t4/Ef1QzRaGEV7eb7vFm?= =?us-ascii?Q?GBIxCXU8WEzmmLETirGzFFjuBtn5YdYnPKn7KNWdht0FTRJwCS97Pf/6NoAp?= =?us-ascii?Q?Y5RAotmhnZy93Ey+hJblykmGBCCItPQ5zbwMHL2tCRgI/CmF6PqCxyCiXxUR?= =?us-ascii?Q?L1tyEfekC4XrEFVuQ2hZVFMZy3y2/FSNLbcvyQtdpbez9aiNzmfRlLtKC2Zr?= =?us-ascii?Q?+0WypU86FGAaxRX5+7/VQqISHOkrLhx34XmsDLbh/m21wz7QJqmcPsI2/QkW?= =?us-ascii?Q?Ud1WfH/qeB90dMuonwVOqSSkDIowL025CCwd/XmEzbbMExviMRKAbm7Xwkh3?= =?us-ascii?Q?IIfN5TQEYt7HZPQYAsK1uyj3EP8xE0MSRLg3upSyHkqcfXkmoGXnTEFbauRx?= =?us-ascii?Q?ZKAdxOz0WEgtqBDoJaCku4Nv7V7ZdLRjSToMh6AStn4RTe4T9lP7dl0gJWVP?= =?us-ascii?Q?WrsD7FfG+5k6gjQG+AI35MBTv/ri9EjT9xHEC2BAWTkbzKiKY9bZva6JMtCt?= =?us-ascii?Q?7axXMXJU1Ej5T9w9eD8iAqdLQHEfb9Neo9rKzp870TkRUHkCPMXjS+l7/J44?= =?us-ascii?Q?NIF2c/pIvMqo1Kn0FoZnOxuaNbx2z1zn952sKkBAP6PhUrkt5yncHtPqozpY?= =?us-ascii?Q?n/v+DkgckafD4agoNlq1Npe2BsTlUgIZA00du3Fr/jko+MHejIcNOtmraf8Z?= =?us-ascii?Q?7U6pODZZMremWj6iL3NFldnSWysItewwwff0Sdb73AQgCDRvP5YGAZWgswWz?= =?us-ascii?Q?pu8fFrQdcjgbzm9hnfeAI39ipxRnJJnMpcXGo6SdRFQia+DD+LFHnQM4VwhA?= =?us-ascii?Q?NArAWTd05IZHgtHy+3ShNpWcWXnc7dbq7a91fhuq8nPoScndQvRp1tlvH3mv?= =?us-ascii?Q?JsGot2hmmFoQ/Y+tfE9jaGG00Q8SfJk353eiS7WwbRLpuITuJSBNA1Hu7uW0?= =?us-ascii?Q?iyoXpro9bL0YtpodBFd27+M2sS+fYNFDiEz1TYZEF+yiGulTSePXz6GgwZu3?= =?us-ascii?Q?CAXU9SUu++kITbFd13bntf4QbvtWVl7N36vFBqpmCUoTfXx60nILNels+1y8?= =?us-ascii?Q?VfUTrJ2H9gbPxVYTZRC1Qm3pz6u0P/2JC9Au1bQb/BH7w+WfbegUwi/36393?= =?us-ascii?Q?rLUE2yQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1583; 6:8GMJeaAkewCQputHCUcnHMeenxuaFZXf+aXPry4aAMU6hnoaO4ayx4qx9M6RwycrqreAXlraokUKoeozq38AUSrWtyB1UQCwaE8zzATE5LFbpGdfn5EB8NaEk3QAQskkIPCzUfcJySI8T3IASmJ75H2yLawkcFEvKJlRjadiYIrGIqg5b3BsdLaXe3I0I65sagS+sMBLYo2C9n0ks+Uo0q/km2yLxJRySLRfZAmyvdkDBRtKsfEzkh3AiaQly26juj+kmueMZVCZnTPOn46JbFk7TWrbibzrqJC5QxNe8Xg1VTJLoZ/ez2o5oFU8neZHmYiRhG8ihn8WUfN++3MgX10m46NtN54fQcsY/oqkf2fQm3GrQIbSxtVh8c72AI39z11JwDt8d7EkXdc8o9y1pdsWpg5YpiXqwai8fA31Cjglx0TT79WaQgzW7gwSAMfJ; 5:ygbAXpwfsG50JGPcNHwY7mVcwBurFpoyWHWbSVAD8n2npPa8i9nNBRx9F62je6SvmXV3Bgy6J8oRl88tabI/0pY6Y2tjvN4bOmEOpAGpTLCnTu875MfJF7rhL8TrdGMgu90bCVrAqn3+yWv8lKV1LqrFPvgny8XBkSjPCyVQ32iE3zFZOJPviSl6LlHieZVb; 24:oZMOkW0X+FpB6LHwbWlFhG5neRJCiVvsaXJt8sDa5mGf66uJaBVU0os81V5Qz6F6UeBH1aYE7vf2eI6lZnjT1W9FKfBd2+zCje72AlllaX8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1583; 7:3nMsc7Qxrr2S70B0YmcfvLXWwV/EiQBd5aQ21bU9UMhiAi2iyrfSHPO34n4uEWPQENafmiqYVIsD1WciXZiaEX0DbK8xWbvw6tyUAw6wZnY2xSDxM0FENe4XkReeGY1bnlkk/4WwlW+1N9GMhpI2bF5qeLXhktde2Jm1yPBcD9XabEFJV8wDEGREEolQc5AENkI/Xo+BXJA3IjMRNmaheXIJzFP63QB6CzyhwZHrJc26jRmMgzuCEod6AHryVXpUvy2XLtavGwUsOR4ic7yV+75epXYDRWkJNM6DNhFfM95XbKehkQkd1UawD6vJWjMTMh/NUsmPW6PVZT2BE4xdzdq8wtBjYqNA2LLokH9JNhOZfCxfpSlm6AoiovE2JGjIKMkEmB+60cGgvMgwBrJH3qVRMo+miKQLGdzFZ4GuyfNoVzYRls2N43eDF1iTdAb+hv/ZppQ/b4QlRpH0IGyphQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2017 13:35:13.4684 (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: SN1PR0301MB1583 Subject: [dpdk-dev] [PATCH v8 9/9] 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jan 2017 13:35:16 -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 --- 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 #include +#include #include #include #include @@ -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 d8c1350..8eed8d1 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -389,19 +389,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 = pci_detach_all_drivers(dev); @@ -412,8 +491,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 9a93454..7d93430 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 @@ -94,6 +96,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 { @@ -101,6 +130,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