From patchwork Tue Jan 17 13:37:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreyansh Jain X-Patchwork-Id: 19609 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 61AF32C4F; Tue, 17 Jan 2017 14:35:23 +0100 (CET) Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0087.outbound.protection.outlook.com [104.47.33.87]) by dpdk.org (Postfix) with ESMTP id D4DC03238 for ; Tue, 17 Jan 2017 14:35:03 +0100 (CET) Received: from BN3PR0301CA0024.namprd03.prod.outlook.com (10.160.180.162) by BN6PR03MB2466.namprd03.prod.outlook.com (10.168.223.20) 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:02 +0000 Received: from BN1BFFO11FD022.protection.gbl (2a01:111:f400:7c10::1:142) by BN3PR0301CA0024.outlook.office365.com (2a01:111:e400:4000::34) 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; Tue, 17 Jan 2017 13:35:03 +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 BN1BFFO11FD022.mail.protection.outlook.com (10.58.144.85) 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:01 +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 v0HDYI2i005071; Tue, 17 Jan 2017 06:34:59 -0700 From: Shreyansh Jain To: CC: , , Shreyansh Jain Date: Tue, 17 Jan 2017 19:07:39 +0530 Message-ID: <1484660264-6531-5-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: 131291337019083485; (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)(39410400002)(39850400002)(39860400002)(39840400002)(39450400003)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(36756003)(68736007)(85426001)(4326007)(50986999)(76176999)(92566002)(54906002)(33646002)(104016004)(47776003)(2906002)(106466001)(110136003)(6916009)(6666003)(2950100002)(8656002)(5003940100001)(189998001)(2351001)(5890100001)(50226002)(97736004)(86362001)(81156014)(5660300001)(50466002)(105606002)(356003)(38730400001)(575784001)(8676002)(626004)(8936002)(77096006)(81166006)(305945005)(30001)(48376002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR03MB2466; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD022; 1:NoPeh5KIe0BW4XwBak2R4WGrAC+am0aPuzq4F4zQnXXHHlBkPj8G8AKqtLKtjh1ErjrQp3hRMkciDWeMS+pyu3GQLL7bUjaK+r9FDVYhxJOjmn1MWuaZczD/uqDGVQgKMRL67iAWBp4+1n2rtsgl3I26OhUTNU0VMDi8VNA0WHWazCSgC1rZA6lUyKTUXiB/jel7wueHUghYCQuczi5Xyws1YfXzwOKqsxhusGGxgXuZPA2BJaolPzaXsl9ybN0mIX26J6k3S5gJHntew9ixLv73ksYtxeq8f/jOmfp2YHpt4ehrYl9Pk34QTC5ghyztmrGKasrI1UJ5KgbPjLgvEUE4Td4HBIIQriX4rbEJyp7i2JeFqtEZcfLP5MV+vkzo/REQKzDr0yMRqxqZXNBWPksta2zIRTfwlR697AYWgUZGKE6zKiEMsobVYW3uYyiuRbMDiWWrzqmXf9gnY8vmIE1mlBmse9J3g7jtZslEr1QYZ5m+R1BoYLMUVF5RQBRD9XipRzZ5C6JLrtagPzcscw9oo9kKvv98EK+fPGgR06VjEv7wYF/JVgOJiY+eL7PqCzd7n0BxCEpa8CzLGUxMZbgyreNvxNdrWrqnF7A7SvdOSnfuw3QjeScEZOYncP8qi5a++upUjOBMQKuieetbvyQWHRG3pb4UrDIJjsKwWkfV9Twz2eOjgIe4f0NwRYQ7HLQqCxVXgJ/G+6buBKY5Tg== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: c046bbe7-16a1-4452-6981-08d43edda390 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BN6PR03MB2466; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2466; 3:W+8yn2wfdP7zFwrIsKiUMAr6QarjMPGCZzNEW7fqK4V+vqw8nwryUR2Dcjql5ajBnEXRjCO5oGC6vTAjHR/K908pEG3ta73B3UV36bYYWD24TwnN/KCCy3vgZ7bahHwmyMxdAsA+ZWzobfU+9AeAXMfUSDfHOl7QcjGpqF/yPHBmx+sR7h3+8lIVppOxrfPaZAkBsMLyoe/A8eHvQQA3rByyjFBfyvGb5lOsqsYvgaMX5X1AxlQNRCBX9/GctcQSbUOjX7PjKkS/6EoXZ/0n0JUNPsXpy/vg5ED1OwIxvdNuBX7tNWTpCz2fpFIVdkl3zQalC3O9siuVJIyobvSIHNMRH6YGeYCb8NSKGJHZrw7i4MCpsopgqNq7NqhZjPYv; 25:sAsPlIWnQuCX+vqu2+61B7Zut5tDdqzX1YPNmxxntVSt+g/mphViuZZuz4q4jbPEqGxr8IuBCFl5KFDoiYP4Ag9FuonbRSun1EuWKBqx88cdbABq92nRvVWHYBQru+CVf+SmSf0dCMzynYfRJIBI3Ky9WGdT7JXzPY7z9fFxIIgcDs3XptUNvWrEGz+ip1KgX9BJbF0915V1hxexy2B/twNOKaDjDjRFWJ9RlMIPFKTENacPrKJ+RGIjZpc1sAdxYSmz5rsnK1EbdFAVRAdLjNUP6MPgGccWiImCaDwoi+4n5iY8Syww3HKabbm8WgsvRYgy5/BeC8lh1Xc+tfY/Us1x85cYAoUnORGgQY+jrQV9RxxFelYcHzV9spFmMmHQSdcF3bXoSQR2dO5EwCVk1gPSoC+nze69SBQQaAarakSnptHxUSI52k/QlE75GbRRHeu7Epo6fyCvv32er0cqSQ== X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2466; 31:yH2FpWMo02xHjCbYYUqgnt+jyHEvh5B33vGrghYZvrTNaf3W4/ZXV7VG4S7YIBCbUq6RRKb/jayPVgoSn9I+p/YQYJmbdvOUlKizJzH0e4dIT1oZB1EniSq2gZmJ0F8Qkrn7KDon9wD14gMwGAHJ0gZg4Ywk2P3C78VGAXng3Irafk3+kqN/uipkiuPAcITbUevAPni9jbQ2rAvGEaxL+mzyiu8eYiRYgj1IMsGVeSe85D5ljONCuddyVxLTHB4WVa0+NBildVDuJ6d/c3DATozmlpfTluu3a8GStoTXudc= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(5005006)(8121501046)(13024025)(13015025)(13023025)(13017025)(13018025)(10201501046)(3002001)(6055026)(6096035)(20161123559025)(20161123561025)(20161123556025)(20161123563025)(20161123565025); SRVR:BN6PR03MB2466; BCL:0; PCL:0; RULEID:(400006); SRVR:BN6PR03MB2466; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2466; 4:fMiZ++11VqqPkGzagHD9/tvyGaA40hLR2DSETfj8ot6OJVdaC3kpHot0Z4SG2qsXuGrh9tUBUuqRB02wIw2XClCc3KAnUOUb2NbhrLXoPF6W+FxeMn8p+nl1BwkN+PjbL9kMl8+rqxpUxwbIiwqRyfKWumvPiKS6Lmmvud1mv2um5JiTU/ACJNrV+rd9WxUaTpYYuYjHHo1IVaxzubbdPtlSSWLeZgqQsAPAkTSTElzhgFcN3WivmZy+xF9MCOX7paMJBF3XapxxBgw4bbs36x/oIX41HxAsoNlFAwANN9Z9BuhYNkWg9XOCVxvnuMh/psGYkrd309nPBLhsHCa7MeXNlEH6I1aU0rnxOxzUjKmbW+Jenw+BOIvMKXHW7n4aOQ+SaHQSLvORDT8vNR3RCp3RLRhyMZbyivxvZ1qQOMto2Se3G4eb1y+EgokhZhQlkDno/2xHa3pznY6lD7wosrkNfLGlFmMTLf5F/0xWU9jU+0B+JLjsaqeiuncqrDIMjmSvkrCShvMVPjEfR3LmI1huT8CzO39mKWYZn5QZqmbY6Exbh/Ik2Pgarw+FyZky/gfZZLNElFXgTDhfAcwigrg3wkMBdp7cRBHrw2YnHY7kbWP0ZXBANYpafOjLhWnun9p/ytJK21D8PlodEnLl9nBFvOr/u+IXaHZcsKQn8B3myZgGyK+hgWfVyRFVqxIpm1BGJj3y5boHwm2b8BctQWLDCRBVUZ7vSqHEOqIPsgp3sCltBAD/r/qu+UHR5NcrPNTbiDEfKE2BuOsq14T12A== X-Forefront-PRVS: 01901B3451 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR03MB2466; 23:+/QHBGcdoAjLRRQE0pn+Vy7AXg7t6ph/2lt7yHLlK?= akuOZSna4Ff6Sq9qqpJjTDQscLESU6NebupzpnViyDcphsBAB4Qb7TB/V0P07xNAgqdiLF9Slhx5K95b7VlM1V/7QPpOFhyqUeb9GTLfbEEiAWlHkAiAa7j1DIjmiknvYL5vxLh+DZrGDO/3nAmwQSpX+AnSKRtbu7hliM6zP8ndHAaR8ALOwqE9aluOF1T+mXu+QxRXnNENSDOuEUgrXKt1fjpBWjHnEsAgaE7MKpXhRNu1+6w092kSFLSbm+tWIF6ycjPCG51oyUDKkrrfxoRidnRR4Yy8S+aKsooRH5zF7XLsGztcPe8sj/5ZKKv0z4kyAIAjkTbomvRuYpOQ3kzuliCkbnkgSBZ1oJvmHwUrRUxvoKLo1c+a09IzM+lEz/JKLqkqDpWeqU1OHXL0sKmjzmCFYIBVW/5bNPQkpNEPFxkDeJ5OyH+BtIMXLyouHOEiB+MDaqRrvESsSda7xPm+qBcIxklxqD0+0N2ezd8YQzMA0El3ElUXwFHX+RKKd0kK70eWmjX7Z/+8+d8/9UaSsJ6vWn93Onzg5ymE09VzOjk1aQD5nCfV/gxTEPyiTkCxWInh47DUEB0mgFdmMFNIbAeCtPp3sKO2lOPaV+d7VFdqq4LWM8Jsa0yTJntc3RoijJKt6/gm+KO37sUTZjwaOXttO32rXRk3xZch0UnOxw7rhWtedN7TL4Xwbf7JNFHXR8Xt+sn5okzB9Mff3tZEzBC/WtrO0ET65sWM5/SbF7jCqam48KYJDN2m9vP5UkVSVM41zBxGkMiLOxgaTd76svrb0NDMQZtXyegtOZnTq/nxNytX7gYMb9o5c13CBmnOUpoOGutmy5RBtOnNopS92GIX18Dy3DYOudM+Pjt5t8JovaAPAyhmaXBWh8c27hf3NWUlpMmKMkXdSXTKcdumD4p6AzWfzkAXu4y0mFP3iDFvhMpjdVGv+zxzRFZWAOXsX7OLqvsJpuNGowhsVOSNnNZNFSKzCXRWzciKb6wjztAL1k2xi9IylGMbgGh08ImwH5p6kq3unqwc+yQh3Ikjw0Ag4eAuJI9pctzxKERe0z0SZ4OPJYcSNCk2aIRQbEyuDK67cFt4InbK73z2hjnfrs4AUnavXO2DKCoMQafL6fWChiGzTy5BCh942mczXA77ZSl8h2BpaB7/NCLV/bc006lfxUGpqEhB69Xqf9eyAd3jYrxIrmogkFBjwINf2Z+W631LbQB2/MGsFEb54V1+6cd0op0yCpuj8dLV9KFV4kiczppGYecF8MUMsUZNYfFr7mg+xOTQQuo/oxhvCHkvrfiislpydrpfR1dJZGbEQ== X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2466; 6:WDpDcV7DcR8jSFFjbOejMTaho1AA6hDfTxJ3vyd0j6Oqy5M7vnyCEbqgRDeLQXwhkb2/yYdhd7TH2KWnH9PXKGUnAnsWuMBiFpEAhluAnlvQgyYL9m6uw0mePeht+ho1hdVwATrttc6s4PSTNzAUOAJvLCwiovIKebSER7EQCPYfCeCqWwjUZ9l/nlIROIwKEo2DNFv4YLBGIpMvRD4cC5dj19pO2rrXXsQmF8JcOpeIPMw89X2qqucWX8aOC/WzX9GXB1/k6cVygUr7E8j9VFUTZUUZHMIRYpklPIhvjUC4nKEgMVtXuqHQtvJgdryslf2cBulf6+p/zPGqYkvu5Hq7yoeSWQ1gLKV0guaBnZS/IxFKTA9vDmkG9FHelWydZ1tDwVUQLZKIzHF+qp91KZJsAyLuDCUOcNAPfa/8SD06R56puJ1X4wSe4FV/j293; 5:Bkb4NdLAXEVEgXvwLBvWRRC2p/A8Adk1XV5MoYhG1q0OhfzKNAKqY7EO4PNQgQW73Svl243rgcptehMDBnin2/Rub1+Qr7IXE/DUdhtE+WOzwGsPIlDRvAudSvoN7w+1wZpe7pYwaSVcB0jg7kHbXJ9G8SVvx5IcCaAoIlY7/cowNMONs32z+oR6UIC31O9D; 24:81dI9eBlOpGpkqXIq3bzwN73BLxK8YIl6KnRU0zJnm0YsgD5ZVOkOSM5vB7aPH3WExgvmykan96++R2xaaNpS3DRIIDOSmz6G+IsIcuZ9uc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2466; 7:VtUepHxT+5WnbwD3tEYRwi7BzjgMBL1Z9OJo/4Tw85ABy5oXNx90csBx6OOKd7n+ZKb4chrqA/XMul094ID6CmsPnT0BpslLUTAA53xjbAr6iUJJju9lLcI3RpXFh32cezNDBPEPovNytBZ6upOuV37yJJNprcWbNahJGzirzx/5QEFzU/o5rvnGlPJhqZh9jbqawHWjgbjx66cg3ODcRZVWoVWtu1QIPQ0paZ8NWDFP3Oj2zGnnFGtt4h0vyfQaDRa+4dBAXteI18cDo8CwcVMOD1GsbFJ+75STr6/FhoHfmgDUBDk3PfJCGa1Q51AK/ta/q/siwfnuXqOggFwuqRqTKr7EquVC4V5s1gk7QTUfAp8J9HO5nfxTYE+OsxxlcvSpB1FVZT0Mst1svQFJ0LcqwkS1upmmZfXg+JyNlcwxXvYTVr2qKfDVuf9YBOSze8uCvOkCXA0GmhCR8AhbFA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2017 13:35:01.7211 (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: BN6PR03MB2466 Subject: [dpdk-dev] [PATCH v8 4/9] 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 Reviewed-by: Ferruh Yigit --- 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 */ }; /**