From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0043.outbound.protection.outlook.com [104.47.37.43]) by dpdk.org (Postfix) with ESMTP id AA71F2B8D for ; Tue, 17 Jan 2017 11:06:23 +0100 (CET) Received: from DM2PR03CA0033.namprd03.prod.outlook.com (10.141.96.32) by BY2PR0301MB0743.namprd03.prod.outlook.com (10.160.63.21) 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:22 +0000 Received: from BL2FFO11FD023.protection.gbl (2a01:111:f400:7c09::191) by DM2PR03CA0033.outlook.office365.com (2a01:111:e400:2428::32) 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 10:06:22 +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 BL2FFO11FD023.mail.protection.outlook.com (10.173.161.102) 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:21 +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 v0HA67Th024558; Tue, 17 Jan 2017 03:06:19 -0700 From: Shreyansh Jain To: CC: , , Shreyansh Jain Date: Tue, 17 Jan 2017 15:39:29 +0530 Message-ID: <1484647774-28984-5-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: 131291211817474521; (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)(39450400003)(39410400002)(39400400002)(39380400002)(39860400002)(39850400002)(39840400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(68736007)(2906002)(8656002)(4326007)(85426001)(38730400001)(104016004)(54906002)(50226002)(189998001)(77096006)(50986999)(6916009)(6666003)(36756003)(5660300001)(110136003)(30001)(81156014)(2950100002)(8936002)(48376002)(81166006)(76176999)(8676002)(50466002)(106466001)(33646002)(2351001)(626004)(86362001)(105606002)(5890100001)(92566002)(356003)(305945005)(5003940100001)(47776003)(575784001)(97736004); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB0743; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD023; 1:M6wfydrAXBRjAfhrt8MQvghme5ZweRe9Q5l5aaHxeHUBmwzrIW5m+YlNWv8OkOpePxJ1IdUSeuQjRPjmXi+tqdgtwqq4q85N+tp3C2gisZvgpmdHv1CCvq5HmDypLj7cLa/j4geStZf15vj8QijM376HngUs3IVPH07B5WvtZXR99ZlzOAMpxqbqcreGk8sWUAoyIrgpZc3rLvRapHEfoRIwaWvdrmy82HqCL1yv+pOz6jzpSt/4qbY3cTNQxAKxShD6tEMVkCs8yjzGot4bARvR9qGSemixnv1qgoEL/N+5Rl4GXg5nMwZnpP5YxYdhY+GKEgF7iY0PbfeSebsvCDegrftNi+43Z2EM6TVZUSJRshH0Z2OhZwrMyhdkVKjeRN1RQvomQW0w77+MtwvchvRa94R10mSTaniWexznZo59XZWV3o2BlntVvXBDAgtcvg8z5NgwEplOWMBxaRcKE0yPegbnIuCxM3BfTnxYm1SnfpVtB5gsUvlGq5e+cbftvx09qiJwHgRb0OTY4eG9DtL66GjQ4xO5vNbHDBlDUIPxwn1qtlyvhn1xWaziIairylwPN2zoRwo92cbvVDDSRd06QRbePCZvBPAXtQs6FQWNGWoEycpKh+GKrmItmo9mozcZygytMjwDXhZ5tDHusUf1sCraBgtkFrBdwo/RhJJnUkazfVwHQkPGr6VMMmdr1yM8qJkIACOExpyY47DHzA== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 8cba2020-d0d9-4081-7878-08d43ec07cf7 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BY2PR0301MB0743; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0743; 3:4deWAUCVWOgS5DW3ghKcT0CW2mrwSeBOoFToMP8oVoDqEtBJPjZSXM5CgDbk3m2lqAAV2ZNyvat74wAyg0rRHIKaserWlKM1mKoCrvRY9thw0hGmtmu5qNJvvLfyw0nNwQiXjNo7VC2EwXfcIcCrvi4SSqaV6M9IZZPRo4X9Y+REYvVKgjBO2juOlDD8D3AgS3a59lzWDhOA3txHjosiZ2mP4jCl47NR29tvM83bEmrOGG7Gb9pGVb9rjAqKNBh8Az6lRhmIErAmiTPfZBqplRij0SXl+Ke9pNexCy/R++mWRVBv/MbJj9SZtS9p/PVb4hf1ycClUXv1cf4k+tM9Z6J3NAGuG5GNVNmtwiNA2bvRu52zSDOdIrTJ+fugNcZr; 25:GiuOGuONCI50enDh9ZDDBApsqsE+LCtBMQTno/fCMjim5DSMjSnsOtWT5cKFE9jzPlU0ZsLcshFSHqKSwALidBr9yS1SXQwoFMwH6DRR3I2mA7XM5uZ0yYubdAdYPHtcidxFUKZL+fLhDur1BmEmk7CwvDWKmiSD77bXFm6avhxlllG30p6o6Y23ZrvUMQFVAyL7gmZmlQHHv+ePGqpzhTrzeiAmA9zdhXY8hae+tXa/tm7t0D32xTfXMfEYL7q7f1JQLauJVI48LZoz+RiGVaB6tQ0ggXtqh2decpEgXrynCJ1QaYMVJdLaNEc0OTAdJ5PDfg0yMfmAvp2z6tU9qBdjVLQSaoZzq1wnaZ+KF/3UZW0/0iKzqWkaHhKZrGYkS96hYgKZtf9xWOIgZECwXRlvP4cZR/UT43JZOdFH3LTLkXb0z8J+Va0+2VehppiUyqgKI3yH/JsBJYij5/ZiyQ== X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0743; 31:L0V+h4sxDkl2j9UUjcESWB3Y52r0l0gYqBtbeWL2lTLtzIOgafWdaiijSNvO7lqr3ESf3nWwRSnDr11Ih2+Kaevovy7zJl7MgzLXNCx97WjaMxtei+xpIJ2eTWRS+f+S/qXbg53C49rxMvfynvVyxFEXj97z/ygGmy1Xj3pFUoHWIjoC8cofvm+u2P3aIzJAy5F9AAT4XTknXtmyFvAPH1UmQlsOr1WlGF2ERMQWzBgwxTJx2niobRTcb7CWHsGsqDeuGWjb9oVUZO31UamDWZMUnUbxmu2dNpwcfrxXwI8= 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:BY2PR0301MB0743; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR0301MB0743; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0743; 4:HyOUfNcQIGJbcjAwsE62BI0ihzumJqsWgsjZNscvSzZLgCbwd+vxJmlKPRrcQoEE7IQDB+AqlxWRhrhsPtfQhqrYb/eP1dF/FDRXOkTc5Loy3uXiE1otFV3iyIJH+USx1ELQMPMbHCx+mFZiyA6Ixkk3Yo6PEuqWYMSiW513UBcuVDlvzdvRuRHVZGrjgXPoPq3CmNTMtrfcNq6uxmsJFZrXwsPbzmkgcTCzpWqP06k8Sq+vhUgZMzQymuBMShkzN29u4R0enDM1SP8ni2oHEfOrQLTSoihswMABMYnwUZrIs38W6dOzhff7qafQVjQQVXfelzlt96mr5N6nBbaVd+kQqgdS3zd5ALDN0OganjNR2fxZZENZrN+8RgdqdUae2qw2CaKJj9Y5qrcs93uxZIhTwA51Js6nL1MhDGRN7+RO+c8UknTqIVRlxL4bZVE/4ke9Dsq0iEl6D2prmdrdBp6KN8feot3JiaRuLQxmi99UsYVe6coG78VBWQcN6wzD8urBrj1i5QaW2eWgK7R8utDFHmv47mLbaPq9/gBOkwEFa47iIiEWN4CegpbEyJn1NqntRPAj7N+sfz65+eENiRU2w95dHnme9nrB8pQubhckR7ccgl/k/2HUc0BsCD0OOK2reqKPtJr3YIFUeCXOwpMpZlKUOmrcNoBjahjnR2Cm5njb3GzBcuFZeAqYaghaCNQ7TpoAAKcg96qIOhwHjL2jhZHPahCoD6hl0fevs+QJjJtwzxXliIE8BE4iioH4 X-Forefront-PRVS: 01901B3451 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB0743; 23:3z4MYofdfk4XqDWOhmRLqZtX8fjHibk+xwcITY6?= =?us-ascii?Q?Gvp7lKZtJhQGgR+em9ZpGhMAwuvj353WZqO2CijCccU2JvM7hSVgHKwm/PeG?= =?us-ascii?Q?V+bgiS9c2ynTdLaDuEfIkQn3WqMf8U3baU4NmibO6mMNEM2CRCoOGapUYgNo?= =?us-ascii?Q?+DtcdaRw3byPszuqfNgbpAq4KBh1dZ8vGB8mgYlNfngmd0QF4R1e/nfJ5oj/?= =?us-ascii?Q?7D8nzWzTa1z5tQ7x4LuplmFMYprI6HqQzN21B+z6AYwHKQ/ljfyKsPUu7zvk?= =?us-ascii?Q?r8dwZ3d8nYsQNaOHzjCIAhB9MpGG6DVgJTHRqxEfhXanORvXPg6ROp724vGA?= =?us-ascii?Q?w9q/5MuojxcRaHMckJjygTerGKz1aPeLogMwVr5yB871L4guv6Hy3hKUHiSv?= =?us-ascii?Q?DVUCQUrLCWpHN7wnRmihZNhdvqS2VxdnPpFZkaagTzlySTWpy202f/wYWoCe?= =?us-ascii?Q?MOMeKzaYoPezgvLBeMKf6hsFpOt87Fu9uJtMaQBnS38uJ4nofkmDrUsAhD/W?= =?us-ascii?Q?D193Doit5hU4Ny2rijpn+Bg7gf4NIcwhFKU7Ef0NkPwyTSGY2IDMGhMDfOyO?= =?us-ascii?Q?polfJR9sGGTw90FRoUFJ4Hupdi7NK/URN6h+gmceQMOaSg/ukxBZFBsoVITX?= =?us-ascii?Q?RnPukWLFWp/FToizrHqakCNsouQWsu3a6VaqTh4PgF652SI2U0gIwf5hNJUL?= =?us-ascii?Q?BQuvqtoOPfvTekdqMe9uemROOT0xuSUa2Xflki9ifBqmWLr4ac/oDRIiY39D?= =?us-ascii?Q?oOCQ8FqDVwwjj3+d3YnORGPgN/EBzPPJcL8BiT2CeCITWoGsnkjnV0SN+NYQ?= =?us-ascii?Q?B2Kcx6E4pvDCkPrLlmUcTFM4tGCE8IimUHyqOlsLRea2DRPp/G5UUfI8smwN?= =?us-ascii?Q?XECBUUbYVJhg+F8F+pBwA68bXeaYiJe4f3TpFw5s2O9mM5uy5e+v25aCzI7u?= =?us-ascii?Q?n1JDPpVQYnjHMcGLk5QOZI91cg0tWbarHxBv3Sc/WM8xoWXlyd5gTF6xwmdA?= =?us-ascii?Q?WHkU/u4I1o3Gac/zWqJDBi4G3TkCv1boCONJTZIENnQMxMVl4OBNNcbcgOvH?= =?us-ascii?Q?ocMG12TZZ+fwVpet0XrvAd2ePkmCKdPs11tJUQVnCOloK3R8G5ucT7UNyzQr?= =?us-ascii?Q?AmelOpr0rzGCY7h0y/+FUFYUenWw3nAXvL7ZP+GOQy5BJ85kdSzHXKQ67un6?= =?us-ascii?Q?+uDOwctKmxc63GfeEJjlC/KI008Or9/8rQMyXCLucGlCoCi1yLNMlTjDN7vk?= =?us-ascii?Q?8WxepAylImhoi4t80M2TJyYUE/JdnX/dZTK0Fv7sTsfH/Z+e8EFxpNy+2+IN?= =?us-ascii?Q?Lmyn3646lwILv/YlDJupGDQWLh9z9BQw0HGugpH5nGpR3l7ZGQdKu+RuCABf?= =?us-ascii?Q?ESFUXWQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0743; 6:NqkwZUJEGuZHCn7gmmRVbN9j9NTVKI3lEeDGiwUxgKa4h2FKTHUTPYyIBmSdu+d7EgymQOwp5W/0H9QgD1gCH4IgAyUk0OWrO7Yxi2J7poXQWlxNKZ6rrecHi3d9WrubvPIn+ectv3AnZQ1Rztta9xW8JtI4tzlyOCTkJuRe71E4tLIMiz5Zm4LW0ai0KOAjWw9klvciP4gGgLT0sFskwc0Vt7tQNCUzI5aPKDpqcEac81MBubthsCSDsxRjAd+B2xALO2S4zIpIcR95dvl7GLEZHfkW3/D9nx1I91oMFP1E36snJx15f/RC2adMZmzdPAnuwOU3xhCNdfQ73pOaioDfwd32W5xce0ubPIXd0VnkSpblGrN37ZJLieFiS7/0NjEgcD643SdIIcL43Tf+d0xwZkAlDyBZXX084YZ9ahyhdnhdMFXc3CB4Ze+85Ttz; 5:7zApp8FqCafbLLPd2fR2Q5XeKxfFEOXyDfTcbcVTN557I3+0pbCDFvXsHc+4vN9E6FR5CRoW76hyiFgnV17U+UuN4Q4ot5u40NIJCjzQwYWp9BgcP6MOoyD5PYZb5M0Sp7ObOKNWJWJC7n35vB09MKTWD0f/0Hv16rWYpHDEuWcUfPoumFPPkfqldCAGeZ63; 24:fTweCPQoHsh3LqcNE6bCQW1wM3e6mmxRu6J+RBz8wdf26Dggr61xu0BZZpvzQ/2evx7KUQ8uUoqlzEZW1Sdwm8UKzbub32Fj6FJ7BapJQes= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0743; 7:UKU0XNc28gcBuk30lI2ZdS0fZ+J0q1c5VVeqzrD9Qtz5BlDZS5OinnexYSOwj1/3VM7GanRbHcilmq7V2TtDDFD/c2iEpWUt6L5pgwAzY5M8tNxkvRy3QCDV2T+b90+TkHSncBJKWXgnf3C+SZdut/28wq5o6V4S+rpozBLzRk/vkyzhNfKei6UAJakY0aW7PU1rKZPO2ewrAxm6wuSAlQYi+mi9i6xCkzPJQGxVTbpGAJAJJ9DVHjUEoiSX+9jWf729RQFsWxKF3eEkL8rlX2a9MyWQB3XowNVjhRLz1bFE1lwe2sH4kIjXsc2H6FdrTtk8MGvLatLgczoPjYH7q9H5KCQK4WqYSb0/8wfslvvEiobC8EVPND4Uz2vqej6sKKoWhEkNkmmJ9/H3ITMYVdwj9uH0O2H6qDAJqDw83E4Z24b3uquy/L2kFjPTCuvFic1WiJTq+I5owT3dXgrhlg== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2017 10:06:21.5602 (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: BY2PR0301MB0743 Subject: [dpdk-dev] [PATCH v7 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: , X-List-Received-Date: Tue, 17 Jan 2017 10:06:24 -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