From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0042.outbound.protection.outlook.com [104.47.32.42]) by dpdk.org (Postfix) with ESMTP id CC2882BF2 for ; Mon, 16 Jan 2017 16:35:27 +0100 (CET) Received: from BY2PR03CA055.namprd03.prod.outlook.com (10.141.249.28) by CY1PR0301MB0748.namprd03.prod.outlook.com (10.160.159.154) 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:25 +0000 Received: from BN1AFFO11FD046.protection.gbl (2a01:111:f400:7c10::107) by BY2PR03CA055.outlook.office365.com (2a01:111:e400:2c5d::28) 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:24 +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 BN1AFFO11FD046.mail.protection.outlook.com (10.58.53.61) 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:23 +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 v0GFZ4mk019448; Mon, 16 Jan 2017 08:35:21 -0700 From: Shreyansh Jain To: CC: , , Shreyansh Jain Date: Mon, 16 Jan 2017 21:08:23 +0530 Message-ID: <1484581107-2025-5-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: 131290545236376284; (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)(39380400002)(39860400002)(39840400002)(39450400003)(39850400002)(39410400002)(39400400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(50466002)(48376002)(8676002)(6916009)(305945005)(81166006)(86362001)(36756003)(2950100002)(81156014)(8936002)(2906002)(97736004)(189998001)(5660300001)(575784001)(50226002)(5890100001)(4326007)(2351001)(85426001)(77096006)(105606002)(50986999)(5003940100001)(38730400001)(92566002)(68736007)(104016004)(8656002)(33646002)(106466001)(110136003)(54906002)(47776003)(356003)(76176999)(27001)(626004); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB0748; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD046; 1:rIBsmx6/3ZfDBgD6k5YhM82/ZdC8Ecea28AYC4/ZUEGgfNJPMNCtGpo/PN5XRakCMRJd3mLF8GwO3FcC3rJptrroCWdL+NYLWDtRwORJjxGgDh/oOiq8EqrEOG11WP/43h5w+NOwjSc9NlVd6v3Kf+oXh1qDv6h0c1eqIfh3OwV5WU9UDsGxw9HePNZlW03nGrBc4CF7rWTI2WzMQVv9ATk+hRyFsg3e2ei9k5i46m9pQxNJ3k74tJNJUPBrRcKPBXOGeZkY0DuEA91vOC3KCfQIjlN5gE630P/RouFRkB8nSC7dSJvnynkH9SO9hFoi+XQUoKKseI/RhmFcP3MA/oGdv5YrZmsgvBdcJfchkmYrtLF/IC3WW1RG9BYJy3fUfWjYQa1CMV+MPQnmeJDr8mHqdMvy7c0TMIfYUuTMnBuxbExzji3ZjNW5lUxtOd8frdVi+ab/FvhrcmIIcXp+jpgEQ/t5rBg1PILOWDRvRc3gbUKSaA7ghQa4WAgyS4F2xe7WdkAIFS2W1jVCMFEtS0s2XUDgFeklq7q+Vz703NkC4J/DB7E6vDq6Gqt8QrYgmOqjRU0yNJEcbYulVmspYD6ZbnXJ3Cv3Yjm//YsM8ydav1FmugY62LiEJCiMie34prHHgdWtWfq8OAWF/PDJBXgfyvNGx+Q8Q3DR/SP+Hu9wbLwb/0WAPM8/I/yGWScnGmjRcxCyDtZ2GsZ1bKqr1w== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 2cb41f0a-f0cc-4714-1982-08d43e2549a3 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY1PR0301MB0748; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0748; 3:MlDv201PPP7wzYIJ3Ay21MTzpRss8BUV0dyfi+eQA0mMihjhXoG6koYBZgfTBPoTJifyTO9zjecYWZZ6AJHapRWH2hSKw7/7c7UKWHNAdPBGqjXOUZPhQFy7VoAoFP9SojIJchYMdwre/SUC/RRXr+NqQrB+SZ2js+Yuk4Moq2uGAVhGaez56NZ6R83MxtW8eR+f3VP7/lse4DH6OhJXDU3meZET9+zGGtFEcj/pyH5xV1PTqLkSDu365xjtmrgq7wqQc2zzdV3vhWhmfbaVcLRpD3dvPDZH+9XhkWni1kwvl/6qwxDdzCoSZfh/H5prwWzPlM3qHo0z6bm4bQK5Iqo1HaU7S7IBJ8QiS99nQ6EGaAglz4espdTvJUC79orQ X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0748; 25:lHT4fCbRFmc7CJOtjEEdQOulVL4ku2RkiQsSkOcrbPDsj+ce+xFlZRceZVTxcq53ySlvkE6DyZ+yE5b7gQh2LtJSVpd6uF9i2LiA/V0/FJZ2xg0vojaT8bfJoyzCjrhZFcNYHMA1WJwmUucuBBK5hJz8uKwqpeQeiCDfk7ljrNFPSXkauLiOEizr9smRf2ECqPr3ipsmJs2Bj9kb/swxtfmAxC8NmL95MYA+1BxSBZ8uYeEthr1IosemF7lYqRFX4Gwd5Dbe+DoWjKMcu5Da6XsAx+pzxymbcTyRi6N2g5LpZW+04klknJCKioF7fnFDVMSsXWLGWcia5sKq58Qj0810/1YQSgh2iWuBtOvRYqYEVoTr64MCA4ySbTWAj7BjPKxL14Dg5gswI53vLoZnFpFbTDpC26CBhvV/Aner84m/Gxy6pHacICKP4IIio/7c6JmtnwdWnE2FI3rnpBaWJdVeWr7S+88s8NK22E2Bo5Q8foOHwnC74nFRadqQN+Y+NfVTN9teR+epfCxsE6/6OqQyOisFy0ZfK1qNQ0bMkB461nqV3o6eakkuuVaLn8vjSpCEy/zKbwLJb5sl3BZIQLc+/A2+Muo1rf/GDKOlIGZTDY5d84TiNVTmRO62mmWQhikrG5Z4iCPs+k+TmHW9lzwVVdqiIhpDoVZA0rMcvfzYFrnO/qxwXcczZVLHurIFyht513CWsZVfyjregwq9qzqOwlRDl4tE1DJcQQFalsDlT7fGDCvQo5Cz4xooTcv6D3gqNTGfWLmz4c1hoMCb/XEqAivFv8oV4cVzKKcIn0Kt8w8VPkxrIdPc89LP/VHn X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0748; 31:cmvRtDy8dc20djvWmSNqJM4VZ5ZyoQSHatQ2bydkAvZYoV+zigeDfSFl5dQ9b0nl6zP+YiaB6u5hvzMfSaohdDRVXt4uo/lNQs+UnUvQbVrz/jJr4mkZKjJ61URBFV79R8sWkSVvtUt3utE8giXFKeEuZTc66DdZhb0UdbVQshklr2IXW2tf6qt4bsg8CG28RPl1gPfXs4P/Rt9KpkPTEjns3V5U6wWyZBsXqu5lXc9OCKNBn14hkVvrUExUwsrn7J12jtQTt567LFGHBBlb5dBjhTaJj8cgkRqwm2pFKws= 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)(8121501046)(5005006)(13024025)(13015025)(13023025)(13018025)(13017025)(10201501046)(3002001)(6055026)(6096035)(20161123561025)(20161123556025)(20161123563025)(20161123559025)(20161123565025); SRVR:CY1PR0301MB0748; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR0301MB0748; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0748; 4:0bMEE2v8WM+HuUNcmGwx14OIHFhGxapYFWakFsJrDhYOoUC/flf58Q+hW6GWkpRBfWYWIT+XnSwCG3ll151HJ1itqgHUvRKwdMMmFSyGWBoUdOIqyRmsXziEoDpWYEG3yxgne2nEfwf1ejZYshHYsgw2ZW0N1lyWKnEyg63LX3+2P9UDmv7UWIkUlDUwatZdvt41w2Ak6BCu1hU5qgiLCv5SrykDvziwB+2rG1qFdrzCqV+MsYCcln3hX1stuRW9ZoFqh7yVfHlsAJYBmaQk+MksLLjUzN97DzdIB1j1UxUqiNvapgesyd6PX1v4LQ9TMy8jhhOVPiYtRZc/+RixzMfmNW91mEcQjWj6nRXVauD6J3Gt1lt+En3eX7MnudwQpOV7Hn7yf0EaPSN9xOe+cPrcAkCADyUQEeoEoaq4deE3N0ZBc6ZscGdbZfMdSBOSzvtnCebmAl2LPM6DZA9CHHRqHcRUDFb/qkwUER3o1WskJHw1IrDLuuO3LCJXv8Zx2mRChT7JoF4XxSqAdUO2ncgYcUV20VzKnC57u25VSuvJIYfSxomdVqg9Q26c5KWbg+vepTJx2C6qakr15ewqSkfDWtE/jsnqxk0JqwEFQoWDv19CvgNCnejuqLUdvgj6gxPsxSlcpUgsZ4oj6L4MO3yHjiclWs1quVpIpNrXhPEOG7CYHduFaD0DIwcEhyLHiCD2RXVTSBI+9Ay/xkIp7j/NB8ka7D9qQAmPIV8UzctPjYi49KCOtPN3a+Xnh2Nk X-Forefront-PRVS: 01894AD3B8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB0748; 23:DWsXDSWH7WeYz1LsJjpkToMJqrYoOgk9mFyjFLU?= =?us-ascii?Q?rVaAYkywO62F7BamHEcLM+32d3EB5LbMM6Ja+eyaQfNaJajAYqXYObq/LBSt?= =?us-ascii?Q?zhNw7ISnow/fe+MdkNM3mXqD6bCRwwIs6U+LkGydTv02/INc/DEc/S6W7iLO?= =?us-ascii?Q?omfncwCNuvD0kJ+DtYmahnmD2fx29MpTvjHM6qERwDr/6lZ7BUDnMhEsgjAJ?= =?us-ascii?Q?m2vGm1QJZMpQOpcfaUATXeFs2fRn6axy9m2Ybt7Oq7ZnOO23Iqmr9u+/lDsc?= =?us-ascii?Q?zqzozklOqhAQS/k7/ginbOGqVV6N7v35yfITaUSuiZeiqd6Vjv17RQObaxzk?= =?us-ascii?Q?/w75JzsyS7ilaw+Peo7NwHUC1fvVTj/+mNcuJCyt31xkMiY+RkeK4JZ1lOec?= =?us-ascii?Q?zTCz6/EwFpF+O9YWrJ81NzmNRnlwS01eBqscWQ0HjNYnL+4425m7y3K7NIux?= =?us-ascii?Q?nRGmHCX9mUJ61kTu0rdxYvDRnEZKqX8FR29RzlMl7ssxF8r1I3gJtlSM1qng?= =?us-ascii?Q?el5PaFthZZo3o4S8HebKTR11rXbrDLQSQcJ8tWA8nlJ6x3U2LH0Pd6n12u9Q?= =?us-ascii?Q?Nlobz76nC5Qrgk/e6FJ5OvvV2dx0gGKtTHzGHXEkKqnK2rJb7KrQLss5y9rb?= =?us-ascii?Q?ZMEtCGupDOyPGdD6DWXjPX8kK5Bg4BTmqetIET98DtFFfV9caFU0aZOEvmFW?= =?us-ascii?Q?FbK5jttShjpKQJYA2wNzixDT9SxzffgyweIJxAbSAIOrMdPTZ8Umd2UubWii?= =?us-ascii?Q?/pYmqRG7iaRVj2Jr/zun/IsDdK+Htdaus8tjnS0mGYx8hstXO3rKgCfiC2h2?= =?us-ascii?Q?Tl3EYv5ltzbFBbRTKRnY2mBSZW1ZdrGZqUjCBoE269qNwslZQcCaF/iaOiyg?= =?us-ascii?Q?w/7ifba9ISH/XVUkNl+u+cp19iprBX/XKSplDeNREPlm5hiAMuOXI72Zf1yu?= =?us-ascii?Q?olisGxvar8GAA3MqX8Cfkct/1yBmjaHCM2xxnterP0s3tweacajXz6L/Z4GH?= =?us-ascii?Q?IW/EdozM+8n6anJHvmDffKhoDDIZbkZcZvUvssuEF5Afy6V+lNwsCTYvi+Jh?= =?us-ascii?Q?3mU1Q7EpeNa3mqr/He0DDts+mHQMwtBuxSxr1yGg43ELW4rdyhXUGlPsIXpv?= =?us-ascii?Q?jDMEpQUCQ7j12SD85bpILHtbAuqsFTSGV4/tuFvmeWhbgev45qtmsfIQwVUd?= =?us-ascii?Q?BNX17jlEecTe1gOEqZ/Wgi+ga9hXIt7CCoiTTcI12OUbH835MZJ3Xn/q3Odl?= =?us-ascii?Q?VoB7xajKrcZ7BgrsKi6IoP+CijH0mWj4T7KOe5bmX+jFgwVXDbE5x4bFGFJ/?= =?us-ascii?Q?f6CEYrriyc15jT/iBwgYUViHVcQCFrnXAVb7NcRuBvvN0?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0748; 6:7kyA1LFldSII+R9Dgej+yOwy0dQZNDy0MAb2qdPHupOp9cPS4AhgkMm6YIq/cYZsZtTOtSs12fDMDyLKSDMgEsIvTN/Iv02IpThNTt/WlmFFG/iEzKoPIVAOMhKC6v1DXvJwjLhVUtPXkRrVq72umwkwpi4E6h8DdHlCtE2C82U42QVd1vyvUxEkCcqnd5TNxbMLeAFXyT1GMrZEQEF8e6Oxra3UnkT8FGlIWVWhVZsGSqrh0oRIzIiKI5L7kiW5aSeqTNDjHE/V+w5IRQ6BNyFdCUdUxR0QBJuJRUYpuPA00EZLPDb2FNlG59bsk4xpmbrRh1c5QCG2ofQe8JEufyK2wzLw3qm/nbL4nhFgRUPTHFvrz7jhX2neVafLeYbb9BUrcjKRFPUCbIVi8oj0MwvtJNlRS7sVUKRnsAcVozH3Ic9l/s/yChNqdzsriSR0; 5:1GjOyTSLjKA8m0oI66LHWg/1VtOfO7R2A7tCOAbwt5XI3ez5px+nfXJJFIrobZufm3r6PPlJgBHeKH03h5SnJX/XCUFGUX3WxjgDULDKQN14U2sE+bw+oIHLqAuJ2HpWwl+gSObvYyFIVZzBZ3xQeAXdrOlnmgL5jDMraqrHotoYRHFWNTxswMnPhYmUShpD; 24:k9m9cpnuHUxNzr2kKQC/oFpzeI1T9XB4oDmgsrFpBkfmhIebylmrp5oR0esWJLh+Dd4VhuOY6a9LncYKxvx7WGeruzRdNfWu5SMN9lNmjN4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0748; 7:v71djJnyLWSyovj3PmvfXRX5fAczveHttDmcUu7dNdlzJqcjkXRZK1kHHlZ4w8FAfzNvKgMJCA3oCg+hzO8gbF/tspuVFLxMMxGweDQKB/MvN08m3UK0+uEzqKQ88lOjz3hqGMlIDNK8V2Nwl8/rnZmtopyylWSkMjZyva6S4fD+SprEUcbLhWLq5O+NWERFSuBEdvClVMdLQitLEZJQfNaNkO+7OdDMKX1gF/CPC3MpQ3MyNBpw25Jp/mKw8Sectl4emFHylAYddVXveo3oKXxUqLRFIrko2mAYGu4xKXr0HqC+fC/uSIWwqdS1SYm/jD9zH9zx4QudlPDb/hfvnAx73joGDRF1EYuAFozn3o0D9Bt5nUOJDNK3ipiHhjJ7vstEo7g7jyABrovHteJv9nsFsdSf4w8XuNPdvS5gX+NrIcPWJhLLECg4wwpH8F4ueCKfbvF1EbcpbxoMZcAxVA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2017 15:35:23.4504 (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: CY1PR0301MB0748 Subject: [dpdk-dev] [PATCH v6 4/8] eal/bus: support for scanning of 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:28 -0000 Scan for bus discovers the devices available on the bus and adds them to a bus specific device list. Each bus mandatorily implements this method. Test cases for Bus are also updated by this patch. Signed-off-by: Shreyansh Jain --- app/test/test_bus.c | 175 ++++++++++++++++++++++++++++++++ lib/librte_eal/common/eal_common_bus.c | 2 + lib/librte_eal/common/include/rte_bus.h | 18 ++++ 3 files changed, 195 insertions(+) diff --git a/app/test/test_bus.c b/app/test/test_bus.c index 9680bac..0b6d011 100644 --- a/app/test/test_bus.c +++ b/app/test/test_bus.c @@ -106,10 +106,26 @@ struct dummy_bus_map { struct rte_bus_list orig_bus_list = TAILQ_HEAD_INITIALIZER(orig_bus_list); +/* Forward declarations for callbacks from bus */ + +/* Bus A + * Scan would register devA1 and devA2 to bus + */ +static int scan_fn_for_busA(void); + +/* Bus B + * Scan would register devB1 and devB2 to bus + */ +static int scan_fn_for_busB(void); + +/* generic implementations wrapped around by above declarations */ +static int generic_scan_fn(struct rte_bus *bus); + struct dummy_bus busA = { .name = "busA_impl", /* busA */ .bus = { .name = "busA", + .scan = scan_fn_for_busA, }, }; @@ -117,6 +133,7 @@ struct dummy_bus busB = { .name = "busB_impl", /* busB */ .bus = { .name = "busB", + .scan = scan_fn_for_busB, }, }; @@ -226,9 +243,81 @@ dump_device_tree(void) printf("------>8-------\n"); } +/* @internal + * Move over the bus_map and find the entry matching the bus object + * passed as argument. + * For each device in that bus_map list, register. + * + * @param bus + * bus to scan againt test entry + * @return + * 0 for successful scan, even if no devices are found + * !0 for any error in scanning (like, invalid bus) + */ +static int +generic_scan_fn(struct rte_bus *bus) +{ + int i = 0; + struct dummy_device *ddev = NULL; + struct dummy_bus_map *dbmap = NULL; + struct dummy_bus *db = NULL; + + if (!bus) + return -1; + + /* Extract the device tree node using the bus passed */ + for (i = 0; bus_map[i].name; i++) { + if (!strcmp(bus_map[i].name, bus->name)) { + dbmap = &bus_map[i]; + break; + } + } + + if (!dbmap) + return -1; + + db = dbmap->dbus; + + /* For all the devices in the device tree (bus_map), add device */ + for (i = 0; dbmap->ddevices[i]; i++) { + ddev = dbmap->ddevices[i]; + TAILQ_INSERT_TAIL(&db->device_list, ddev, next); + ddev->dev.bus = bus; + } + + return 0; +} + +int +scan_fn_for_busA(void) { + struct dummy_bus_map *dbm; + + dbm = &bus_map[0]; + while (dbm) { + if (strcmp(dbm->name, "busA") == 0) + return generic_scan_fn(&dbm->dbus->bus); + dbm++; + } + return 1; +} + +int +scan_fn_for_busB(void) { + struct dummy_bus_map *dbm; + + dbm = &bus_map[0]; + while (dbm) { + if (strcmp(dbm->name, "busB") == 0) + return generic_scan_fn(&dbm->dbus->bus); + dbm++; + } + return 1; +} + static int test_bus_setup(void) { + int i = 0; struct rte_bus *bus_p = NULL; /* Preserve the original bus list before executing test */ @@ -238,6 +327,13 @@ test_bus_setup(void) TAILQ_INSERT_TAIL(&orig_bus_list, bus_p, next); } + /* Initialize the bus lists */ + for (i = 0; bus_map[i].name; i++) { + TAILQ_INIT(&bus_map[i].dbus->device_list); + TAILQ_INIT(&bus_map[i].dbus->driver_list); + } + + dump_device_tree(); return 0; } @@ -336,6 +432,79 @@ test_bus_unregistration(void) return 0; } +static int +test_device_unregistration_on_bus(void) +{ + int i; + struct rte_bus *bus = NULL; + struct dummy_device *ddev; + struct dummy_bus *dbus; + + for (i = 0; bus_map[i].name; i++) { + bus = &(bus_map[i].dbus->bus); + if (!bus) { + printf("Unable to find bus (%s)\n", + bus_map[i].name); + return -1; + } + + dbus = container_of(bus, struct dummy_bus, bus); + /* For bus 'bus', unregister all devices */ + TAILQ_FOREACH(ddev, &dbus->device_list, next) { + TAILQ_REMOVE(&dbus->device_list, ddev, next); + } + } + + for (i = 0; bus_map[i].name; i++) { + bus = &(bus_map[i].dbus->bus); + dbus = container_of(bus, struct dummy_bus, bus); + + if (!TAILQ_EMPTY(&dbus->device_list)) { + printf("Unable to remove all devices on bus (%s)\n", + bus->name); + return -1; + } + } + + /* All devices from all buses have been removed */ + printf("All devices on all buses unregistered.\n"); + dump_device_tree(); + + return 0; +} + +/* @internal + * For each bus registered, call the scan function to identify devices + * on the bus. + * + * @param void + * @return + * 0 for successful scan + * !0 for unsuccessful scan + * + */ +static int +test_bus_scan(void) +{ + int ret; + struct rte_bus *bus; + + TAILQ_FOREACH(bus, &rte_bus_list, next) { + /* Call the scan function for each bus */ + ret = bus->scan(); + if (ret) { + printf("Scan of buses failed.\n"); + return -1; + } + } + + printf("Scan of all buses completed.\n"); + dump_device_tree(); + + return 0; +} + + int test_bus(void) { @@ -346,6 +515,12 @@ test_bus(void) if (test_bus_registration()) return -1; + if (test_bus_scan()) + return -1; + + if (test_device_unregistration_on_bus()) + return -1; + if (test_bus_unregistration()) return -1; diff --git a/lib/librte_eal/common/eal_common_bus.c b/lib/librte_eal/common/eal_common_bus.c index c891392..35baff8 100644 --- a/lib/librte_eal/common/eal_common_bus.c +++ b/lib/librte_eal/common/eal_common_bus.c @@ -51,6 +51,8 @@ rte_bus_register(struct rte_bus *bus) { RTE_VERIFY(bus); RTE_VERIFY(bus->name && strlen(bus->name)); + /* A bus should mandatorily have the scan implemented */ + RTE_VERIFY(bus->scan); TAILQ_INSERT_TAIL(&rte_bus_list, bus, next); RTE_LOG(INFO, EAL, "Registered [%s] bus.\n", bus->name); diff --git a/lib/librte_eal/common/include/rte_bus.h b/lib/librte_eal/common/include/rte_bus.h index fe0f69d..152451c 100644 --- a/lib/librte_eal/common/include/rte_bus.h +++ b/lib/librte_eal/common/include/rte_bus.h @@ -60,11 +60,29 @@ TAILQ_HEAD(rte_bus_list, rte_bus); extern struct rte_bus_list rte_bus_list; /** + * Bus specific scan for devices attached on the bus. + * For each bus object, the scan would be reponsible for finding devices and + * adding them to its private device list. + * + * A bus should mandatorily implement this method. + * + * Generic bus object passed only as a helper for implementation to find + * their respective registered bus object. Implementations can choose not + * to use this variable. + * + * @return + * 0 for successful scan + * !0 (<0) for unsuccessful scan with error value + */ +typedef int (*rte_bus_scan_t)(void); + +/** * A structure describing a generic bus. */ struct rte_bus { TAILQ_ENTRY(rte_bus) next; /**< Next bus object in linked list */ const char *name; /**< Name of the bus */ + rte_bus_scan_t scan; /**< Scan for devices attached to bus */ }; /** -- 2.7.4