From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0063.outbound.protection.outlook.com [104.47.38.63]) by dpdk.org (Postfix) with ESMTP id 9B1307F58 for ; Sat, 15 Oct 2016 15:44:39 +0200 (CEST) Received: from BY2PR03CA066.namprd03.prod.outlook.com (10.141.249.39) by BN3PR03MB1414.namprd03.prod.outlook.com (10.163.34.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.16; Sat, 15 Oct 2016 13:44:37 +0000 Received: from BY2FFO11FD051.protection.gbl (2a01:111:f400:7c0c::120) by BY2PR03CA066.outlook.office365.com (2a01:111:e400:2c5d::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.16 via Frontend Transport; Sat, 15 Oct 2016 13:44:37 +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 BY2FFO11FD051.mail.protection.outlook.com (10.1.15.188) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.669.7 via Frontend Transport; Sat, 15 Oct 2016 13:44:36 +0000 Received: from Tophie.ap.freescale.net ([10.232.14.87]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u9FDhhgN021870; Sat, 15 Oct 2016 06:44:34 -0700 From: Shreyansh Jain To: CC: , , , Shreyansh Jain , Hemant Agrawal Date: Sat, 15 Oct 2016 19:14:58 +0530 Message-ID: <1476539108-13170-8-git-send-email-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1476539108-13170-1-git-send-email-shreyansh.jain@nxp.com> References: <1473410639-10367-1-git-send-email-shreyansh.jain@nxp.com> <1476539108-13170-1-git-send-email-shreyansh.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131210126771649866; (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)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(110136003)(626004)(5003940100001)(5660300001)(68736007)(85426001)(2351001)(92566002)(229853001)(48376002)(47776003)(50466002)(106466001)(11100500001)(356003)(8666005)(104016004)(19580405001)(33646002)(2950100002)(6916009)(4326007)(76176999)(6666003)(305945005)(50986999)(2906002)(87936001)(19580395003)(586003)(36756003)(86362001)(81156014)(5890100001)(8936002)(8676002)(7846002)(81166006)(189998001)(97736004)(105606002)(77096005)(50226002)(7059030)(473944003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR03MB1414; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD051; 1:LWKo/yGwEnfKLZlDYYwTDpOsuld+87iRL5IxruYLfXo2hA7F+gwmI9RSdqDuMJhM1/oZRX63zm9eXc/Qz42xQF5IufxiovYBWHtmTxwAwtVEJ8maoxHymST2sc8LgCnUpk8a7G1Medk1AZ9Mo0zPd88XwJYoaOZohccYx3NtT3lsRGEhNRuJWWmMueXpq9K991IdhoCyo99e6exYgLXgKJJ2CAXk615dx5dHCJmTATVlztUYb3xqnK/wz36Xphf8Cj1VMB5BRXVlUHopboftbzg0KlWFgvOPE8e/BW+bNxHRn3O0TCtYzgzOxucQeQE3GlBKL9uszfXT3NnVaUd1m39jAwxWMgxMFwsT61bSZfdJImVrYl42i1rPSXzhphM4jQ6FJ5k3P7xa1IeMA9b3hvDQzhp8dXzlVackbhdnQ31uz8wX0bTvgtvDQ6mFDdMv5lPSEZ+yGGELzn+yQysL6oWGk353c4zGHOZJSlSELrlOLv8FX+9AXOzQGicWuDhg6G3s/DsVJ4Uf6cnbVRZHUD+0WKsC0pOYXNq1T2x4j+LiLxQdCQEXb3fM47VYqCcIwhqrHse9e7cE9N0c3SVj+l3UvpJ1mtO5IHCc+2SZLGinUxDN7PK95W52/JmL4EnN7HHZByJvUBRM059zNwCMlEPuBb8gyHwf55zhARY8tF0FF+/YwLf72Br4hs6XvJ0vj2Av46xTLkpeTMc/2AUUI3uEN6bXMoy0I4N4bYPzcC8= MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: d526e5a2-7440-4a5b-725a-08d3f501678c X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB1414; 2:2ynBgBq9cGTMRVftXEo7lsG5t/t4r5IZ9bTLsZDkk+YRNTH26Isy+MoQqtDVPjt6d56046ZcCBjXQOFUtgOlX24XF1ggN09f/bWIEr8YGuiZZBhH1i+Lvm9M8N2CA4wPZ07MHoJZTN8+ywzBouGzXCoDeUwa3AZeqBh+RiiPqrKPxJmU+r3PdzttTKxCdkuZK60t0fks11UrMWrFb+IgJw==; 3:aP623FNu80oa+LYJUcyNT96xAzQQuBSzmVQpG7M+4cvblhHaQH4lg0A61ZH0zLmTiVWLTbmFz2nQCE6M9KbbcHSSjq+EFitRUwftQ678wQeK2wzcd+8zc1gA31lqMftD2Gn4HIKOKwZfgxnx2FcIhNKouADb3upiS3tXajiDJXtOeevHXzkorJcJEIoJ+sQ88t48HOWuo+UWWLDqWoSmLSLLcby+yHEMGLt3DQoKVHYUnKXjaY6+yn1SpOus0hPf; 25:kX+wZeeLKFxUuiXy//RYfyosv4pPF0tyOR3+UEPvfakAXaQJEMEnQV33G3H3ttC45fm7wv0Sn4y3HpMd9IPMIs9gzfwLxkIF/Fg0XyATVBTtqh8ZTo98RkANVjeKI62lD+VPD+iumc+IAej2MQ4IrErzVdX7QhLSBKJ8C5RfzGYk2gEr9WiVtul0W3+oJxhL8msMKza0dD5jqQEIoAv9OtAkXGUP9tsMUt1gqtz4uqiwKfq/FwejvpMum64O8Pk8GU5U966YsizOAh7nnqyUH9iy3mWyrvjc9PEmReb5HncY6lhd/YCm5IYJ7Wt6Fvs6yLBdK53e8pXLSRqqJPeZ1zb8FPBuCCJLhAsNpwLp5u/2o/QywWVbZQaOS+qPyyFDyj8ge0GhtRZMh7rvjMjiQ935wBjVmwUTlBn+DfBJ1ACdTesXafGwUaG4AS4xCrF+2+YliXx6RVJySyppAyyTaA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN3PR03MB1414; X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB1414; 31:CM7eDuY35hGYEvRGOxn5jqf9ak0DhcfNwi6HLkzuGXEBbPs/7JkjENagm6t/uj+MXjYyXEp56DF5QHDCr9wv97YvMdagXk1VzglSUyKqAW1j+h9+kNU02CH1IdtPyYiA8rKxP9T+TzMjgw2IAl/RC4nsYQ73Dj3gYJWHf5sFWubTieTT9RoS9d3T8HQP57wZ7IkL/3W1KYrpzrXBD1mB6xpxKnNqbVpcp9T/RF3uc7lqjDrBOkr2DMl/U3YA+Nm6R+14yXyMAphm7g4OsgawGjLsS5eIhxd2fvl+qAeLm5k=; 4:VQPsJ9cwoYBrOxtcr9wjn2jWLusCGAb20ePIRxgXg34M2zdD5vMNwWPhcTxLxZ7ThZsdsz4VVr8jMPM2DcvjAH211twwc2bI0o6uHMlNfJtAaVP7sopDZ3BOgH4PPLnNXXCJ9wDRd4mQDpCu9a9lV6AJ56QyS3yBBjfDH6pXqT04nbejBywKHNoLXvBdBRGV/A4nxX1vLTXcgnJS41UJCW/MoXtAHxTNxEYeefUQ5OYdfDi8J9eW4+tS62H57ZIvjyc6IhDb9ucIzzXzlm7jXTCknD3sT2d62nvsPqiTAGmYZgZ2qWLMCmcKistO67KaSU7Wil0zD8bRJ6ZQs5fGsvNj4sChIyNPTggE9RSkTywCD/BltzJ3kaXJcaON+ybZGuRMXoC1lM2HtCiP8OCckLf6wQJprBA66ViH57jn+scxIUG1PWK+dQJp0QsoSnBrqcnw5m6Jqgml/JRpPf4ZC8q3RjRYpzH52Z1K9qJ1URpDAOR4eIC4pM+EyQNR2yc2/Aji7ZdBbi62BrrNCNHxtuUpcbduetMgZ1gws/besswdJF1o71ST/S2vXwjF9Zm6 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(13017025)(5005006)(13018025)(13024025)(13015025)(13023025)(8121501046)(3002001)(10201501046)(6055026); SRVR:BN3PR03MB1414; BCL:0; PCL:0; RULEID:(400006); SRVR:BN3PR03MB1414; X-Forefront-PRVS: 00963989E5 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR03MB1414; 23:32CsLtiFPBTyS5BNUsA0PAZT6/eh34FpwUwEMOiYM?= =?us-ascii?Q?KA2XLVrKdvbwjHk1+OuZdetwsZ/hdVXOozCAX1FiQWFlsG7/gi10BILCJRgw?= =?us-ascii?Q?vCyfE6U6dqlj+mwRqfJQzzoQMCGxNQvUbYz+7aeSWWBqWnhoDEW45wBrBL6b?= =?us-ascii?Q?jqmDA0bpBMD2qlKn3nZUOsLTing0LiPbg41TRORokbs5ywtxHqVB9sArv7zQ?= =?us-ascii?Q?vB79JHUAZHebAbzdNMXzZSJj08TQAI6OSMghNT/VMXt0xobavneGVTIgZvG0?= =?us-ascii?Q?9TgTEfRLSwvck+c22V/NBBK0yh6r2eHlW90WgJAVJixqO5rk/pbBqvbtgG+f?= =?us-ascii?Q?I08rjcLPF4i96lkVCBjNMN7ae9ecTygWmyN7KHCV5blC21zlAtEuKWDBVblL?= =?us-ascii?Q?9Z+DQFRV0TJMCb41SQ60fM/LotQqz+nY8f1nE96uUk8auWLPrHZU8wd+tV/d?= =?us-ascii?Q?CTmmem53JTTb4TBU3eime3JJCuwaxenMsV5LYLMz5gFCUxz4O897l6Fb2P6+?= =?us-ascii?Q?VSSdGcXNikcLyKZF+vLVS9FtChQbpAUYx7x4Hp0PaV6A6MJW+rrHPHxzK4iB?= =?us-ascii?Q?vNleuLQsyK6dG8NxZOEybRjT67mN7u4ex8ceowI1sWE2s01/7jWdMFxfdlN7?= =?us-ascii?Q?3qGnss/xU10uyhZb2yjgobONrWmohpfcEtC+uvcCRJczH3watAFgTD1cBccJ?= =?us-ascii?Q?WKDhq4I9u80qfDa0fLQEtki/i2L2Zxjo6LLJs3qLFWTCJdfTWuOTLEsoyhDX?= =?us-ascii?Q?mW70Kbh0U4VEMtKjsJqOyCUCu0AmCFZu3s1l6dGmJ44haibiI0SlAAD9t1ND?= =?us-ascii?Q?yd8j6LAzs3pF6aChIfoxSjrzG4f/K4fKQC3LC/EROgqoC9BoOdXN+DcVeZHq?= =?us-ascii?Q?qhJO6WPnlUg/C0RGCMG+ZsMAMyUnnivNU3kTHthLTTryCaBWYgx73+hQ0z7J?= =?us-ascii?Q?HBIctDaXbhhGGmm3p8n0upjJYG/U+ulm5xNW2ZlDNqmdBotDOl3xTwUKsqGE?= =?us-ascii?Q?+HE7ORlsVbjU8N1i8AqT3SPxsghsNjdJ182a7cp294mXMZiasEoBbYEKbjVN?= =?us-ascii?Q?qcckePh8IwrVapL+VkSAaXTMAqi3wrZka2WKzTLU2sZy7PxqmI5yWdotpzAG?= =?us-ascii?Q?WBGAzaPmq8ZgCnlakFvoc5rXlboRbKqTZXg/oRO7AZA37gcGBLOK1UTyild5?= =?us-ascii?Q?8wULbxMoivsJ0Nx4l5aKb/t0Lvmf5hDYrSTBOI3vnyClvIQk6vmVC19EIA53?= =?us-ascii?Q?Y6QzHU+hEFgUGHv1bOZDID7HucPKi1a0erq8/3o?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB1414; 6:LoopmS1QFyhaM78T7L8pYxSnD1f/bMHLHg/Bmx1rqUwDZbVt4Ryafv77YPBmjDhmJdIhTQFMmoAl82lCjikm+DNQuTi2hnpTu8hk28QQMieyAIs7FoEp2iLQsrngqyfYVwCJNqRYKq5W0IxL2GJ0eMFQAHl+lthGwhVhBW13D+NOYDH7EyTMroeu7RkKm4mtCvKXhvJ2cHVcSVkmYBXTvC5qgyuNkOXOegFCBdAWi8d8tr9i6VRgwUu7aX1ie0Kozdb9hQDsLcl3BxVaH6ITQsJ9mU5IjYy84nEOE7eiLxkmOfjAo2VAqjE+G8leepBZ; 5:jf0wT2Un0MRUCmDXQdEXrQIhWXnA/ZGNV3AcG9kC5ubE839mKtgposO3txSjpSZKtkNI5IGf6+ABCCreMzYV2ji9BeVijvpg3k44wt0+G1bWqJ6ZQMe7jP9707hMjqz77BVpPaMNqQ7Om0dYuqJbIJ3ckFh+kF+JUSz8J6oI6QQqb+yG9BSRb5oPqAtfHzdX; 24:SWS4W3RAER3nOg01c0mDxXFGCdmhhB7WKZIVSHKFZ1RoOSSyMTlEbLqzDKR4gbxHJXZosl+WsVYIcETKnJeNYspVFycIo4SLBsW55GB5czc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB1414; 7:Sizr++zk1g7EVctqvoxcZ54dNBZHhHoT77DzsJOLNpZHn7Ynt/ChjKS+iYjNk1+dnQEvASc0ZGiEF+AWe7U9jfRyE8VgF8ljDKLzmj90v9MMRqH2BItcgnsy0VQjJIYbvitqO6qORHkR1I3B5pI48VFa0qU48yX+384yTaKus2/kxOkqR/4iRd90I6Hn4eUg2cqojM3/nPvI7K+UT6vLc796upEGVsh8Vz/BVO9p6jQYDrQyyhtzhnyzs+4pRfuZxEIlJTvHvkJMSlXIyJ12lCdlzGYV8vL1iWThbfPLofFU44moxDVV3IZPiGYRTfwBYeFLxsX8S3pL8NWlRiWIT3sm5krltzDoxFpeR3N0ypU= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2016 13:44:36.8529 (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: BN3PR03MB1414 Subject: [dpdk-dev] [PATCH v4 07/17] eal/soc: implement probing of drivers X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Oct 2016 13:44:40 -0000 Each SoC PMD registers a set of callback for scanning its own bus/infra and matching devices to drivers when probe is called. This patch introduces the infra for calls to SoC scan on rte_eal_soc_init() and match on rte_eal_soc_probe(). Patch also adds test case for scan and probe. Signed-off-by: Jan Viktorin Signed-off-by: Shreyansh Jain Signed-off-by: Hemant Agrawal -- v4: - Update test_soc for descriptive test function names - Comments over test functions - devinit and devuninint --> probe/remove - RTE_VERIFY at some places --- app/test/test_soc.c | 205 ++++++++++++++++++++++- lib/librte_eal/bsdapp/eal/rte_eal_version.map | 4 + lib/librte_eal/common/eal_common_soc.c | 213 +++++++++++++++++++++++- lib/librte_eal/common/include/rte_soc.h | 83 ++++++++- lib/librte_eal/linuxapp/eal/eal.c | 5 + lib/librte_eal/linuxapp/eal/eal_soc.c | 21 ++- lib/librte_eal/linuxapp/eal/rte_eal_version.map | 4 + 7 files changed, 523 insertions(+), 12 deletions(-) diff --git a/app/test/test_soc.c b/app/test/test_soc.c index ac03e64..b587d5e 100644 --- a/app/test/test_soc.c +++ b/app/test/test_soc.c @@ -87,14 +87,65 @@ static int test_compare_addr(void) */ struct test_wrapper { struct rte_soc_driver soc_drv; + struct rte_soc_device soc_dev; }; +static int empty_pmd0_probe(struct rte_soc_driver *drv, + struct rte_soc_device *dev); +static int empty_pmd0_remove(struct rte_soc_device *dev); + +static void always_find_dev0_cb(void); +static int match_dev0_by_name(struct rte_soc_driver *drv, + struct rte_soc_device *dev); + +static void always_find_dev1_cb(void); +static int match_dev1_by_name(struct rte_soc_driver *drv, + struct rte_soc_device *dev); + +/** + * Dummy probe handler for PMD driver 'pmd0'. + * + * @param drv + * driver object + * @param dev + * device object + * @return + * 0 on success + */ +static int +empty_pmd0_probe(struct rte_soc_driver *drv __rte_unused, + struct rte_soc_device *dev __rte_unused) +{ + return 0; +} + +/** + * Remove handler for PMD driver 'pmd0'. + * + * @param dev + * device to remove + * @return + * 0 on success + */ +static int +empty_pmd0_remove(struct rte_soc_device *dev) +{ + /* Release the memory associated with dev->addr.name */ + free(dev->addr.name); + + return 0; +} + struct test_wrapper empty_pmd0 = { .soc_drv = { .driver = { .name = "empty_pmd0" }, - }, + .probe = empty_pmd0_probe, + .remove = empty_pmd0_remove, + .scan_fn = always_find_dev0_cb, + .match_fn = match_dev0_by_name, + } }; struct test_wrapper empty_pmd1 = { @@ -102,9 +153,87 @@ struct test_wrapper empty_pmd1 = { .driver = { .name = "empty_pmd1" }, + .scan_fn = always_find_dev1_cb, + .match_fn = match_dev1_by_name, }, }; +/** + * Bus scan by PMD 'pmd0' for adding device 'dev0' + * + * @param void + * @return void + */ +static void +always_find_dev0_cb(void) +{ + /* SoC's scan would scan devices on its bus and add to + * soc_device_list + */ + empty_pmd0.soc_dev.addr.name = strdup("empty_pmd0_dev"); + + TAILQ_INSERT_TAIL(&soc_device_list, &empty_pmd0.soc_dev, next); +} + +/** + * Match device 'dev0' with driver PMD pmd0 + * + * @param drv + * Driver with this matching needs to be done; unused here + * @param dev + * device to be matched against driver + * @return + * 0 on successful matched + * 1 if driver<=>device don't match + */ +static int +match_dev0_by_name(struct rte_soc_driver *drv __rte_unused, + struct rte_soc_device *dev) +{ + if (!dev->addr.name || strcmp(dev->addr.name, "empty_pmd0_dev")) + return 0; + + return 1; +} + +/** + * Bus scan by PMD 'pmd0' for adding device 'dev1' + * + * @param void + * @return void + */ +static void +always_find_dev1_cb(void) +{ + /* SoC's scan would scan devices on its bus and add to + * soc_device_list + */ + empty_pmd0.soc_dev.addr.name = strdup("empty_pmd1_dev"); + + TAILQ_INSERT_TAIL(&soc_device_list, &empty_pmd1.soc_dev, next); +} + +/** + * Match device 'dev1' with driver PMD pmd0 + * + * @param drv + * Driver with this matching needs to be done; unused here + * @param dev + * device to be matched against driver + * @return + * 0 on successful matched + * 1 if driver<=>device don't match + */ +static int +match_dev1_by_name(struct rte_soc_driver *drv __rte_unused, + struct rte_soc_device *dev) +{ + if (!dev->addr.name || strcmp(dev->addr.name, "empty_pmd1_dev")) + return 0; + + return 1; +} + static int count_registered_socdrvs(void) { @@ -148,13 +277,68 @@ test_register_unregister(void) return 0; } +/* Test Probe (scan and match) functionality */ +static int +test_soc_scan_and_match(void) +{ + int drv_count = 0; + struct rte_soc_driver *drv; + + /* Registering dummy drivers */ + rte_eal_soc_register(&empty_pmd0.soc_drv); + rte_eal_soc_register(&empty_pmd1.soc_drv); + /* Assuming that test_register_unregister is working, not verifying + * that drivers are indeed registered + */ + + /* rte_eal_soc_init is called by rte_eal_init, which in turn calls the + * scan_fn of each driver. + */ + TAILQ_FOREACH(drv, &soc_driver_list, next) { + if (drv && drv->scan_fn) + drv->scan_fn(); + drv_count++; + } + + /* rte_eal_init() would perform other inits here */ + + /* Probe would link the SoC devices<=>drivers */ + rte_eal_soc_probe(); + + /* Unregistering dummy drivers */ + rte_eal_soc_unregister(&empty_pmd0.soc_drv); + rte_eal_soc_unregister(&empty_pmd1.soc_drv); + + /* Verify the Unregistering has removed the driver from list */ + TAILQ_FOREACH(drv, &soc_driver_list, next) { + if (drv) + drv_count--; + } + + free(empty_pmd0.soc_dev.addr.name); + + /* If drv_count is anything other than 0, Unregistering failed */ + if (drv_count) { + printf("%s has failed\n", __func__); + return 1; + } + + printf("%s has been successful\n", __func__); + return 0; +} + /* save real devices and drivers until the tests finishes */ struct soc_driver_list real_soc_driver_list = TAILQ_HEAD_INITIALIZER(real_soc_driver_list); +/* save real devices and drivers until the tests finishes */ +struct soc_device_list real_soc_device_list = + TAILQ_HEAD_INITIALIZER(real_soc_device_list); + static int test_soc_setup(void) { struct rte_soc_driver *drv; + struct rte_soc_device *dev; /* no real drivers for the test */ while (!TAILQ_EMPTY(&soc_driver_list)) { @@ -163,12 +347,20 @@ static int test_soc_setup(void) TAILQ_INSERT_TAIL(&real_soc_driver_list, drv, next); } + /* And, no real devices for the test */ + while (!TAILQ_EMPTY(&soc_device_list)) { + dev = TAILQ_FIRST(&soc_device_list); + TAILQ_REMOVE(&soc_device_list, dev, next); + TAILQ_INSERT_TAIL(&real_soc_device_list, dev, next); + } + return 0; } static int test_soc_cleanup(void) { struct rte_soc_driver *drv; + struct rte_soc_device *dev; /* bring back real drivers after the test */ while (!TAILQ_EMPTY(&real_soc_driver_list)) { @@ -177,6 +369,13 @@ static int test_soc_cleanup(void) rte_eal_soc_register(drv); } + /* And, bring back real devices after the test */ + while (!TAILQ_EMPTY(&real_soc_device_list)) { + dev = TAILQ_FIRST(&real_soc_device_list); + TAILQ_REMOVE(&real_soc_device_list, dev, next); + TAILQ_INSERT_TAIL(&soc_device_list, dev, next); + } + return 0; } @@ -192,6 +391,10 @@ test_soc(void) if (test_register_unregister()) return -1; + /* Assuming test_register_unregister has succeeded */ + if (test_soc_scan_and_match()) + return -1; + if (test_soc_cleanup()) return -1; diff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map b/lib/librte_eal/bsdapp/eal/rte_eal_version.map index 86e3cfd..dfbb1ac 100644 --- a/lib/librte_eal/bsdapp/eal/rte_eal_version.map +++ b/lib/librte_eal/bsdapp/eal/rte_eal_version.map @@ -171,7 +171,11 @@ DPDK_16.11 { rte_eal_dev_attach; rte_eal_dev_detach; rte_eal_map_resource; + rte_eal_soc_detach; rte_eal_soc_dump; + rte_eal_soc_match; + rte_eal_soc_probe; + rte_eal_soc_probe_one; rte_eal_soc_register; rte_eal_soc_unregister; rte_eal_unmap_resource; diff --git a/lib/librte_eal/common/eal_common_soc.c b/lib/librte_eal/common/eal_common_soc.c index 5dcddc5..256cef8 100644 --- a/lib/librte_eal/common/eal_common_soc.c +++ b/lib/librte_eal/common/eal_common_soc.c @@ -36,6 +36,8 @@ #include #include +#include +#include #include "eal_private.h" @@ -45,6 +47,208 @@ struct soc_driver_list soc_driver_list = struct soc_device_list soc_device_list = TAILQ_HEAD_INITIALIZER(soc_device_list); +int +rte_eal_soc_match_compat(struct rte_soc_driver *drv, + struct rte_soc_device *dev) +{ + int i, j; + + RTE_VERIFY(drv != NULL && drv->id_table != NULL); + RTE_VERIFY(dev != NULL && dev->id != NULL); + + for (i = 0; drv->id_table[i].compatible; ++i) { + const char *drv_compat = drv->id_table[i].compatible; + + for (j = 0; dev->id[j].compatible; ++j) { + const char *dev_compat = dev->id[j].compatible; + + if (!strcmp(drv_compat, dev_compat)) + return 0; + } + } + + return 1; +} + +static int +rte_eal_soc_probe_one_driver(struct rte_soc_driver *drv, + struct rte_soc_device *dev) +{ + int ret = 1; + + RTE_VERIFY(drv->match_fn); + + ret = drv->match_fn(drv, dev); + if (ret) { + RTE_LOG(DEBUG, EAL, + " match function failed, skipping\n"); + return ret; + } + + dev->driver = drv; + RTE_VERIFY(drv->probe != NULL); + return drv->probe(drv, dev); +} + +static int +soc_probe_all_drivers(struct rte_soc_device *dev) +{ + struct rte_soc_driver *drv = NULL; + int rc = 0; + + if (dev == NULL) + return -1; + + TAILQ_FOREACH(drv, &soc_driver_list, next) { + rc = rte_eal_soc_probe_one_driver(drv, dev); + if (rc < 0) + /* negative value is an error */ + return -1; + if (rc > 0) + /* positive value means driver doesn't support it */ + continue; + return 0; + } + return 1; +} + +/* If the IDs match, call the remove() function of the driver. */ +static int +rte_eal_soc_detach_dev(struct rte_soc_driver *drv, + struct rte_soc_device *dev) +{ + int ret; + + if ((drv == NULL) || (dev == NULL)) + return -EINVAL; + + ret = drv->match_fn(drv, dev); + if (ret) { + RTE_LOG(DEBUG, EAL, " driver (%s) didn't match device (%s)\n", + drv->driver.name, dev->addr.name); + return ret; + } + + RTE_LOG(DEBUG, EAL, "SoC device %s\n", + dev->addr.name); + + RTE_LOG(DEBUG, EAL, " remove driver: %s\n", drv->driver.name); + + if (drv->remove && (drv->remove(dev) < 0)) + return -1; /* negative value is an error */ + + /* clear driver structure */ + dev->driver = NULL; + + return 0; +} + +/* + * Call the remove() function of all registered drivers for the device. + * + * @param dev + * Device for which detach is to be performed + * @return + * 0 when successful + * -1 if deinitialization fails + * 1 if no driver is found for this device. + */ +static int +soc_detach_all_drivers(struct rte_soc_device *dev) +{ + struct rte_soc_driver *dr = NULL; + int rc = 0; + + if (dev == NULL) + return -1; + + TAILQ_FOREACH(dr, &soc_driver_list, next) { + rc = rte_eal_soc_detach_dev(dr, dev); + if (rc < 0) + /* negative value is an error */ + return -1; + if (rc > 0) + /* positive value means driver doesn't support it */ + continue; + return 0; + } + return 1; +} + +int +rte_eal_soc_detach(const struct rte_soc_addr *addr) +{ + struct rte_soc_device *dev = NULL; + int ret = 0; + + if (addr == NULL) + return -1; + + TAILQ_FOREACH(dev, &soc_device_list, next) { + if (rte_eal_compare_soc_addr(&dev->addr, addr)) + continue; + + ret = soc_detach_all_drivers(dev); + if (ret < 0) + goto err_return; + + TAILQ_REMOVE(&soc_device_list, dev, next); + return 0; + } + return -1; + +err_return: + RTE_LOG(WARNING, EAL, "Requested device %s cannot be used\n", + dev->addr.name); + return -1; +} + +int +rte_eal_soc_probe_one(const struct rte_soc_addr *addr) +{ + struct rte_soc_device *dev = NULL; + int ret = 0; + + if (addr == NULL) + return -1; + + TAILQ_FOREACH(dev, &soc_device_list, next) { + if (rte_eal_compare_soc_addr(&dev->addr, addr)) + continue; + + ret = soc_probe_all_drivers(dev); + if (ret < 0) + goto err_return; + return 0; + } + return -1; + +err_return: + RTE_LOG(WARNING, EAL, + "Requested device %s cannot be used\n", addr->name); + return -1; +} + +int +rte_eal_soc_probe(void) +{ + struct rte_soc_device *dev = NULL; + int ret = 0; + + TAILQ_FOREACH(dev, &soc_device_list, next) { + ret = soc_probe_all_drivers(dev); + if (ret < 0) { + RTE_LOG(DEBUG, EAL, "Requested device %s" + " cannot be used\n", dev->addr.name); + /* Failure for a particular device is logged and + * ignored + */ + } + } + + return ret; +} + /* dump one device */ static int soc_dump_one_device(FILE *f, struct rte_soc_device *dev) @@ -61,7 +265,6 @@ soc_dump_one_device(FILE *f, struct rte_soc_device *dev) return 0; } -/* dump devices on the bus to an output stream */ void rte_eal_soc_dump(FILE *f) { @@ -75,14 +278,18 @@ rte_eal_soc_dump(FILE *f) } } -/* register a driver */ void rte_eal_soc_register(struct rte_soc_driver *driver) { + /* For a valid soc driver, match and scan function + * should be provided. + */ + RTE_VERIFY(driver != NULL); + RTE_VERIFY(driver->match_fn != NULL); + RTE_VERIFY(driver->scan_fn != NULL); TAILQ_INSERT_TAIL(&soc_driver_list, driver, next); } -/* unregister a driver */ void rte_eal_soc_unregister(struct rte_soc_driver *driver) { diff --git a/lib/librte_eal/common/include/rte_soc.h b/lib/librte_eal/common/include/rte_soc.h index 4a01af5..030df6f 100644 --- a/lib/librte_eal/common/include/rte_soc.h +++ b/lib/librte_eal/common/include/rte_soc.h @@ -62,7 +62,6 @@ extern struct soc_device_list soc_device_list; TAILQ_HEAD(soc_driver_list, rte_soc_driver); /**< SoC drivers in D-linked Q. */ TAILQ_HEAD(soc_device_list, rte_soc_device); /**< SoC devices in D-linked Q. */ - struct rte_soc_id { const char *compatible; /**< OF compatible specification */ uint64_t priv_data; /**< SoC Driver specific data */ @@ -89,12 +88,29 @@ struct rte_soc_driver; /** * Initialization function for the driver called during SoC probing. */ -typedef int (soc_devinit_t)(struct rte_soc_driver *, struct rte_soc_device *); +typedef int (soc_probe_t)(struct rte_soc_driver *, struct rte_soc_device *); /** * Uninitialization function for the driver called during hotplugging. */ -typedef int (soc_devuninit_t)(struct rte_soc_device *); +typedef int (soc_remove_t)(struct rte_soc_device *); + +/** + * SoC device scan callback, called from rte_eal_soc_init. + * For various SoC, the bus on which devices are attached maynot be compliant + * to a standard platform (or platform bus itself). In which case, extra + * steps are implemented by PMD to scan over the bus and add devices to SoC + * device list. + */ +typedef void (soc_scan_t)(void); + +/** + * Custom device<=>driver match callback for SoC + * Unlike PCI, SoC devices don't have a fixed definition of device + * identification. PMDs can implement a specific matching function in which + * driver and device objects are provided to perform custom match. + */ +typedef int (soc_match_t)(struct rte_soc_driver *, struct rte_soc_device *); /** * A structure describing a SoC driver. @@ -102,8 +118,10 @@ typedef int (soc_devuninit_t)(struct rte_soc_device *); struct rte_soc_driver { TAILQ_ENTRY(rte_soc_driver) next; /**< Next in list */ struct rte_driver driver; /**< Inherit core driver. */ - soc_devinit_t *devinit; /**< Device initialization */ - soc_devuninit_t *devuninit; /**< Device uninitialization */ + soc_probe_t *probe; /**< Device probe */ + soc_remove_t *remove; /**< Device remove */ + soc_scan_t *scan_fn; /**< Callback for scanning SoC bus*/ + soc_match_t *match_fn; /**< Callback to match dev<->drv */ const struct rte_soc_id *id_table; /**< ID table, NULL terminated */ }; @@ -146,12 +164,63 @@ rte_eal_compare_soc_addr(const struct rte_soc_addr *a0, } /** + * Default function for matching the Soc driver with device. Each driver can + * either use this function or define their own soc matching function. + * This function relies on the compatible string extracted from sysfs. But, + * a SoC might have different way of identifying its devices. Such SoC can + * override match_fn. + * + * @return + * 0 on success + * -1 when no match found + */ +int +rte_eal_soc_match_compat(struct rte_soc_driver *drv, + struct rte_soc_device *dev); + +/** + * Probe SoC devices for registered drivers. + * + * @return + * 0 on success + * !0 in case of any failure in probe + */ +int rte_eal_soc_probe(void); + +/** + * Probe the single SoC device. + */ +int rte_eal_soc_probe_one(const struct rte_soc_addr *addr); + +/** + * Close the single SoC device. + * + * Scan the SoC devices and find the SoC device specified by the SoC + * address, then call the remove() function for registered driver + * that has a matching entry in its id_table for discovered device. + * + * @param addr + * The SoC address to close. + * @return + * - 0 on success. + * - Negative on error. + */ +int rte_eal_soc_detach(const struct rte_soc_addr *addr); + +/** * Dump discovered SoC devices. + * + * @param f + * File to dump device info in. */ void rte_eal_soc_dump(FILE *f); /** * Register a SoC driver. + * + * @param driver + * Object for SoC driver to register + * @return void */ void rte_eal_soc_register(struct rte_soc_driver *driver); @@ -167,6 +236,10 @@ RTE_PMD_EXPORT_NAME(nm, __COUNTER__) /** * Unregister a SoC driver. + * + * @param driver + * Object for SoC driver to unregister + * @return void */ void rte_eal_soc_unregister(struct rte_soc_driver *driver); diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c index 098ba02..bd775f3 100644 --- a/lib/librte_eal/linuxapp/eal/eal.c +++ b/lib/librte_eal/linuxapp/eal/eal.c @@ -70,6 +70,7 @@ #include #include #include +#include #include #include #include @@ -890,6 +891,10 @@ rte_eal_init(int argc, char **argv) if (rte_eal_pci_probe()) rte_panic("Cannot probe PCI\n"); + /* Probe & Initialize SoC devices */ + if (rte_eal_soc_probe()) + rte_panic("Cannot probe SoC\n"); + rte_eal_mcfg_complete(); return fctret; diff --git a/lib/librte_eal/linuxapp/eal/eal_soc.c b/lib/librte_eal/linuxapp/eal/eal_soc.c index 04848b9..3929a76 100644 --- a/lib/librte_eal/linuxapp/eal/eal_soc.c +++ b/lib/librte_eal/linuxapp/eal/eal_soc.c @@ -44,13 +44,28 @@ #include #include -#include "eal_internal_cfg.h" -#include "eal_filesystem.h" -#include "eal_private.h" +#include +#include +#include /* Init the SoC EAL subsystem */ int rte_eal_soc_init(void) { + struct rte_soc_driver *drv; + + /* SoC is disabled by default */ + if (!internal_config.enable_soc) + return 0; + + /* For each registered driver, call their scan routine to perform any + * custom scan for devices (for example, custom buses) + */ + TAILQ_FOREACH(drv, &soc_driver_list, next) { + RTE_VERIFY(drv->scan_fn); + drv->scan_fn(); + /* Ignore all errors from this */ + } + return 0; } diff --git a/lib/librte_eal/linuxapp/eal/rte_eal_version.map b/lib/librte_eal/linuxapp/eal/rte_eal_version.map index 0155025..c28e093 100644 --- a/lib/librte_eal/linuxapp/eal/rte_eal_version.map +++ b/lib/librte_eal/linuxapp/eal/rte_eal_version.map @@ -175,7 +175,11 @@ DPDK_16.11 { rte_eal_dev_attach; rte_eal_dev_detach; rte_eal_map_resource; + rte_eal_soc_detach; rte_eal_soc_dump; + rte_eal_soc_match; + rte_eal_soc_probe; + rte_eal_soc_probe_one; rte_eal_soc_register; rte_eal_soc_unregister; rte_eal_unmap_resource; -- 2.7.4