From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0045.outbound.protection.outlook.com [104.47.36.45]) by dpdk.org (Postfix) with ESMTP id 4120DF8C0 for ; Mon, 16 Jan 2017 16:35:38 +0100 (CET) Received: from BN3PR0301CA0083.namprd03.prod.outlook.com (10.160.152.179) by BY2PR0301MB0744.namprd03.prod.outlook.com (10.160.63.22) 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:36 +0000 Received: from BL2FFO11FD019.protection.gbl (2a01:111:f400:7c09::190) by BN3PR0301CA0083.outlook.office365.com (2a01:111:e400:401e::51) 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:36 +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 BL2FFO11FD019.mail.protection.outlook.com (10.173.161.37) 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:36 +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 v0GFZ4mo019448; Mon, 16 Jan 2017 08:35:33 -0700 From: Shreyansh Jain To: CC: , , Shreyansh Jain Date: Mon, 16 Jan 2017 21:08:27 +0530 Message-ID: <1484581107-2025-9-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: 131290545363987888; (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)(39860400002)(39400400002)(39850400002)(39450400003)(39410400002)(39380400002)(39840400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(86362001)(110136003)(575784001)(5890100001)(6916009)(54906002)(5660300001)(305945005)(48376002)(189998001)(50466002)(92566002)(5003940100001)(2950100002)(626004)(6666003)(47776003)(8656002)(33646002)(8936002)(50226002)(81156014)(81166006)(8676002)(85426001)(97736004)(104016004)(68736007)(36756003)(2906002)(4326007)(356003)(38730400001)(105606002)(106466001)(50986999)(2351001)(77096006)(27001)(76176999); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB0744; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD019; 1:U3iHITKBDEf0s25oiHVXtvN64dLcIyh5ghTCQCFriNLXMsmVgBlILErPWeoT0q46kqXFU5F3gjhs0mNhrB3m1HYx+AAH8z/GhdL+2d0LK8grAJe/6i3mZOQWP8RhDCod03XsQIbRGlVqUifDpNgsnvcEJecmWEHoDiBJaOjgZopdwVXfmLpNhtVT+VkeFc4yU35qw8cEiyCTanSMIYvIU29eQldBHPgIO2By2J2E166ifQe0sPv0Nv75xDCUEhehW/n63r2D4e0ZnKzezPMYs/sOvLUhMHWEzKIp41kQoQIz6/eaeg6xdWfd1fexQweSYzfKJeX6xZkDLqKkwvQ5dT3tdBcKWAI+aXXohBOv9RU/hqHfcyYKNTJWKgsY58JleTug37946fT35bYC+PNDRBnsVIruguMx2qJ9Kr6gWmYiF+Cmfufuw4JRVcbnSPBO4UTgakizVrWdymS1veIxuEjnpAIqUvkVOVjojWGjchTEIfOn6JLFdkJtarO6i9bYzg3k+mw/4Ig+g6guIMY7WcljQQ+brjgd0V57z+4/9aEYcKn4yz7WH1eA4Ku6suOHWurJebAqAjJoDQ0eRmk3zSeULqfdk7ZDQ49KOyZfbE2PY0rUzyg9cv2Qq16qgBLl0kyECLQPaAdZkyAdj7zGXGiBF7f7E0RHa6a0rBQShNfZtv2Ocw8ne6Y1UqCbBEAWKtMkX37nncfDDcnWx8G8Pw== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 079c7fbd-d5d7-499a-adb0-08d43e255140 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BY2PR0301MB0744; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0744; 3:QHCY0h2V1YWu0liEF+nmYDAcNYgdBIuqKdWk/hIMDTNTqyAShzcUzXZ710XoFrVGoTJT8chhHPUp4OEu2FXMWRI1Oju4xKaf37CNYns08UbkJo5P9b7e99xdm9Y/nd/pdqq3Cbk+JNZnOBpGzORn7zDZBA4QC4Gq9WpmwxPQ8AUsX1YGnMVHlrnEIkJEzK6uEvs1NwxoJn7TrOu31Drjl6sjOg/w1ZIU4hhtE+jJR5GQUaRfRJWgWX+mNc+sMLewP+I9iPR2kohf2VmQfkIor27P/qMaVYQJrqI1HA/GgAPnF91puA2AyVQJo5ZI0wVwMa1/Hud/3fwWmstokhQemn4HmPw/RCKhRhzeZmlvuLAlTq3XHJ/cLBzcpuYvxE5t X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0744; 25:z9dtWLGT+0f0FWvk/5mJTad5Eik9GS/BEgQEx6a/A72bYZBmvs6qZF9fMwOzcUxkP9d+FgEV/Ir6sIacmongPo63PI3hMFiBOODCKhCQ9OtJYOji6vNR0rB9MLTX9hDNR7d+lIybU4ziXIB3yctuYqU3CHohj61+sLBAKsG4dqkLFWUIozUkLBY8Kzo+ohCzfVKOvi0+CXa4V/0Ao7p9PvEQUJkdVl5lGEP0cr/gh5XFHyA/amRY/oeghZd3oVkLEyQQuReyS1Uoerq6r9yrrFFMrXV8hUddCBsEo8g9rVX4nQXIao6FSgrpYsXthvSQj+ZmV0Pdo8bHN3T349z+n7YtETI2OQfAu2/JFsfNLk9agRFDATgK9qOssJ80265sGkwyDmcY99hFlPgctuR13s0kOGxSPd3+p+B10dOnyKb38jf39rhPqDhoFEU8i6dTy77mxCUCY3+HZZpaaD/4YISjJbPwS90+LbobmBzaC7cjYa44xOFweYk/87T86y65CHJCpkYtSbF+di0GdIbojAKwRL5+dhSE76UoGXHX2GI3j2X0LqNw8rJDHmWzOqmYYK17xfWTuWgRAdrUw0SMWsIUXzq4NmAB8HuwjWaFTi3Vc6smZfWCHQx0N+S3ZLEwREcba/ec/zs+4Rmm/HDWkos5G91g21DIDd4QiCujKLhEl0QBU09rmOI05DOL9MSvFYQ7eWWAWzyyRwJp067eJ6ZS1XrraJImNaWu+HKocBWw4Cjsqxai8xeeAJZkr/9bTeIKzB5waNHtO+2guzkolc2CNSpfWzJ08vAzuG2Icf1ClK8jnDZWFVck8wR9ptis X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0744; 31:13JzSyM61h9hRgkVnRCnJWLRQ0yqxlWslTmfRTlB0xyeRPchcMLxf/Gh3NBQlPWv4Curegv3u5FodQqve/eioTkhatQ4iFRSlgzcBLgM4defs81499wgx/7jSdHO4JH0eJ6tC3cJBfsvBjLjHcvqNnYlHT5A2GMCQnOAPT0+f2cfIEcFmXofzf1JxuUWl21Rh4npR88VkqjeO8vl/HivqBmmPibrwmIbz3/QOW5iyNlylq2Zr3AAATPurtCcsuvkHXO7qvduUsLjyMqQQNjMPg== 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)(13023025)(13017025)(13015025)(13024025)(13018025)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6096035)(20161123561025)(20161123559025)(20161123556025)(20161123563025)(20161123565025); SRVR:BY2PR0301MB0744; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR0301MB0744; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0744; 4:hf9yHFD7YBQiA4n0ooiWRpMHm2RdYd3RiJGffMl9HS6lDIN7RAjDwioFaK+wVj6e9tg/wLImDyngCxdDC7fgQ1cHgGpSa1RnExrHFBsNdJGGU5VyvkxLVKxc+LWbaGvExHZAtqUp8vsbfranLBWDgXhazrLdDI2HhPr6exoNVICcrIABclWPvANCw+HhZB/Ys6pjDVONGm5fIbHefV3rfEU9lKa2Gq7WUdZQNqie9XK54Cso3VxLM6+0XztOwV3IqcMAreJ5WoM/1BHkcUPJ07+hh+lWt2Ed7whl6Vifbixh96TN4AhO4+hV6BYSsjN7HkMZECkOkSJRyfPPcD13sMUMfqknHM2jyMSNA/Ucd5YcXnMg7Rmbb9IOIGnt8gtOAW075wLAUPpKLyCVQ6Bxdnhjm811GdAY9cV6hjyj7/CmI8C9DswDgKh50YzVcTmmJjUec6SGx4IJ1aw+5kABmpW0xlRfPWrs2vnd8tj/Ygg57Eb+FogTF6pLMYPJNlS8wszhMyRXZIEAPbkTQCnxaQx8gQs7P+o4R7MP8smep60CcBQB+jgc3153ee2Crs04bgUPMj6vE/gGTGnHRGNmoDa4Swgll+wKgg0/gH36V7jtsa+zSNBZfeNmYHcWiqABonioI6qFwHMbniXf1l7pd+Kyey8ChWL1MdYWDOOie0dDfXeADzBaW+uamSjW2dmeYWywdqfr8PEDsKXSUlAH2GtIC3zc4C+3A2P890N0HrYZ156B3ntFQWQCLj/pGLzE X-Forefront-PRVS: 01894AD3B8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB0744; 23:Kifof5xiyeLyriD+Cir1Yb2MD6+frWDJ0jAPozf?= =?us-ascii?Q?71J0N3lArq+LQhMrDdUTAcq4zkOaKcow5MkGpWSW4CrnsHt8LxP2Zz72fZz2?= =?us-ascii?Q?7pHAODA53Ssk6Rz8ut5xAJhmNucUzViPKMza9C6dZrJoFsHyHQcF+1UwCfwi?= =?us-ascii?Q?QxEfsNt6dCXWCZp0ioMuqRa/pparTShWvHowwaAOEL+IrpvI7bHuR+nvBsDO?= =?us-ascii?Q?cec2V0YszSHle9pPQuohufIyLkbDJWiZNvhk3/KMwijL1PpVeaOTVZBI0Lq1?= =?us-ascii?Q?GauvWwV/qGZq0FQE5tblQHq2rALE8KmWJQVsg12gnBeAm5IAVGtmnwO9JgTB?= =?us-ascii?Q?cSQPBLyR25E5bhlJ/CS5h9xGv8GXtBLPATwb6WRmFOw7dKOggSriBpezPmUi?= =?us-ascii?Q?nS5b7tuWEcpKqgvLBKylKNAj+imzkz0pSdXckb5tZr3hgXxDoTCF1FatHnVV?= =?us-ascii?Q?Kym104oRp+DwNagZzZEaNTn5z1FKtxXsKnOmJ8ObFtj88m0tfMSGAswmwUj+?= =?us-ascii?Q?N5UEiH6wIscto74GeIH1OBIpcRS94qhxBCrDlq6RJjbOW/6fULjcZHan92sV?= =?us-ascii?Q?rv0+l8XZDCNOSovUiKCAzaK11bDM/g6FvjXteCPw+AbrCgJeKxBsJm2oUWBp?= =?us-ascii?Q?rnPJ3ET5ak5W0zpBAFetltggqEGvYkrWwvfn77dgd6ca9b4OlM2e2SUHy9vA?= =?us-ascii?Q?cDGWB+QoYGOqUHxjuppmWq+rMuBrLqU2Gd2coYVGmmAwoveGLT0FtzCkUknh?= =?us-ascii?Q?6j2waMNnyD/y1frm07odlK66ad2vMNJuedklagzU7aYiU4vh+uUvdHvIQ2cb?= =?us-ascii?Q?td2AR6GNHZ0RrcsGbIjeMMPiSNtTq71QwJ/kdg6rg3xfh5jwQkMB8o/ruOtS?= =?us-ascii?Q?QrCDwL5+Z6U4Cm0bjfsMJQ2GUD6kSQNc4XEMgFjgpUX6y+RaSVFaDVTHAKSu?= =?us-ascii?Q?KC7W61iJf6e1cmU3273MZPxlsdBDfjMjI5g781KAZWL9Nh995d4wdd4PYTDe?= =?us-ascii?Q?BaEuOKRQYHr8RGQlIjVBtCHHg2/yJS8SjXRofidy2tNnsTckysRRGslQ1Fey?= =?us-ascii?Q?qrSbe62pLSbYEyGrpgNrTMpZZCUrRxG6CtCha8hol6LSZKItI2bh0u12hd9l?= =?us-ascii?Q?HCp0dDwQoeeEpd17wqh5DwYA2bxMy0LaHie7OaRibfl+rvsmBUDbe9L92+Zz?= =?us-ascii?Q?myo5ne/ImrhZH6wdRckEqY1UnpaS0PD8CoYQHGJZTx5xN/gM7q4CMaW7pmwJ?= =?us-ascii?Q?0oi7VA2kiU3ipFySZX5t61F17AKOrKYhOPHwHu6r1Sguv86lwyj6PALDeJJZ?= =?us-ascii?Q?RA7nyj67hSTa3IMq0SV5H+cObRvSyRBUUgzalEx3KEb9QmF8LlRLz28rmmNG?= =?us-ascii?Q?SFkmUqw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0744; 6:1ya2+0xpyU/2DBuIkiW4LSBT9rKz/ViJro4lb7V0GHsZ52MQWI6vhOmufyRtVj1pjcapDTyR5ytLuwY6C7XL+oaJ0Sxkd5uIYgD7tGj/ADkgUu5CYyvIt0rCRVAzL4lAsDFjamuManBPTz3of6hPhNvGQcp3LFf+0hXJPKcXRFCdtQ3iTPNiO/XuC8wgIw26mIXI6vLJ3efP7dlDPHx3F2TNDzAo1McFUysHQ8TdMhJa0JuzeMFMZnAYTtby96S0XAu9QipCAuU8rUDsZ1iECxNh8vvpphhSq0XGPSQru1hbuB5nzPcaM+PDBjvaIUNvORFrvBA9exkQlNBW7dxlYmu37nqm1TmcE5PPaolFG7Tf5WblNcnT4jziXKvLjE8uKkBwpAbPNyz3m+/zTTTyIlsAtWzo+C5pFdvA2icm3rFOl7EJJgrsOAL7JKFwAexV; 5:ZyH75x2prR4N6O4Q4GssrGxP2eyxzJLdNzACvy4vKTagd8KHCjzaN4lomslszi0pW1TEdhRb5gEK6o2zuzgqNP9aYcdSGdxCFHTExcUPOSiiadVeK5mS8qIV8SWJNcI65WXdYwSpPQuYKIjqodJ1WpcK0DCyL1ZwbiiZycUOra1x+Im1Ovd0p3lsPrt2rMmw; 24:CFn2EcT6OMLy33/tX5+6ycaFZkFAklfZ22d6ddfP2CVx6ueOS648492psIWB2ON9umKP3PmSgKUd3T5jEGlDRWU6WbZ4dLtaJRLFukbABIg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0744; 7:uug2O/vLv8SkItvfGSLaVoOVpxdO4v1zC66mJhgZ3qG/FI3tD8kSu6+JbbA+wUsLJ+dvsh0Vgi/d06rieIKds/Fao1Tg9zVeW02Tv4KpAf4O7yVbTpNu0shuq4AlnFBxalgqT75b2XPaAEBlfhNW4OT/57nRtmoOG3uaxeoAxe2GFD75s+eRoNnUKKuQ6czgN661wPtHl8EwpJHEkHuh6rJOam73MIyitW4ZquuGvNGlmltywcaaMW785xfNgMyh1FUDY3FfUzOigAnYlglvvEjALDoqmoBOLcAoAnq0AsPfpBe1uA9iJWB9Se+8oeI/deVXjZM9XMoAJc8Tj+BQZCf/l05vc1YamcyW0DNk7oXieP7n9A0W3yV9Ln4KggvwZOAG86/tLnM4O2ZeI7UD1DamDYYs1SgoPMMVjYBJ9uXOV4CL9LAOyW95PNaC5Ghqk4ZgOLhZ6bbDb9SkE0jLaA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2017 15:35:36.2271 (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: BY2PR0301MB0744 Subject: [dpdk-dev] [PATCH v6 8/8] 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: Mon, 16 Jan 2017 15:35:39 -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 | 82 +++++++++++++++++++++++++++++++-- lib/librte_eal/common/include/rte_bus.h | 35 ++++++++++++++ lib/librte_eal/common/include/rte_pci.h | 58 +++++++++++++++++++---- lib/librte_eal/linuxapp/eal/eal_pci.c | 2 + 6 files changed, 212 insertions(+), 23 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c index 48bfe24..17a04d9 100644 --- a/lib/librte_eal/bsdapp/eal/eal_pci.c +++ b/lib/librte_eal/bsdapp/eal/eal_pci.c @@ -678,6 +678,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..b363fa9 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(bus, 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(bus, 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 1d283d2..1c205bd 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -389,19 +389,95 @@ rte_eal_pci_probe_one(const struct rte_pci_addr *addr) } /* + * Attach device specific by its name + */ +int +rte_eal_pci_attach(struct rte_bus *bus __rte_unused, const char *device_name) +{ + struct rte_pci_device *dev = NULL; + struct rte_pci_driver *drv = NULL; + struct rte_pci_addr addr; + int ret = -1; + + if (!device_name) + return -1; + + memset(&addr, 0, sizeof(addr)); + if (eal_parse_pci_DomBDF(device_name, &addr) == 0) { + /* Device doesn't match PCI BDF naming format */ + return -1; + } + + 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; + +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(struct rte_bus *bus __rte_unused, const char *device_name) { struct rte_pci_device *dev = NULL; + struct rte_pci_addr addr; int ret = 0; - if (addr == NULL) + if (!device_name) return -1; + memset(&addr, 0, sizeof(addr)); + if (eal_parse_pci_DomBDF(device_name, &addr) == 0) { + /* 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); diff --git a/lib/librte_eal/common/include/rte_bus.h b/lib/librte_eal/common/include/rte_bus.h index f1d4c2c..5b7ae0c 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,37 @@ 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 bus + * Generic bus object which was registered with EAL + * @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)(struct rte_bus *bus, 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 bus + * Generic bus object which was registered with EAL + * @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)(struct rte_bus *bus, const char *device_name); + +/** * A structure describing a generic bus. */ struct rte_bus { @@ -101,6 +134,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 5f8d679..6369584 100644 --- a/lib/librte_eal/common/include/rte_pci.h +++ b/lib/librte_eal/common/include/rte_pci.h @@ -421,6 +421,40 @@ int rte_eal_pci_probe(void); /** + * Search and attach a PCI device to PCI Bus + * Implements rte_bus->attach + * + * @param bus + * Generic bus object representing PCI bus + * @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(struct rte_bus *bus, const char *device_name); + +/** + * Search and detach a PCI device from PCI Bus + * Implements rte_bus->detach + * + * @param bus + * Generic bus object representing PCI bus + * @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(struct rte_bus *bus, 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,19 +528,27 @@ 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. + * Attach a PCI device on PCI Bus + * @param bus + * Generic Bus object for PCI Bus. If passed NULL, PCI bus is extracted + * using Bus APIs. + * @param device_name + * Device Name, which would be converted into BDF. + */ +int rte_eal_pci_attach(struct rte_bus *bus, const char *device_name); + +/** + * Detach a single PCI device. * - * @param addr - * The PCI Bus-Device-Function address to close. + * @param bus + * Generic bus object for PCI bus. + * @param device_name + * Device Name, which would be converted into BDF. * @return * - 0 on success. * - Negative on error. */ -int rte_eal_pci_detach(const struct rte_pci_addr *addr); +int rte_eal_pci_detach(struct rte_bus *bus, const char *device_name); /** * Dump the content of the PCI bus. diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c index 50ad9f7..8084996 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c @@ -716,6 +716,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