From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0060.outbound.protection.outlook.com [104.47.36.60]) by dpdk.org (Postfix) with ESMTP id 3EBE42BF2 for ; Tue, 17 Jan 2017 11:06:36 +0100 (CET) Received: from BN3PR03CA0100.namprd03.prod.outlook.com (10.174.66.18) by BN1PR0301MB0740.namprd03.prod.outlook.com (10.160.78.147) 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 10:06:33 +0000 Received: from BL2FFO11FD048.protection.gbl (2a01:111:f400:7c09::179) by BN3PR03CA0100.outlook.office365.com (2603:10b6:400:4::18) 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 10:06:33 +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 BL2FFO11FD048.mail.protection.outlook.com (10.173.161.210) 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 10:06:33 +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 v0HA67Tm024558; Tue, 17 Jan 2017 03:06:31 -0700 From: Shreyansh Jain To: CC: , , Shreyansh Jain Date: Tue, 17 Jan 2017 15:39:34 +0530 Message-ID: <1484647774-28984-10-git-send-email-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484647774-28984-1-git-send-email-shreyansh.jain@nxp.com> References: <1484581107-2025-1-git-send-email-shreyansh.jain@nxp.com> <1484647774-28984-1-git-send-email-shreyansh.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131291211936927404; (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)(39400400002)(39380400002)(39840400002)(39860400002)(39450400003)(39850400002)(39410400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(2906002)(356003)(4326007)(189998001)(575784001)(86362001)(38730400001)(54906002)(5890100001)(8656002)(77096006)(305945005)(47776003)(92566002)(97736004)(105606002)(50986999)(68736007)(50226002)(2351001)(76176999)(8676002)(5003940100001)(104016004)(626004)(5660300001)(81156014)(8936002)(81166006)(106466001)(85426001)(36756003)(48376002)(33646002)(2950100002)(6916009)(110136003)(50466002)(30001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR0301MB0740; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD048; 1:7J0rbGf2yCTClOGrDh3UCisB9xN2BcC8Z0ba1SB/E71C4hoouhfmuz7g686puAKYvB9jYml7t7ikGbXkR/VWYSqWX6cxxYM+0tY/yWER7Z8edY3toA+t2bPiPKE703Nto7Iz5nXeQgtGampuMIPUc9jpZlwbPwrEDcLUbnKeQ6OBQRsxggqx0HDKqZoWrwU9n2Ftc8dauOUXcNxvq69qu1pQgVfdB1jAW+LbkwCTQmBVOdeBVynkARGRi9Rh1LTMaVx66MM46aysnuSyMuMJVAfdtECVGeQM6LhS2bsEHaS1DjjGlZc5khAlTHAF3u7pP7F0WCpS2e+klPqMO274hiD9tCzc2QOFrMRhqVu8m7wdQJrCLvF8nwW17szmZur29+g0/85qAM6X6a+gmiHU3GiSzFQPTvRSWDSOFMvh4cXeeBkFcyPD2fh8Q8ACih7VkN1VtiFuCrKqOtsO4zhp3Fa8xjmnRj2iTCA/Usxb0DQ8+zsPIgF+k7ba/6j+efi2v3mfFTUn2NhJPWCKV56cl/Ys9ZjgTtNxQCcVyJJg4u9Jr6TlFGpKn+rGbJIyUruC+A3JxHoOE0CexUq2mPKWg/vsaPBSqnTPCbw2yKHk4nvoYGMrxjtRhK6Eze9SnTptgd1QhNHQ2DY7yWh6pu712Kk4ei2Nyz7Xc3r+rMpMqQ25aGPHHoOXe+17PTnk3omtAjFD/ZkEcnW1IDjjo2fBIA== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 39fd138e-f6b8-46a7-2d4f-08d43ec08416 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BN1PR0301MB0740; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0740; 3:jKTuHWWM+NO634fiTxMM0MsC4ZE5O4++9aogjk7eXQmj5rV8k6aVPlVoRyTHw3OnMVj+cq3tbSTpMxjw5rH98cOZweGWRipDeT4B7IB0SYNi18Scy6ViXRH/eLuoK8oHfcw2C41dv7mEB5lxCOwZDQsIFongTsFHqZwpyRO+F2b8tt4drFZ7uVXlQ7sUHsNFDt9w/zD7H6gXgm3v2xgaxz9SGrpf95IwwqHdXR5AzX5tW5o7tHNUrhqJdTTSrUS7t+8tpbbyQzjZSKEjwHcJNMujU8wi51PBmYElM6EdSvMxJFlQDa498/KmCde6pIedCUBbVppU/qdf58odh9MVfIkOhmg5XUmJlGUaUelIBgnLlgy4FYYO7YEgYxYmGSt+; 25:zvLCydvtIAxzXys5jpL/YJ0pzmhyBo/rtsxVr43mvkNR7k2hjkoCPyslA9st2IvQUSZYwsG5PZ47pFko2TAvtuWf0CwjBxOIgsR8EKmUblJkKnta16aokzTNWmI5lL2oPT999ehE/2iNh9YU87F9/BrLTYaatkMPZ1gcK8kdnAIJp9mcrCzK7pWSIEDx5q88QqDQ6WW1sBxCqLUPZLexcSkpFvc5krBeqQP1xYs84B96KB/d8HhXuqube+4lKbRizpSGtVbOktjzIQ2+anTTN9P0Y0VhY81axOgwXwPJMzvGP86YvV/lWOH5b+Woy5R5rLzJ+uWYjRg3drT5Q8yZz/Yh4QaZfdSzCZ+9KmfJ60de+dn3MHqpoBVQEKO+dRNWW7811EZPZkluH1sGUG7F9tw9JHn2fsc/0loVdxazlA28InKA0j4Uvp0sslu/AznhGa4Ki6XmOwdCKoEohLzjvQ== X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0740; 31:qiCN0//l7AUu6ueYHsBSHm+TOXysJghyiUXPvVel8hQ3VTuXWpPHUv4iNRsw7zX3sPwAOt3LoLdpi5vmMEiJ5tWUs2l2Cz1N7pkfEm69Iu/icBOymLgVUJgKBse6MhxOcSRqGbjsiggcwZZxedSlTaUHbnjN2u0B71Z1xyKMfRx6gbtlEInDUCR5wpBjyP0Fv/mlGasdyOhpzrRh5Molj1xPgb9uBGXDk3ucv4PxZN3cUfPLdaN9Dd6YzRPjd3NCcmbjoDsCsf1HnROBhrYZyg== 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:BN1PR0301MB0740; BCL:0; PCL:0; RULEID:(400006); SRVR:BN1PR0301MB0740; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0740; 4:yJ+ZNlV+gdweBXNbCoeIwLvbhGE8FTnvMKigJ4mDCNjewNTxRz12iFYUOYpjRubj5mA5ZRChxIZI6cmcmV/T+KcQT06fGof5Ut52pYM5dwJYi+yyl+kLsAnVkSoweW1+qO/dWyQoudRtU6NtJRyub0uEQF6F6V8ly5leriDeb9E5V5BCj8KGZGZ9V8Ya79z8kKchHkgnBBBunLBGjpOSlI4byVyZOmx/Gv6Z1VSHzGX8ijvjwnxSAgeJZqaX4koNmCTDyLzljugK7pFPsqMbUV5mDQBpUe9A2FbifSNNUCncMUTiAUQ9sgJQ+pRaPdSR1etDyh/7rzswd3XQKf1sAuCttGsk/d1hseiKWNnqzYSvs78lOX4h89oiXV3fNQ5q0t+NWzo9QWP4QJ+GXI/72+CdfiN+Qn55wd0Q46HJbUpXo0paEDH37pRAIRcCKOCRk9dPqyGGcj24lXWECPvTrcZ0mGULoCpyoRx0db4QvOBUw+kpno2lxuTGmTLynX1tcTkw3jcYcH7m6qfpPZsc3r6f0AA9VjOXuvqjDOZJjlJFPa5rFc/qnZ9XUfeUNZfZwgVkLb3yXbtD4nGz8rCv+H7EG2JCuBwQmJD6twv/RIBl/TVgYI0PLHK2Iz5Gi/qAsMVe2taPxm86rNkXxETlXdLms+f/XP8+nCcUUPBjfsdI8Xb7/H+278Brnvmc54fnLJOVZdiL/MFhQDFHkehIT7ea9QEnvhOiwT/FXVFwqgBKFtBsvmvPdDTxEjXe7aEp X-Forefront-PRVS: 01901B3451 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR0301MB0740; 23:hV7um1pSyaTEpK0Otv8N3Ax2zwvOQQzkoECiiOq?= =?us-ascii?Q?plbCsV/cC/O3NlT0qke32rWFuhdVIJ64esQmQdYhZJN6nYcKz/25riP0pSDS?= =?us-ascii?Q?/9qBxt+qwjD7TihCn7H932JihZfX/AY4CvSAKQdilMj1vpW7BhVFOfKO9Z/N?= =?us-ascii?Q?v3WkNtI0fE/MC19c3RhdcW5xcq2wlVdbSPaGFSTqjQ0zxYCecv0co4Hn8m2i?= =?us-ascii?Q?nVmX0jJYTHOvyiHlfMVFLTJv4SyPFM8Ol+arnK6gODPGuOvAHoek4OxfixzS?= =?us-ascii?Q?j5gRYNLnau2H+z7Vxuj5ibA01cF45gzMsKGcU9jE7A8/s/zRsjiB33GJo/YC?= =?us-ascii?Q?8pKUw5NcCfOiwJ/x0rLuxH3nrywPGgcaTxz/BNF3hwcu1R2Rh40hq9BkGFxs?= =?us-ascii?Q?qz+4h684L2WirQhwLZNU7brdYyJnzxcwc0GODeaPfeeTj27jRGHXFQlelJsE?= =?us-ascii?Q?Bp7yNjG1pQhlWsR2pHOnxyVHkQjgChvbzemrX8J6EGJBPC4RppQtmJKTNGCR?= =?us-ascii?Q?CUbHkMKhl8TCUAVB5NgemlH28mQwMB1qAhcRZOCL5nvgDedtquNtlHRFtQSU?= =?us-ascii?Q?yBD82Kln+Bu47Iqdatqe6OLEFGuflG71str7bc7vfgBz6RPww/cnDxwgGz2X?= =?us-ascii?Q?fV6/r97I4QTdTS8AZ6zL9X4l7cN1+sMi8NMHEGP8Od7+mSuFt9v46cOfkHKo?= =?us-ascii?Q?hNODUsHDEuWuXG4Qffo7thH3CSbySLt3I1xjFdk0i6fthb8NuG+sDmmwM2mE?= =?us-ascii?Q?mi9KL0SzTc+5DR0VafycpBXOJTMadh4uuY5dPdFT6+w0cEoOh88adQ7a4Ggm?= =?us-ascii?Q?WvoxEUuYCx2EPcQgxPk3ZrJ2BsJ/LVg2e05sAP/7CQn14FT+1UO5ZROkCHpD?= =?us-ascii?Q?SFg4qnqjCB89l/hQgb0Ymg1Lvh0OGdC0ECgrsSVVxzu/RInsGDUZPnChnPap?= =?us-ascii?Q?LeqVTnrMwdGBLkE3ddmMEc+GIYT84xn/8e//qu/cHhUclSZEwxAXt1BwY0P4?= =?us-ascii?Q?PHh1PXwJUjLQxLTAJ9l4Sok13Dpiq7IF3piABFnSHAqhg6LpzLF6+Hc/urZe?= =?us-ascii?Q?iBztnUIQz+ZDWsS/JoQFo1Dz63Xqa3tv8VCHtZCBP5mklsNO42zhd6rOr6Nd?= =?us-ascii?Q?IsIKomDRDHA1+qM8YtGddb3x5+9lFt0+OhrrtpflkJmsbrC/FI/KqJkH3cQ2?= =?us-ascii?Q?J+fdnCZDxbQI92W3wKOqGyls0i36tSccNXxUgmopeauXlAxdvB5pvk87gERK?= =?us-ascii?Q?RSrP+w6VlqQe4lX6t5efAGf37GZJs/twbOE9N7JOPKQWPQvO0U8wMlOX6RI5?= =?us-ascii?Q?yRfR60+WOoz5OXm/scYBAoVqbZ7uyToW1p1tudb4VBkHk?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0740; 6:GEBA1jSAL99MMWaErwfAYwKQ9oKJ6LNDOT1bmbbv74ozMFlcpd/1ImHad81vWWCCasy1cTsUTLRwBASKeI1HabWvNucTv8Q8UYaX/+kkp9ffD3Q/DsJm8z5QIbGRNGfaX/EOFdi2t6eVTbXYIq+F9g2K0+el+oUBWUk309eZgxGEy0VSQSsjU4tm+g+qKf5GQWoWfiiJQvnpH82YIhIPrarLDpr5M7OPy7f/2Ycx1f84G+ekes8FBg99XCIxcbDnmnd1UTHCMlAtr01AkJS3l5AilFRfADO1o4yaHmTQyy7HEjcRbdhZfacoc0iINaShyfCIfslOyKnFkCjRqft9ohsQnBGZyCgdvy/WC0f2J8MlNgsrWlR5MY+9XKHpd3ERI+MXTonif/XwjrqslcdYKpkwB1TWAWqRzD9W7F3nILOyJb6+kujjZARfezjy7ka+; 5:SjLOvU8gre75HVv2nnTXH+DQOtrM5qcrSWlm8TPZkXGVwiNC3E4PV6YqLuwCtCOkQE13DjWtmZ4OjCTOSEU4VmT7XmKY7GjJ+7xiaidLUu4piIp4yHnYWmSR1kd2zMfRvzIpOrK3TcVd7xlpLZ4bnN+b8JtNBHxRj9aeVR7fdlnHSq8BHK3wZmsstHX2VshW; 24:Fn1KIMSrgegBrcSfNT11vR+gfa+M9YUBj99qXHoKyHP/7VW06b0l2cKuav96Gz1UkiW3jgnpbOhb91KANPYPZt9NFbTo+OeAjF1toG1mWZM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0740; 7:FgA3DoFqs3gsfQ4FmEDzvzh7XOZtMO9PJIMaZK+Y2nEep8XcrnaN/j58nVbqaTli6BtRv7L8WxY8PCZvVZ/EtxTqhaQAxOfrXkV1x7i8BMOczUKV2DJhDZR28Yse3WyUkWxA31P6RGcWlAY/vI3vQbKMysn/Y7p6E5rENgvU04yxdNniNzxYSRO2UvsQlgMr6l8+ZhG+Yt1gKjUzUhzskiYSmSKySh+tGYooLA7Cps7ntdBGHwUtA1vaz73HycvuIxMjdNSoQSgW8ETpXIxJxxd7f9mMDneov+cuEZGzIf+YWOct/buNb3V+bCWaSziw7Ni6FlONs3ZetQchWDwFzN9oamawlRX93/blRallEnwBNjhyj/kCzT5OLmJtofYc7GCQJa3Ynh9Ip/miAEWPUb77vWCW2DZyiUXgKOOIy6yAIOsuirr5Jwpf0+xqv/7zoJit/rCaLCU+SM2uJJeZbQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2017 10:06:33.5055 (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: BN1PR0301MB0740 Subject: [dpdk-dev] [PATCH v7 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 10:06:36 -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 | 86 +++++++++++++++++++++++++++++++-- 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, 192 insertions(+), 30 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..f4866da 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -389,19 +389,99 @@ 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 = -1; + + 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 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(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)) { + /* 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 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