From patchwork Wed Jan 18 10:37:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreyansh Jain X-Patchwork-Id: 19702 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 5DDFFF98A; Wed, 18 Jan 2017 11:35:35 +0100 (CET) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0079.outbound.protection.outlook.com [104.47.42.79]) by dpdk.org (Postfix) with ESMTP id 21A7DF978 for ; Wed, 18 Jan 2017 11:35:26 +0100 (CET) Received: from CY1PR03CA0015.namprd03.prod.outlook.com (10.174.128.25) by DM5PR03MB2476.namprd03.prod.outlook.com (10.168.233.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12; Wed, 18 Jan 2017 10:35:24 +0000 Received: from BL2FFO11OLC016.protection.gbl (2a01:111:f400:7c09::144) by CY1PR03CA0015.outlook.office365.com (2603:10b6:600::25) 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; Wed, 18 Jan 2017 10: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 BL2FFO11OLC016.mail.protection.outlook.com (10.173.160.82) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.803.8 via Frontend Transport; Wed, 18 Jan 2017 10: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 v0IAYYhX003396; Wed, 18 Jan 2017 03:35:21 -0700 From: Shreyansh Jain To: CC: , , Shreyansh Jain Date: Wed, 18 Jan 2017 16:07:53 +0530 Message-ID: <1484735880-17178-6-git-send-email-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484735880-17178-1-git-send-email-shreyansh.jain@nxp.com> References: <1484660264-6531-1-git-send-email-shreyansh.jain@nxp.com> <1484735880-17178-1-git-send-email-shreyansh.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131292093239143092; (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)(39400400002)(39850400002)(39380400002)(39450400003)(39840400002)(39860400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(6916009)(106466001)(47776003)(85426001)(5890100001)(4326007)(6666003)(2351001)(5660300001)(8936002)(104016004)(76176999)(50226002)(110136003)(53936002)(189998001)(68736007)(5003940100001)(626004)(105606002)(50986999)(2950100002)(2906002)(36756003)(8676002)(38730400001)(48376002)(81166006)(86362001)(33646002)(81156014)(356003)(97736004)(92566002)(8656002)(77096006)(50466002)(54906002)(305945005); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR03MB2476; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC016; 1:XUteSncpNkkR0DX/0kmt/ihAAObhH0rVyTuqQ0Hs7uXlQBsMh1yCBowwF/T7RSKpp9MP9MrAP9y6x1MqmBs1/1g3NU0CUflC9+98AKBTeR7SpV9kGbV7fO2wUgz73FQS/FSSW6qzBaKe7ekW6hBUhDzU5XuivnBYUJ3NBMYEM0nar7lOCimSI9tP9YlsT9X0z+qVqVvII9+dwHb5aw5CGbrnTqJd0fTGu+6ILKhkp6F7cvyrTZIoL81BgxF+3xZpk3KZC8Q9E5x1SefQ4xfe1wYx5bH8FvSPswZvVoIM4/MEsoGxLzLIsRC+0yKNY5BQP//bkXikJGLcQsCAnS0cHN6abj6rLCp+CnOVQOmHY9XhCsbnFPxVgSn21bo72o4GFU8cjw2/HOZKLG0/ccGVVJ79qUNJX7zOzc3SEJdikzKbiAbexOMDjQII4uDL1uLRL4SuwArpZRzbO8pNAuLB6qx+5FAhuxb+9Y5x9w2y1HDPAwwq8quGx/mNTj5u0iAFHaLTgYGuXQVNEYvZHm2M5mVmStMY5mq7Yq3pMS159cLjxUq1qi9dhvU5fU27PwVsQCMbAP40uijHkBEV6MoX4/pLaa1FIa0YAqtvTcUBNUp6ACI5tjUdlCe/6HL54FUrEHtYoOpcaAoq1gdKjx9cdqyhzin64WzgyJ9HCk10+7Cka0aA7ckR6WDOEzMCY3je0KqoMsUx7/EEMBFG0AKSfQ== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 2e446784-3d3c-4770-67fc-08d43f8db5c8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM5PR03MB2476; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2476; 3:NnAP7472ufJB2rowaMmdaRaXaS4HQ1bKwVRzQibAbOYYOfdqDusDMqKqDSkBfHdT2Ruq0U12u9lLsK99plmwL3mTSPQHbxWJGL4f4LfweEQ9O+uDhgV51jEr66vtts1MlmX2u//MXhkGSeA3uFLMaKYQljRRtm+bPaVT6SLHlPc7YoYMQpBlQ8dnGocXlaS69JLJL0kAmjeB/FXGmhMmMJHPyQwRbjhlUGiZeAN8C0aZ9bsJP+yrG8+J0kC5KiF44gJMRyqaVRVYBWQvMrpxJRkGbj09MwkgdXjK9kLpJUc3XafN4D+3Nzq7N1ufluO0nA3O6BKo5YCqckQv8bpV8NnRDgPQToUgMQG8Hz22QYQYv+va4hn1iSkrM13qRMA4; 25:8zAYTiyS9Jh/PbTEFCZNEneuhOxCTY1wZw7iuYQynjV+O9RiMZW4ew5PnvBEQbuh6toOsiB50r+romS50s0F7tyLZM9Y7jYT/six3kEv8zqLW0RdCrSSbf0T7YcXPOKcGNXtMx863IVr8szNcTpsYMCDCFRkHCzhmvuqy8aafkppHJWxsFCUErlrjbEeKfoDi3boskFuaSfNyZhjBM4oIP9fR0iFHHM0flvQGZbtmcKh79Lwq1MtAqB9L01YtyP9M6AnMwaqHR1MSfxgN8QrxaEZtxusPzo38RQsvSF0MPahcIRaY++x/qFSzAfX1yL+A1t4wIgi6FNwi3z5ulZ1p4HleCYPTYHmjQEFh641/MzPLy0CjXTq6OMaAOt8Qulx7Unm4MFNQq+TP0meMc5B6p8/MPL/6ipdqfl0jQi6UMa0ziS/lROIDTsylxBTT/x8erK7Un/CEpMYmjIhmJsnOw== X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2476; 31:q9YA05rpOtK14s+mJICJbiIhoJM32bCeHUIqxEOE72wxoTwukvk8AmRHQ+mMZNUejVcHKBtqNalLiD2+8kC+k9xsxw6i5AGngQv/W6Jz13ZkP0RcqJv4Kbu6pEYtJXMMa3bo5d9hC/Sstz4GUR5e1CzGtODLmyPtw5vIc6jjk8MN43/1/620gt4P347p3Bbcsf47Bw0DxUnxXYrWSkQSy0HaIcqugmw+4GONUqbqmamzSH5GJQTVLiTDYV6tMjSDrkiRJVj+UQgSG5EcyGgLYg== 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)(13015025)(13017025)(13024025)(13023025)(13018025)(10201501046)(3002001)(6055026)(6096035)(20161123559025)(20161123561025)(20161123556025)(20161123563025)(20161123565025); SRVR:DM5PR03MB2476; BCL:0; PCL:0; RULEID:(400006); SRVR:DM5PR03MB2476; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2476; 4:v8pZMFi1+/hTbNsqNqu83LlDDqossKXWMDxgx9pGp8+u1lU0heBD80UBQws9ADltfnoiM57g8UJlGgyBWFquU8vm9xxjZivLSBxUiweVoYjZFoh84Xukfo3zdNX9WLimtPu61ADlMC32L2W3c+MFuaSAdzg3yXmLS/NR/w+33Dtc924RVh1hGHO83Hk3jolm/8C+ONortvvkHRfH3XDvzKkp5+NemVCowhZkf5+heJS3mb+tBOJ2EOxKzlYz/fWKpvk9WRIM6LHeDacpqjRLmgYSpBHnNGpStE0nHrn7kmDqUZqzZpQp2JlPwDzKBZZPAOt9evxi1OoGxBEr01pV+8Dyu+wjBG5gbwHkYRTKzwRaotPVsLyXbXRfxSI/QPYrFx5aoeenHfAuDaX5HQTxxcOAfP+68xEHy8vW8WWBwa3Dzdpgk0Mok2wPNSSgKr+XRChGy7L6xLpDhfyBEJKAQrF3XW76U0NpIK+EiZzJQ+JWXSen01SXZRYyGrKAi1QM+2m20Zrqp76opqBNCV+ZY8JFW90VDZ3W1bUkuAClnsm2uDFVPwioSd9EB5XTSHTPhDhfYplQ8MMDZBSbuZQ4VAf8be1LRMKsj8GFi7z/fiBbP7yfN/UBz4KXCSQNwORgsn5lxhrdjDB6Z6n24o99XxrvBXi8W537JGWpH5OX5TERB2FJlvpdIQFzd+SdX2e3eLL5YVzuiCmaTOGDcRtmXszHoLS8XtVsU5gt5Vwx7nht+JLMaiJjp9XK/grN8mupcWGfOlm4NhvIdMspR+u0vg== X-Forefront-PRVS: 01917B1794 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR03MB2476; 23:iOGA6XLNSc1poJJbBZN08Uv80CDPFQalbe45CM7I6?= K34vYKAUnWhOe8clh/ztyEkWObyHoiIS8J3JxtL0fENelo4jJbo96kshlPuEr0/Qwoc6VHE6DQe7vzVrW8rWMEYxXxFXrAux2WlWTY262sjx2W3ezCZq0kpaITijScCm53oFSgv0ppphsRoP2TVXaUhzFQTAcS/3vJlUG118iO+uMXNGSEDTcsUsAE0P0CW4xqQAUZwfnxKszaT1OuTZfricIwqEbmgf/N/F+87AaNN+z69Nme9Satc9Xmr72yDoMLLdGsvfhFyccbcqgmgT8VgHUswEZ8AFAsVbpxfHhzePFEBVoweUrGgO/tcnqTuqRsrnkUwX9cU7Vq8qJePoYdAz008xmQR5h9MJJY7B6JRID1A0uZV8/RM3DoySpz05LKcdQPLABWbBMhaq44PLV7TvVVX2RdigutFtJtBmTzcQqbCcn9VCl0oHGrWweLv4etisfNM8vvwumIO5IToQuCs5Lmv0N8uHC3QEqAyCVDBHBdVdF9mkjChkeZ0uwuqP7qOmZhvySr3OaXwwwkABj3KiU4DwJamGzjhMcAdn2L+2/5PM2GKIUHNmNnBHGOraFbSfjBmi50dVBeco5CHnn3F4+DcdYv9qwUd+tiE5rxUxN9LhNPrvAtoGTepA/A1aigpltQi5JISAFniFaM98NJYQU76TyEUcjUhIsaFAhFTVkboIM0/urTfPzy8jgDeK0/K1ucjxk662pTaZrFW7Cv6HkilhfC2qTFYBYZTEn9XoCmVKjnpOj3Lkw4MacIQkOdc4CabVi06A3oxUhkOOgR/sEJtu6l9snKeaEd2Ua5WHKDdPoKoAywQGKkVlf5Ugz7ip3p2J4CxkTDY3F50A3vIleGNzO5u9QM1m+SlMD7UWGOYkgngxeUgX6d96GNCTKEgdHQjboHTprCxdE5v38qF+oY8YxYS5Jigf+91BkjKgeBGYd6O6NXEECANMt6SIFfSuEDusLxavd8tOLZmKOFMf1ioc+jNCpZ7e8zgNrTMzFdO1oHDxMyqbCOnzjDLwd1wDlS9/2023XPJATEaCwCoasSOQHMMCg4yV2s3QLojeAXdgm/HdoAq66WM5lL0VNmQPqCMWVd+ENDjygx5bvmmwO3PHFXDshvkTr1an+SGtnlRBFt6mRvedBYvjFncSZxLnMx25EGyq59qM6AP9W21sQ9zBgcq4stjY7+EOOefms6rpkXUTDqjxlTQ+Px4fjwlhJ7Llff6McHF3KxIo4g443mY70gWnPuFga0OIUAagDhxpJ6r6eaaOmsZ07+Pho3oWingLcf5hUhC3Nbg6VVj X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2476; 6:OvYcXB2jGlxSacmpsgSt/tlUZ5LPZt5lhtBHWrSq5TCqXVv6BRMdtOXFVeEqqW+di8wjotw7A5MckIkrVXCEJKxDYSsh2BMj8ec8m9ZFCoz7hCfe+nAn+V6Zt08ZG/w/wO+Ff9KmWBk261yjfR+UbiEAxUppGnfFRHECv/LHtm5OqccXP/P6m1SVIGZH+cQIio3jxpE75+AivKcLQla/FEydJpK9ppm7pX1qDUeQVvwNaJskPlEF8jspRNHWIQMb+IkMFlwo7a9O97WrAthVZcVK5yTWXC+hg2IFWwxXFJTliczqGafgy7yp5KM5d1kZH68U1lho/CD/GQLs7z7/aLlqsQf0zpPLEXuma8fKoINSF/pFDOdp5fnwCsUsQ2/blfKTRRhDBSfxZgtywUlDgJRkIuo19Gv5yMwhcJQ507r5BAR9wPc5b2njanoGUw+2; 5:qUmN6YlYwQRcb6cq4ZGvb8HXXeGptoNd+AmnqbOv1JqvIQ7urGy5lBQ3KDQpFVkkjcssMirTMwHitqmwlsoE90ojVCSSTLAc2j/gybe+Cma/5nnB0uECYOiKVkzVsHDzQ+/YhXqSCg6Bf7oeaTnuE9g+AIDYvPxkhvsfrHyasgpofnZWpibNGdnuBnUrcMwS; 24:YkHIjtwj3hRtCZo2HUDKvKqS70r9EFXf/3c/cgBeMA0vsDSHGqoD7nVCw6+GHBg3Tive/5HUScmodKKJKeJxMzZT11CVqFY8hAte7ps0A7o= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2476; 7:Qg5++hx6Q9cG90qCkSakUXbGVb1mZ6mYFAWUzRy2JX+bA4A60EsKH/wSLXSZKZSKBwe4Z1eMr6Mle5t8ke8ldRfLXLQ4/Y01EywL/APIwvc2x30BuyYIpdFN69G+z6OTurQEMKysmejAZ7w7QLXV3GenecXUwHa6oqaUG84umwMqAjTsRNhoM0q1OzJAzi+0/8IAE2AT3Eg7OH0S1/g55aHl+GKR8JX9H+MPH54c0Z4zGdmB14eaLtDVWCRHioRxDHja3mO0+mF+7A7jUO+/A0Z8CsufX8C5vGn1ixRY0fnNzqD0rzzarMMRbSVJwIIMEsG5kZFJk4qI5oMP6iCBPZ7UhzzPOAYgmNXfnWTFLWqAbB4W8zSQEjiXT7s9EU2bfoSNWRJT5Ec0fb3W0eT/lDpQfNjgiRZi/CruU/fm0EdOCU+gwU3Z32rCeu7jbSqrWL6qtv0FcO93nwYjwzexdw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2017 10:35:23.7271 (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: DM5PR03MB2476 Subject: [dpdk-dev] [PATCH v9 05/12] 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 | 14 +++ 3 files changed, 191 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 6e09448..aaba10a 100644 --- a/lib/librte_eal/common/eal_common_bus.c +++ b/lib/librte_eal/common/eal_common_bus.c @@ -50,6 +50,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(DEBUG, 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 204e576..ba7d866 100644 --- a/lib/librte_eal/common/include/rte_bus.h +++ b/lib/librte_eal/common/include/rte_bus.h @@ -60,11 +60,25 @@ 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. + * + * @return + * 0 for successful scan + * <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 */ }; /**