From patchwork Thu Aug 30 06:03:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 43995 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BC6FC4CE4; Thu, 30 Aug 2018 08:06:03 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0058.outbound.protection.outlook.com [104.47.2.58]) by dpdk.org (Postfix) with ESMTP id 919644CA0; Thu, 30 Aug 2018 08:06:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jqg+9SzWIO+J53AVRtYlNvxtsiIpluu5f2yOfYRMfuE=; b=RT1XNpMF6pleOo/+3AKBVC6rSy4jhHE28pSEPFCQhqQQw4YYiUza5HDwt7Oysd8u5MNkQs/4CGs7tuaTWwpU42J393xKbxYifDTcWzvDjDhDKTHcd+xCalo+c0IYo4m/0wky6/2sdB+Ej7fKMfGicZZZOF7kp0q6d/r8WeQ8Khc= Received: from bf-netperf1.ap.freescale.net (14.143.30.134) by DB6PR0401MB2533.eurprd04.prod.outlook.com (2603:10a6:4:36::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Thu, 30 Aug 2018 06:06:00 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: jerin.jacob@caviumnetworks.com, nipun.gupta@nxp.com, stable@dpdk.org Date: Thu, 30 Aug 2018 11:33:55 +0530 Message-Id: <1535609039-10869-1-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: BM1PR0101CA0004.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::14) To DB6PR0401MB2533.eurprd04.prod.outlook.com (2603:10a6:4:36::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c9e6ee09-1957-4b72-17ba-08d60e3ea9c2 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB6PR0401MB2533; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0401MB2533; 3:E5oZPQPNW7+8KLnpYFEu5pZrNikcaM8D7+9MpPdd8uzAYBl2UrxtjQ8QAtOBBTc0Ddp+njmj8wJVWWq4PNV1ldB3vAub4LEnJtObLSqhCibg7nP1wZKi3H7T55fcFlqVogsYSoe5eKHuBXTWYxOu2DsFfLOh2NGcW3SPKuDhxBB5boyvxa7YAN1fyEeMn3/x2kglPwWdHAefvknyR3vDH2Pkq9wjhlkMeN+HHQXHQPo2YjU+IGRHyjUelfRmvz+H; 25:hpFndjnQq9EU12HVWNgr7vwg2F7ekQMD03JSRWIBHmUHjHWmHULBCVkdC8Z+qRusfvk78Al650xG4tobogH7OnbffFNpH0Xsnga8Hic8QFAPo4S14ofB8QixdNadj02hedWNF4ffISqbMk6qkSar3kNmEqgxeB0yG0OS0s2Lak5EsO6j+TdzOOiteqoDzTRAyubACcd1JjbCU7C0KyHY/sKK8AX8DPdM+w8hYqdUCuaZjLGWKkhsdwLxgUpHjNTZ9RuoL8jY+8Yce4aKuWQSa9h47okEEaI31k66bn7vCtzctzH6loe0P1V52DpcN6AkjzVpPDOhydR2rnSKx6zfNA==; 31:jIKWwY1O0xi4WcwPbwMnGlLde3uPQciqQEbSC4m5hVhP65Aitr8j8Hohc8Pz50JKRT0ashBlzqhrZ1WEoey/3Gv176QAnwtS1iJXXOqdfFVlmvyxnLYHYLU5vriIwBfa+6vdfA7hJi8ltzTvX9u2Aix4Mt9k1neEFFL3ePOftRSe8HTBlHRXF6YiUJ3kqt5QsJtvI8dYNBnJVb6bDZ5c/HSmTFFrY6/yavN4KEG7V64= X-MS-TrafficTypeDiagnostic: DB6PR0401MB2533: X-Microsoft-Exchange-Diagnostics: 1; DB6PR0401MB2533; 20:XMYBsxNpywU+VUMtCWFmT34T31nu8QJiOvNATJ6e3zVwJ39cdyfNcIu5sHWBB5RAeCIKDf7D83GN/3KPGZBWCH4VfQtrHPPP693/PB/y7O7iNnvazxFDXSEspR4dJxVuTWu7dWlkFhbsHtGUHKmVtq2OD26y29RMoSFTdMzCqWmJ3jzLRu/MjFhXmbUPtvNvIpU7pWGfl2WzGK+VuVgBqEQe5Y6xKDPHm38W50aEJGgMY/2G6xnsUHVoYvY1NPct9ytOQInSxQNAGww6OC9AbJct89OvQbsaSjXggehXkzCj7U0sUsFoXBxWKzY8mhUqO5C3zNnN0K3xmqSbZVYzA3yz+6vtiWDrOWsUTM+cpoLeX093f1SFl+yoFNVNu8Zs/zNDWRfU3Li/L/n+j6UlY8WV0BsAxL16ApbLIX24xXEEjPXuwCA4+uU7wrif6pQE0hXoN9oFG8APyJyaIABqGGg6Iw5GlXPUq5l+aPReEwJH/TGZqdFmCfYI+o3TDehp; 4:ZzBYKtmH9CMbCQ3ogUR1xx4Sf1nxeZpaEB1xNc3hwu6GOuawpxeB1xX+cU/jRyP/Nx7pIwPl7V1N+MN7/gQSC+ymARvv8bspRrnVe1GPGYMmj5GOQxURKIzdsJU4VYCs2GQdoN1b+1CGDHtUV2Slp82/OAGIRzTWxHkz3zXfCyXqoaoUV8TtX4Nq3b1Xm4u84PvSMZTnErpBBlQJ7+e2cHrY1y7i5R+pwtqszeNbQegA4H/CVIL+ptLYy8x1eM2FFhd/QAZqdWpEmXYYTvawobGR4KD/WU3H1uXPu3HWtyKK6zeaNVOWddU82wWqVZB1 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(823301075)(10201501046)(3002001)(93006095)(93001095)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(201708071742011)(7699016); SRVR:DB6PR0401MB2533; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0401MB2533; X-Forefront-PRVS: 07807C55DC X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(136003)(366004)(39860400002)(346002)(376002)(189003)(199004)(16586007)(105586002)(106356001)(6512007)(386003)(26005)(6506007)(47776003)(478600001)(66066001)(48376002)(50466002)(97736004)(6346003)(186003)(16526019)(316002)(55236004)(53936002)(2361001)(6486002)(2616005)(4326008)(305945005)(25786009)(476003)(486006)(956004)(7736002)(2351001)(68736007)(44832011)(81166006)(5660300001)(2906002)(81156014)(36756003)(50226002)(8936002)(86362001)(6666003)(6116002)(5009440100003)(52116002)(3846002)(6916009)(8676002)(51416003)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR0401MB2533; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR0401MB2533; 23:R3HtLTus3RWH9feIfNSRyASrSPPPCkjknaK3p1G?= t9y3I3o/qdgSyiF/dEl9QqowLZ9auAe8zF0NArm905OxXL5r++qSHtgnoYq55WdHkq/c3P1d0mKVTMU8pgXLf0OmLwogvpWwmNycxqF35eCVj4Hhsw3fsCimxBvORrHcPnIe4SRFNbQQ2WXsZgx0lpL5zUi5TDaFr87kE7EnpWV0drxkqlclUhKLRs5ExUi4SOIpEtngPsyRyLyfa6TnxXWeN/Ra5Ap8qKydXz0M5+6fs1uNujAeeJLAJvS9zG0dW0oUMfp64Ix8FZTfViRqyXkHNN9VwJqWa1E9RsR41fBQVkb2j0lZ2dRAEB1K9bo4/Vxd8kF5ej1yKHLThEtp3PXj1XHFQh+K7zikRM1ajA2UwT1DNzdtzH1pVl3wV6m2XFkGbBDo0CKNYSK9w0EGgD5mR4OYvyJV0xMKRRpJqesW9yZ8thtiejSR7QAFaX1m831m3oYwSrY0t10CBlqAZPMfCuP3lodhTeS8fqwdOqXNzH5/XUoZv0gbXvcLqQm3Vt4hmzOIUswTpPK8lTeSPLM3n+17bVUWcoWgeDtdlRxeQM6tXlOJBBWF3d5EmJVIBCPERVYvqMrwHhoJO6EtBuoAm8zrSqIcqACCPcn/5rIC4ja58bKULyXkGXGsOmraF8bMSNLai4imWl7hMM0g3NcA8To7F/0IjQvlqgMLHFzWDScITJni0Yy6MnJIVk3UJQXLYVDP8+Xch3taCs69UCA8B6sqdFDuv4S6374oc8eCJRaT01WrWmqvOcT1iTMDGc9b7rCTOsadY1wIbthx7ZbnDUBoS1DArZkg2jhIYho8t1EDTgIZzuD9CQENkY1NLdd+UaEl/oeDEcs4NRmDrUSNZ/LDpX5q70OrWZ3wUGvIfni7c3BVN9cb7jo8y0ELGZTdrGWArZg24MK6YqHn2CLs2eCfgwaY8L/HoNQB9KjVBVGMC9XhINsra+IWRXIDRGXFzLBy4VBFEUDFyxuUXCp2HUPWc9Bt3dOAYRK6oB436F8LfBa0OEP5Sz/0Vqx3WV76qLxJsHDdiuyiHyBhhy9dO3p/G1+rwFEV9BKabV94LQIPqKQxrrxL/QvrX78bqW5NrQ+9TQo+pODU51EadNWm6lGf2PwhRy+sLPABqmRDlg1IyN+s9CWlC5EIpNgzYIIszcqTv3pTcBUrqYSmSM5cw645g9Q2Ft3+J0gJe13eyAb3PHZ9Vd0fbuWt8MaOf2uPicN1y4jT95kZoS27iwbmZ X-Microsoft-Antispam-Message-Info: zhc4RuE5S3K/Kp2xe22hGfmxTfb1055bUu6jECpWWF5JbO7jxK/+2JHii5xa44fyANJpQcZOhRQnGRGXfKehsEtNUxtziqOb9PNWnuj+2rnvgWzFyzI2b8sO6ATBhs3GsEj09XhjRWVv/VldKEES8An+7XbUkd8WkdQZNF9W1o9+wTwJFgA+srICcx7J5klBZOxvstUdfEN2itFkONPWgLXXeBds7yALWRZTgm8NCZ0rewz1XwVINqQ6074fAgvydgYTZgyt+cSjXXgfRVd2LZ7GkrxgOziM97Og7GJwbKCAx/PRKeKwseFZD8MBVVMVr0EENqwwg15a2xSlyey14aF+hhzjhu3teoYpefckE0M= X-Microsoft-Exchange-Diagnostics: 1; DB6PR0401MB2533; 6:rUr19T3xxICOqaXdG4+Mslx+FpfI7U7iSNp9Zhph0PwhLcWzwARBkyXtBzcR9v8NtpAm3QOOU5P8NJ1SRpeXBPYyOO+hPIhn/FDm1lfs2TmHLi8MseB2q7LrFD1u643aBymCF+UMoK4dUVi0SC2UZG7SIv/To9Oeb9TE8yJjzXEyqQOG7GaYLHk057oMoUF9BkI4JvtNeuKxGRzLh9R6ErpPB53dxOW8uP7KmP6+aQlmVnp+dJMH1S8vpTyUt0UMrsUXwdV+IZxVOyP9Myq24pu0tR+PVkVOhJiWMx/KUeguvxk+RV78/zqVKSyYn+3R5RmZs+hAektMlcWtKU8O0F+0gRsC6gkqgSvNPVZhm62z3BzqMJTxPoFQkvpqBa68UGEY0SKGoirPGsm/wpqRfq1p0pCbbhx/rNI51mBEj5DN+ld/tw7mai5yIxkitMmIa1WrwgXaUnWg0OIDusF0dA==; 5:5CcaKSAtpQvZ4CXBEQYmBNrMdnOQnRzHT0eCDdDnb2+aLm7rNvGZro8PlXNslkQ0dYfOWWd+PFoOG7nOEZLoHt7xONlkjmz0yy7ueK8az+F6LkXmpniaBNYBfMf6kie8+C/VfMqZcKUITcJ61PzAEgJY9AJMyc/V+yaUoy7jRwU=; 7:p1ptm/+lZvt5FsxT27g1IKkFDdLnoxLY9uQNgKmJUZT7+mXgsm4PtlGAzCfSy6/lB54jge9tdrBrr090ZlHgx1SMnKPG0ForHVabVHifDvtXDArj+5P8LhhvNMrDJssz22b+APPjMy5iQiP7xgaexYdJs/Cwp8IIBNjT+E1qeDFp23WKdnX6dBZMac3q59XoohfbNlUYrVVb5RHequanc0RG18qMfFMmkjBdgWKGiSuOa56yo8+agrqc44McW4wk SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2018 06:06:00.8866 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c9e6ee09-1957-4b72-17ba-08d60e3ea9c2 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0401MB2533 Subject: [dpdk-dev] [PATCH 1/5] event/dpaa2: fix mbuf assignment in atomic processing 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" Fixes: 7b6edb640b73 ("event/dpaa2: have separate structure to hold dqrr entries") Cc: stable@dpdk.org Signed-off-by: Hemant Agrawal --- drivers/event/dpaa2/dpaa2_eventdev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c index ea1e5cc..ea9d868 100644 --- a/drivers/event/dpaa2/dpaa2_eventdev.c +++ b/drivers/event/dpaa2/dpaa2_eventdev.c @@ -197,6 +197,7 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp, ev->mbuf->seqn = dqrr_index + 1; DPAA2_PER_LCORE_DQRR_SIZE++; DPAA2_PER_LCORE_DQRR_HELD |= 1 << dqrr_index; + DPAA2_PER_LCORE_DQRR_MBUF(dqrr_index) = ev->mbuf; } static uint16_t From patchwork Thu Aug 30 06:03:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 43996 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 567D85681; Thu, 30 Aug 2018 08:06:07 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0056.outbound.protection.outlook.com [104.47.2.56]) by dpdk.org (Postfix) with ESMTP id A28504CA0 for ; Thu, 30 Aug 2018 08:06:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=F8/lS4oaFQceW1ZsVM3hTamD0IukmoOqkc4GbEbqumQ=; b=mmp6lpUTObvucaW9q8SSodJjNZ42mT0/yiN9ADh2sjUjgBMX/zwXM0zvukV03IheVO+OXHr9aik525jbvvdvRd7AbfUEosuU5Jp9+RwtIYBC6wDirTxFtp7J3KXF4f3EjmhhSNYB4Kn5Yh+5JEXODAtWo5qiXnR+jnL5HATGWBo= Received: from bf-netperf1.ap.freescale.net (14.143.30.134) by DB6PR0401MB2533.eurprd04.prod.outlook.com (2603:10a6:4:36::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Thu, 30 Aug 2018 06:06:02 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: jerin.jacob@caviumnetworks.com, nipun.gupta@nxp.com Date: Thu, 30 Aug 2018 11:33:56 +0530 Message-Id: <1535609039-10869-2-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535609039-10869-1-git-send-email-hemant.agrawal@nxp.com> References: <1535609039-10869-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: BM1PR0101CA0004.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::14) To DB6PR0401MB2533.eurprd04.prod.outlook.com (2603:10a6:4:36::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 52e93221-faf9-49df-66c9-08d60e3eaa87 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB6PR0401MB2533; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0401MB2533; 3:chsKIzFSibeeqCODZj8ux4hrsYoneHCKfWCAkqtj/2BTTl62IHTY1bdsVeCrc1XWSKKEWM1Z6KnxgCb0F1d216y/zu9wMg5m3FujWI3rxjyjlfHca9/OHQNoMvKBPlRckoack+3SnYGMvHuyZCISmKUwqa6BoifrUtwaL9nc4OOEw2qOxjVA6WR0lBMForQ67ubxiXGKoc6OoxkIj4oYQ4jTED5xDoS/YPIDnC1R5ZiUNTdFDk+nBco//9QjtkHQ; 25:8ktAOioqNzENapu0C41WLa0kxZXapF93C+ul1F+4FAfxyOAVbw258M6sOJVqk6ZqrXCpXDsZ5ZqKV/s0c9DURME0hFF0bfzZtV3j/DRpfmCSKtfnjumXDg/N52q74O6gEQLMTdzujXKXrasZGOavq9KhqxXdXX3FDhTRcKknzXDknyuTJKoDtGvHgXve9zROoXp6By3LmT6lafVav7FyTuCpUxg7gdpf7oBS+TJeS21QUlicimFIfY5F9BeQr2140JhV2YndWx1Ytlg+II3YnPhL0KZKV1DNDRPJjdmfwPEvvMp0dyLRFipbqhIalZayXBYbVh0jbUJ2tPm1ystbig==; 31:1P+YXHV6pLu+n5L1fNSuAUiQKqX6YE+Os/0/vneICTeXAW9LVW/dlZ5mdAEFpDflG+/+YY/CzmBNaqkGY5q6k+2iT8a8vNPQqsznwj1nvNgcZpgmrgOH+ipeE2zBkoZOHRsS1QJetacJPVLRYSWXHL1ku9JQXMwargmpq84gSjYC4r/DPUWx9VKximfhFXc/cHJ/xrB9khdSfx2Wom8g6zndtBMTmXaqhXTBolZOutM= X-MS-TrafficTypeDiagnostic: DB6PR0401MB2533: X-Microsoft-Exchange-Diagnostics: 1; DB6PR0401MB2533; 20:P6230o5gHjvOLgcblBO3WI4+/iq46BKm1pEv63az7deIi7CizcYuCdQ4xSJca8+OIZopND5TSd9oMviTGnTsCZ+bHGqknSlv/pCIApSQ7u4KF6sEJ9yFZiZkjM93w+7eM0rILYmNcC2bDxdjy4F1h2/Nq5ykw2rC34A9dE4kORutxSRe8bifB0ltNbOSTJzK7qXqpv59cyoZ3zhDxl+zAtTdMBU1ExSHBT5KdVT+Q6nb/pA5AKDLP4Nm/JNcyXXGwD+hyJvJRzzpqHHO9rSpRtHS1eMGbHtVVeqTqmo9rlWTkcAwEO6FwvSnGNQpdyubNHKyWFDJ/Y0FdhsO0F5LcOaejAl3FdAlMGRp+jWmwkpX+Wu26IdQ7c4t5xWyCI/crQkOa+MW0ZYVu8Kph3szImEon225qaoWcq30Clz48QN4eoujZD29LinJUeZpTweeASg8sZalhFI5zBpmiZ475ZDxg0mGDElo9eC8KmKMNqi5SrrqkMZh8NDDb4i9ztfE; 4:dZbGIn2fOSoeaw6NqcK3chP9delbKnx71dD+sk4ZM9DFs9SuhhfD0gRQTKsso1W55J2f5ygIicJgO8272CtvRPwV1dEeSKZXs29rkA0VFFlMUZeKQJK7h7uH2yOpM9JjEuzbGHINm6IiEvrpToWDfKrVmJF5mrvV4tLq/jgn7t66XJ/eCJsuUHu8MJD0xtXYWcPzShHYo+XKfyaz7ItjUavV9IjDL+HX/daFqMjK/u1CI6J+vbAwfYT8Iv1PhkRAvOB5Ztg0hHT0ECKoQDwHL+FhJ8QZ+0gQgfgYuDr/HkVI49zmMBPMEcUApOlOW5rq X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(823301075)(10201501046)(3002001)(93006095)(93001095)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(201708071742011)(7699016); SRVR:DB6PR0401MB2533; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0401MB2533; X-Forefront-PRVS: 07807C55DC X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(136003)(366004)(39860400002)(346002)(376002)(189003)(199004)(16586007)(105586002)(106356001)(6512007)(386003)(26005)(6506007)(47776003)(478600001)(66066001)(48376002)(50466002)(97736004)(6346003)(186003)(16526019)(316002)(55236004)(53936002)(2361001)(6486002)(446003)(2616005)(4326008)(305945005)(25786009)(476003)(486006)(956004)(7736002)(11346002)(5024004)(2351001)(68736007)(44832011)(81166006)(5660300001)(2906002)(81156014)(36756003)(50226002)(8936002)(86362001)(6666003)(6116002)(5009440100003)(52116002)(3846002)(6916009)(8676002)(76176011)(51416003)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR0401MB2533; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR0401MB2533; 23:lwErMABQSe527dF3as1B0NYlz9uX+5GwVllzIXJ?= JJcaB9ILS8T//MqdGUfBGIPeKzJPqqQ3OBq+F0mtXmcawwEPLkYhXF+wlzmgwgYcz9d5uF79TKEru3XhWzcbNLo9dNu4mpR5XYCSqSO6vO49Ex8wQAMjnc0mQ80105u9GE0gl7MCEYuEt9Uc04OeXXRMsVZ7kIN4Kd25DyUg7dTu3z2MbTFFnnALIt/RtdIcQrzM+pYRQ+Rh6dc7dqWONQYVI0DdHojcAWA42WH7/844dKqrp000AjWeoIaLxLV7TJxNI3ff8+4nMOMjZ+mnkDp8+30QhPlvnUl6m7MC5DsQ8XIrzTdC81G69D4ogxMYiJCgko2NR8HtvEUmzZJp38aE0+zfD/5FT8QGYHah+hs5t4NAYxQhno47sy8KM2MPmSSW2PmM3+mTpe7zRzeAdjiKTRTQCfjKxjZ6wqHDCjDRbS9aPFsdzSbqYqX0rgx9PZdNsMx6D1NZEzNHXjYV7kxW9SkkUNWLrJ47uIaSMx+Bzsx+hBmIsIeCbaCDMtddqABsGYQd8EsMTEJL1kskiZTGUu7Ltyd24sWvlkl6rumrEQkDroTBh467J5c7x6Nj+8sBUl7Mit5McJvrKUd4/CaIA3YW3A+P5bWH0yEVxN7gQbcHn38pYhJ8bZIj1oMrp+CzbLdHvzSXp+UCsat7Xzekn9/8vuY7tkjO7tloteYQ/Y/ofKywkyO2zF2jhSB4MFZhQOOrEla99zMPbv5Y+GWxUh7uNaQYOa4Y93ShpLr0PLH0mT54+rSugGGbfkCHkRomBKc4ei/oqofcIX234SeEgWWOAsrOqamnde+kAJX/aWHVCMjPFDRj/vQS3nI6bMR5NpTs20WO79GaotbXc99s9Zc915rt/IY+9xD5aegPUaMhn+zaAb8HfchurfbVBFgco4G6Eh3DT0CLMVlgrnqg5fXCeu7lmEOggSNcsiyNQLgFLMSis+S1odODb+gpXBZS03kUyeiA6gRC6dMx4YGLtqhwTFHFwFqFR0zLlnooiS6moNqkvbmHmEh5IH2JbvECmhlroOW4lBPtJcVeoxHWhENE5M3lgvvH6FEkEG8iZdzE/QFB6y8/itj4xBwtruaGAck2lWCLAtW+juFnOY2CI0Qx+/LTNSmNdUHA8EpbV4tokzIviipN1kW9UYs/sahQMZMBScbyZV5wg58V95pIYA8AeIdlMJp8M9rH/HCTRgpxokbkgJr+InXCVEPowsTMWIJ87StxHYhSxl9uYZJRkUBWLqmU/Kldm4eSOPIVU6hn408hbL4JeVONy52hmR7AH9L+5QOavBDVIGI+n0fnk X-Microsoft-Antispam-Message-Info: wt+bsabP2CT3R5lU7G74kikQhDmEdNSaotkDR6TJO3UasigO8T3rIgcm8bjlCL6TejEXDjhQIjtKoaFWGLdAGOa797BWDvCc168ikHnv2SiL1uxWnbXx1egB2f3n/bKJp9yQW++S3JsXUKUaXD66bB5DqHDZsnkjJrWEHBN7tGJiBuM8dKQyZm/+SPefkvBA0NqCkWWEKl8mYM6TQPR/TSD5I/TX/Y2MhNDQjcJ9esOHlWG+pHhiRAs//zjCAMV+C4YCuyo48mYTQm0BWkgS97Tji65iKZRVEH3QaY43tAmy9aRg4oMvv5ZmistZ4F22/htDqgECZWPK6irGSCOhJ44a0vrtlNHZm6GWcKGOnR8= X-Microsoft-Exchange-Diagnostics: 1; DB6PR0401MB2533; 6:FVGdJxWHvvCHlCcl/wFARtOr9Wyqh2zYMYiLH8RCqdYMwjLMDS5hfwVks7V8dsfMf1g+dqVQS7R8SUwPlNTld5Ir1boLa5Q6J/IqlT1InK6tdQQ4MBRRe2NIu563ZrEYHaWx3TLceFZysBVjgq4+R9S9Agy+QtvPJeg+vlN5/8D4lo5XXYTIe2W2E2nu1WtgaPt84E6ms2gp5eqfPnB91oPbeafFtGAk4YtsKSv97BKz1mbywt6zg9B5UMPQTeqzr1EOmYSSezoEjFyny+drjpuchZVPYa4+mlycjQP1K9VaztrsU9bYGab0TVtGCKtLiSKfsVwbvTN3SQ7Z9ETi81CQBDgLv9fteBzhanYwtANAUnpSPmqg1PrhPTffBFh60hH067smCmy/qJoSFBixYhCXYMZhA9lpNQPkTJGXCoMd7qzWZD2IulleNzYyL1X74OzVEkyaJHq+20OiVKiqWw==; 5:b69zXk+fHcPhb6xg7bvkijI3p5w8UX+AR+sdy7/zF2f5fQjeL1Q81l7sVHaB619IPUPqgwj5dRQFOs37/TnOVgWh6Gd5vPDljRBzPd+IxTrPrdxeGd3mPn4U3XcolwRLoXYlL7XHlenCsx9MIDVHofHMNnQ5/1OSl4SqWrMmdjA=; 7:wBELTaFtr9Wx3hS4JAhMWfairGo4YDLM83g/YFpnpx9j2WIVkpXD0zGM+swgKV5ZASxoPOtpRvmDrKpsmf1S6QiNtYlHXf5tHTaqFGqOZq0PlfsnItS5x1J3TKJkz2cD2kao2bbPLAUuTywmpa5l1z4U85ufnusbDl0aE1fO8z4RW6rBk8vf3pWMyisSbnvFUtWocTNQCsKj82JhPnEAK8E8VLLrmzKbmVFX/nix/dybNnVkZxE7aJjcr4hP/tmR SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2018 06:06:02.3428 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 52e93221-faf9-49df-66c9-08d60e3eaa87 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0401MB2533 Subject: [dpdk-dev] [PATCH 2/5] event/dpaa2: rename evq info to dpaa2 eventq 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" Signed-off-by: Hemant Agrawal --- drivers/event/dpaa2/dpaa2_eventdev.c | 8 ++++---- drivers/event/dpaa2/dpaa2_eventdev.h | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c index ea9d868..c4064a4 100644 --- a/drivers/event/dpaa2/dpaa2_eventdev.c +++ b/drivers/event/dpaa2/dpaa2_eventdev.c @@ -58,7 +58,7 @@ dpaa2_eventdev_enqueue_burst(void *port, const struct rte_event ev[], ((struct dpaa2_io_portal_t *)port)->eventdev; struct dpaa2_eventdev *priv = ev_dev->data->dev_private; uint32_t queue_id = ev[0].queue_id; - struct evq_info_t *evq_info = &priv->evq_info[queue_id]; + struct dpaa2_eventq *evq_info = &priv->evq_info[queue_id]; uint32_t fqid; struct qbman_swp *swp; struct qbman_fd fd_arr[MAX_TX_RING_SLOTS]; @@ -385,7 +385,7 @@ dpaa2_eventdev_queue_setup(struct rte_eventdev *dev, uint8_t queue_id, const struct rte_event_queue_conf *queue_conf) { struct dpaa2_eventdev *priv = dev->data->dev_private; - struct evq_info_t *evq_info = + struct dpaa2_eventq *evq_info = &priv->evq_info[queue_id]; EVENTDEV_INIT_FUNC_TRACE(); @@ -449,7 +449,7 @@ dpaa2_eventdev_port_unlink(struct rte_eventdev *dev, void *port, { struct dpaa2_eventdev *priv = dev->data->dev_private; struct dpaa2_io_portal_t *dpaa2_portal = port; - struct evq_info_t *evq_info; + struct dpaa2_eventq *evq_info; int i; EVENTDEV_INIT_FUNC_TRACE(); @@ -473,7 +473,7 @@ dpaa2_eventdev_port_link(struct rte_eventdev *dev, void *port, { struct dpaa2_eventdev *priv = dev->data->dev_private; struct dpaa2_io_portal_t *dpaa2_portal = port; - struct evq_info_t *evq_info; + struct dpaa2_eventq *evq_info; uint8_t channel_index; int ret, i, n; diff --git a/drivers/event/dpaa2/dpaa2_eventdev.h b/drivers/event/dpaa2/dpaa2_eventdev.h index 229f66a..d2f98c6 100644 --- a/drivers/event/dpaa2/dpaa2_eventdev.h +++ b/drivers/event/dpaa2/dpaa2_eventdev.h @@ -56,17 +56,18 @@ struct dpaa2_dpcon_dev { uint8_t channel_index; }; -struct evq_info_t { +struct dpaa2_eventq { /* DPcon device */ struct dpaa2_dpcon_dev *dpcon; /* Attached DPCI device */ struct dpaa2_dpci_dev *dpci; /* Configuration provided by the user */ uint32_t event_queue_cfg; + uint32_t event_queue_id; }; struct dpaa2_eventdev { - struct evq_info_t evq_info[DPAA2_EVENT_MAX_QUEUES]; + struct dpaa2_eventq evq_info[DPAA2_EVENT_MAX_QUEUES]; uint32_t dequeue_timeout_ns; uint8_t max_event_queues; uint8_t nb_event_queues; From patchwork Thu Aug 30 06:03:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 43997 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6D89B58C3; Thu, 30 Aug 2018 08:06:09 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0064.outbound.protection.outlook.com [104.47.2.64]) by dpdk.org (Postfix) with ESMTP id 01C2D4D3A for ; Thu, 30 Aug 2018 08:06:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XZJh3g760uu4zbolxkLZyPABTV4IIvS+pOFWsI5zLpc=; b=m3/yoZaUqlga9t0tztzaF1D+pUmkFa7tEZ4JtyPX8eBKssi9czcxCRm1akLiuRp2df1XajIKB3LJvlfDxnGoAn8aUGU/sLkMVtcMdKGSCaJRw27WWcrmkpDfqEe2cxzwOBGXqC/VOZbTVEQtpXgqTnjof4U4hkAUo+iwaZXqwe4= Received: from bf-netperf1.ap.freescale.net (14.143.30.134) by DB6PR0401MB2533.eurprd04.prod.outlook.com (2603:10a6:4:36::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Thu, 30 Aug 2018 06:06:03 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: jerin.jacob@caviumnetworks.com, nipun.gupta@nxp.com Date: Thu, 30 Aug 2018 11:33:57 +0530 Message-Id: <1535609039-10869-3-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535609039-10869-1-git-send-email-hemant.agrawal@nxp.com> References: <1535609039-10869-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: BM1PR0101CA0004.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::14) To DB6PR0401MB2533.eurprd04.prod.outlook.com (2603:10a6:4:36::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6b597469-d6ce-41a2-aa71-08d60e3eab33 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB6PR0401MB2533; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0401MB2533; 3:8bNGHgocRDrb7Rmg2tUogKxooWUemfssKvr4CRB3Soy6JfoB2FZkbGaddMNbhm7GOVtXTRiK5Mi7T0aOg3XYi90tSCvp8jtpQ0nzympuMOYpFq2XluZuNBGtUq7qWaqPmW5WX4HPEv9wzxvxvQOL2tHkesWs29CPgUgzSSnyR/OR6eTh3y2tVIn/gKmCpjluYqNiqYjlrLK0gEzYHboTjSPpTPm0BtOEV4M5oh9NRkjAHLMJTUhee065cxCoWoT1; 25:FAZ7dGzb//8itEdyNCJcnY+3Dhryg+p86Jy2HVKckFpy1eN3uNP8XyLakD9vXb1YjsMbY6O1pLhrD/A5pNdG5Fx3jMHDEyu/8qHSLt/l7FmHNaEzdXe3QuPj0qxTOpcKLneoL0IX2xTn5b8/b+09f+zb+rGnDtJodMBw4lIaALqp9w0XdHPMmDKtstK81ZC/06WE3hlRJof2o45ehYDei4OUuDfQ8xQ6Q9+c6+0nfYokhWu+0BMDG97y9vp0RqJZtgaEUZaY8VFJxXrxBLh/Ogk8J+/iE4+W0BVL9kWIpMfjwLRJmePfXurwdXY70ovI7ac+LzYTUdngxmxmkaciNw==; 31:mqjYPkNck+qlNgsQcBF00obkpWDZOcJWg9yMNwFKhf/kcoV/5k1ivEBtBPlU9bc+TIe42wGmJT/2+hAyVr+HWoO6QOnO9nlLyK1Jxr6PTVnnjNO4pcATLJL0VcGJtjB+qyh147pOUdegTzbtPDQ46X+kEULl5oAbHcnFfbhgje3q4KgWU8984yZIjgJHYB64XP83Sici/6v32JJeSzH29v8RSohTWM0wA5E1oJ+mQrk= X-MS-TrafficTypeDiagnostic: DB6PR0401MB2533: X-Microsoft-Exchange-Diagnostics: 1; DB6PR0401MB2533; 20:gBH2CuXWd5VXjnCIP/Lv9mVSG3p78wcil9F5fewQ3u5FeFFR6fqSSoLT/b8vunxS926pd1OXkzoHVQtII4zsHnJOVoGTHXQBgU6jCN+fxBPQyI5w6ZrnAry6NJ4yCSaG5GwRBUMMXpuR648tJF776pLuPNWn7WpAB3g/RSXaJD9+69rF6qq5dumLBEYLU9tGMcgwPvcgCQJ+IoStH0gv/hbTM4/WKjKMuOxc5f7Rcw4qtb9/lwBXZXyo93SEEGoaMp5LTbm8/z8OxRLe4OTSSP8IVpAyULxKNW3GLuoTtJOcq0km8ncX2CLXEHCD+OgiZMTZ1b5U1iFEnGFWsSoQucLj4VzclHUB//69zAH92p5v+IJT0mKycAiGnWuqr+l4xfkmCyhL+V/EXtP+XEH62nA0j0foph8zkHQ9CsVVk0MkUDjy9UFOwkI3ge+BXuIjHkYub6L2CvxfvTyYrlNwsOVwxwAXNgOFNB91icOtQXNmhqZ199NXtGCBKr6TEpiX; 4:eYGLFqkbky6rr9wWbP1ylWZkEAfi3KFaXX2Tl8pEsnd9w0a6ad6VhRCIoIlZA0pMBUDhKjoM2Gdd2zR45sqw15xvobVlYZPdLmRvc7cX5R2HJQBe1carOq39QXt0Q82pxP+W/I6XwYeOxxj6rAd0ETK5NiT8rdw8onhaMiZtcK6DkM7gKWcuEP/Pv5aCX4kvTK/3TH3Cy8xWYULNQ8oMiYw2VgOG83fLxaYxCIwAD0YC5AksZZaK09LCcKCBgQJquBvXB9kCT6kAMb6i0g13Nin9aPpgSrDpTZSnIf4m+y8iWso7PcHS23ndpsq+yZiR X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(823301075)(10201501046)(3002001)(93006095)(93001095)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(201708071742011)(7699016); SRVR:DB6PR0401MB2533; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0401MB2533; X-Forefront-PRVS: 07807C55DC X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(136003)(366004)(39860400002)(346002)(376002)(189003)(199004)(16586007)(105586002)(106356001)(6512007)(386003)(26005)(6506007)(47776003)(478600001)(66066001)(48376002)(50466002)(97736004)(6346003)(186003)(16526019)(316002)(55236004)(53936002)(2361001)(6486002)(446003)(2616005)(4326008)(305945005)(25786009)(476003)(486006)(956004)(7736002)(11346002)(2351001)(68736007)(44832011)(81166006)(5660300001)(2906002)(81156014)(36756003)(50226002)(8936002)(86362001)(6666003)(6116002)(5009440100003)(52116002)(3846002)(6916009)(8676002)(76176011)(51416003)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR0401MB2533; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR0401MB2533; 23:u3GQdCVirCPEPhNMgHA7C7y8D+lD1Qx3TDh97r0?= jexnMRlUrjctREoup9QLMbAKWu1XSMjMeKDeH+u6Da+uRf7L9dSHjA2mBrh/h9o/f6HVvrtHMG35H236FqyqUEGizN77K+bM/LcW5b80o4T5szFcGNZZpcKvmrjyFwE0r5HOjfEYCVZCv8/RQUdmpu5epYELK0LjlBSvl6kO9pxZWB6TKOveIvTgKqhHHngw/Uhlj3BZa+Zcp84BTATtPbkQlkqWifH4VNf4hGaIMtcMMh7QeyGXIIOi77tyAAADZS95Pz2nagBBlUym7QNPX/Lle7QPbV6EYZqlhyZbvhRopV3A/RexDYS6wHoxKa1iuM9xfl2gF4GIelNYK2mszUXYMr0DN7L4AGfqyo9EgZmf+S8pYTZhWo4wEjywMTuXgHhjAPQlrXrydiqREMqIPp+dGBOB5qep4NFq6wgx+jYBHC9xdmEiq1Hye54lNfQXUFY+QXbQ85NQTFZlOorQ3ws2nxEHoUJADFa+wXq1XSJuRXeodA9zx2vSisNsNALvBkRwsoxi307RPNknyRt7hQa9W3pMpenmeURhfnSXep3v7GZmIxPj6ILnb3SQbiUKnT3vudgcnWTLCQYarfMk3zXZnHYAz5Rr0vm3hmeo5gVGJ03crhLt3vACqKpOX2nBvSQr3SQfgqFn94PYK3eVIBM0oH7TG/8VwxX/Mgbpullx/gGB0uHrXRkjkH4A82ryqa+VXzyUIsFlaxyrUEwwZYify9PO8pZwxAv2IvcsZgVUFoWQio1Bw1WuQL+UpwRXKf2Nxr/0VkCbQnJYomSSk3eIGlMSc8OSz9U1DyKf/jo8LoZ4D2CZEJr3AuAGHs4ZBUSLQDRbZIk8g+hGV3bpzBqpXv08Jdpcrtv1IH8frMOceIFMislpFTpEUyw5sLSp/ECuPq5V7aMsJcz2BKU/jxEDK+AQ6RZAddGGp6q5ohp4Q8Jq0m8rm+d6RTjdLDbNtBOcc5LqecgHX4gZvun1CAMfOc+fOeIOvaMfvoAbCVVKDaWjUO2pOUqVAKPa5ozqE8OqRXbycVSZbiQ8OwIELQX7TN0fw0u8q+hFFi1uC+R64TVKuZlYOSyW6IBK2t8oFgZOLRWRLjRCuQoiV1QRQUlho5LU7YV1moVkqqNKNb1+9UWv8Jed59Wn2efUdiXTUXzkiiqHs7SdfKiIP1/gWnqWPK2vKTitZxfqmV5+kfh5P2LXqNUlHT/jEMSFvvwHHrbvnYhLn4uX1x/eAlzuSoraGfrWpbL0WldMR0OOS0/NqhvFMtQwrgc70lHrevRPpy78= X-Microsoft-Antispam-Message-Info: yjUq52A+SyJVVsJzLFRtzimo5jW353gSMrvx6JEmX90OqsyyaEfBVkMH32C+/XEL2br8Lvy37uH/s4VPbcsATxJiQU0uvck3Rbf8ZNmGfCwsgxeJmLw+S/cJAuFALnS6ud9UerPIX6u1vwi12JqABbKhFUT3vwxsvw7BcM16YrjJE3CovFL44xIahiQzG3UQOTEZUX7UmkolfRbzwLsmUbY0e1MKDoSKY/WztA1/Fn8Nx+hfoYPOf4Em7xEqH37kWj5bH8teHbOHlgPZ8Yi5EfqWXgCRQOqQPCohDw+32xkkRaz+l8/uZgUpn6RzaZVt0NpjWZU8I5He4PpZprpeXosq0Hd7//Xt1R7jqb27Dxo= X-Microsoft-Exchange-Diagnostics: 1; DB6PR0401MB2533; 6:W1XSXPcCOFE/OVQUGtUtMqdfZwN+SH8Qy7ib+7TMJYm3HQKxjn+7db9X4/WByauNj/IzIgJC2CGJGJMHQiuo1cMZ+3IKwPoj/ChVTBKJp0/fssppOL0AWsiayF3kNVbf2X9xMj+WulGfSqO/RVK40ZKjEgp9c5zdH78OAz4mB9Jro/WQALw0OovssGYrQositiWCTBTw1QuNgEgyOBwFUa1aupx06rFqQ6SJvqnXRwA4odXzCpGurEqFbtpyY5dNMPOSd+hEVmkREIypzdz+Lvgg86fTFF8DhnbCoiHXbzDy6DegI7ivuOzPmujJZQH5R6ScPGAWyetDbes04E2/sT5IRx5D95qidJkZoxswiHIe05LjYmPEDSHsdNaGN3Ci6DPSUCOBoKyTaxFMY0NC9S+BJxoit7PEmCocvzBmNoX2r/XcbAcvpQ6m5ZDk+1ytMv1xdB/BoR08oG524LwBlA==; 5:eBu1MvNkySDaKmqcCSAzxV0raQ2lq+DuAynGsyUC1benMKoe3x3k+BIx/uXRwBSjnk5VXJ/9eN4W6/hllpAfhOmlYgsuryv1qhGquekig8+X7e0CT4KXp6tJWJFh0y0zz7LlRtNqUckILkI1GR3lCEesN904RVHfIxRv+YBiafw=; 7:xQ7zUDVj13vR5B8QL2+pZljgd63ivIbLDM7FW4Xrrk88SNPV0v2NVG1er+UNIUt8cdN1YL3o2wabk/q6uq3/L+LfyrEDKY69SoxcQKfpaUccjq6faXJ69fKiBEhx9rUPRELvvYiJTQp5iC5KP2dFrvoPnXQWu1F8E5OU6OFFrUkQzA2chzTf3qGnpmQr0bcfSjYhQzf6WR4aF4GFMLRZv6f4etYLUjeNc1RJh9i0hW+hEs5GZuUOdfzf8d8YdejR SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2018 06:06:03.4658 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6b597469-d6ce-41a2-aa71-08d60e3eab33 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0401MB2533 Subject: [dpdk-dev] [PATCH 3/5] event/dpaa2: enchance timeout handling 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" Signed-off-by: Hemant Agrawal --- drivers/event/dpaa2/dpaa2_eventdev.c | 19 ++++++++++++++++--- drivers/event/dpaa2/dpaa2_eventdev.h | 1 + 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c index c4064a4..4b56e2e 100644 --- a/drivers/event/dpaa2/dpaa2_eventdev.c +++ b/drivers/event/dpaa2/dpaa2_eventdev.c @@ -284,7 +284,7 @@ dpaa2_eventdev_info_get(struct rte_eventdev *dev, dev_info->max_dequeue_timeout_ns = DPAA2_EVENT_MAX_DEQUEUE_TIMEOUT; dev_info->dequeue_timeout_ns = - DPAA2_EVENT_MIN_DEQUEUE_TIMEOUT; + DPAA2_EVENT_PORT_DEQUEUE_TIMEOUT_NS; dev_info->max_event_queues = priv->max_event_queues; dev_info->max_event_queue_flows = DPAA2_EVENT_MAX_QUEUE_FLOWS; @@ -314,7 +314,6 @@ dpaa2_eventdev_configure(const struct rte_eventdev *dev) EVENTDEV_INIT_FUNC_TRACE(); - priv->dequeue_timeout_ns = conf->dequeue_timeout_ns; priv->nb_event_queues = conf->nb_event_queues; priv->nb_event_ports = conf->nb_event_ports; priv->nb_event_queue_flows = conf->nb_event_queue_flows; @@ -322,6 +321,20 @@ dpaa2_eventdev_configure(const struct rte_eventdev *dev) priv->nb_event_port_enqueue_depth = conf->nb_event_port_enqueue_depth; priv->event_dev_cfg = conf->event_dev_cfg; + /* Check dequeue timeout method is per dequeue or global */ + if (priv->event_dev_cfg & RTE_EVENT_DEV_CFG_PER_DEQUEUE_TIMEOUT) { + /* + * Use timeout value as given in dequeue operation. + * So invalidating this timeout value. + */ + priv->dequeue_timeout_ns = 0; + + } else if (conf->dequeue_timeout_ns == 0) { + priv->dequeue_timeout_ns = DPAA2_EVENT_PORT_DEQUEUE_TIMEOUT_NS; + } else { + priv->dequeue_timeout_ns = conf->dequeue_timeout_ns; + } + DPAA2_EVENTDEV_DEBUG("Configured eventdev devid=%d", dev->data->dev_id); return 0; @@ -516,7 +529,7 @@ static int dpaa2_eventdev_timeout_ticks(struct rte_eventdev *dev, uint64_t ns, uint64_t *timeout_ticks) { - uint32_t scale = 1; + uint32_t scale = 1000*1000; EVENTDEV_INIT_FUNC_TRACE(); diff --git a/drivers/event/dpaa2/dpaa2_eventdev.h b/drivers/event/dpaa2/dpaa2_eventdev.h index d2f98c6..8898024 100644 --- a/drivers/event/dpaa2/dpaa2_eventdev.h +++ b/drivers/event/dpaa2/dpaa2_eventdev.h @@ -21,6 +21,7 @@ #define DPAA2_EVENT_MAX_QUEUES 16 #define DPAA2_EVENT_MIN_DEQUEUE_TIMEOUT 1 #define DPAA2_EVENT_MAX_DEQUEUE_TIMEOUT (UINT32_MAX - 1) +#define DPAA2_EVENT_PORT_DEQUEUE_TIMEOUT_NS 100UL #define DPAA2_EVENT_MAX_QUEUE_FLOWS 2048 #define DPAA2_EVENT_MAX_QUEUE_PRIORITY_LEVELS 8 #define DPAA2_EVENT_MAX_EVENT_PRIORITY_LEVELS 0 From patchwork Thu Aug 30 06:03:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 43998 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 445D74D27; Thu, 30 Aug 2018 08:06:11 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0074.outbound.protection.outlook.com [104.47.2.74]) by dpdk.org (Postfix) with ESMTP id 17D255681 for ; Thu, 30 Aug 2018 08:06:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AN2Tcq9fKOjUryhMgwvTdq3Jd1mA6e06DQp29rc6mYo=; b=UNXM1ajIaQ2bdSXqpLPKxdVdphgwlR8GsY3B13L0puwjEcS/Mrct7tzX0i8b5IyDqJ7iFajiPHulneR6hBGeYvqSFqn4DWTa8La9wVGKu6zVowJlKc8IYt0Z5mVd2Sqx45cYZ0eJS0Sir+rVYmv5j90D8Z+Mz0i09JGsgiRN17c= Received: from bf-netperf1.ap.freescale.net (14.143.30.134) by DB6PR0401MB2533.eurprd04.prod.outlook.com (2603:10a6:4:36::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Thu, 30 Aug 2018 06:06:04 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: jerin.jacob@caviumnetworks.com, nipun.gupta@nxp.com Date: Thu, 30 Aug 2018 11:33:58 +0530 Message-Id: <1535609039-10869-4-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535609039-10869-1-git-send-email-hemant.agrawal@nxp.com> References: <1535609039-10869-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: BM1PR0101CA0004.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::14) To DB6PR0401MB2533.eurprd04.prod.outlook.com (2603:10a6:4:36::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3b2f447f-cb6c-4fc9-21f8-08d60e3eabee X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB6PR0401MB2533; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0401MB2533; 3:7xGbwwzwjeP7Ja/ytFm5fu6YcrmvRFMvnCcPkS6Ky2CtUdQaM08guDrPePJHdb+n6Js8asRM4xq9TVD2duhhYXDSaLhCaZqhTn2OTP6ta30bEed8HPcI7FoC8w18tYOcNsxwrmnun3k9VBYkiPcpvj6frTixDpR5DCMMmnGabmq4sBr1aBavb/A6pHGvw/FcE5V6OeexoawkLCRv9rIz0qNaJmtPjP2iAp0v13T58oJgs2jeiwvbZOXu1KGsTSLr; 25:nF+2TcWC3FC/TjhjpoRzie9g2ryVSyCXiyva8JNImb1b3qUfTefP0nxcA6uQ5p1feWa9UiC5tP/dFPEuZ3602c9YR22/29YiwpUbDxDf7vw0QWEVPMv0ywKa1qe+UgwJHfSe4zkdnv3Ut9tVTsvFv3f/Qg2Ye10aenWEEEHn/2+5Fh67LPJGJJ5O1QniZAqHh+qYj8yHx1tSZHBxVzQTPT6CZ/DPYpZO1c10XDYd7ycsW4TNDJaIJNqn1A6SLLvy1rw440G4QH/C0ROsXT0+bQZevGkmsfGgsG03Jy3sOzezKzBR0gHvr2ebmyKMLILzDv6Pkpx2Tj/jNdSsq3ooZA==; 31:+nb34Kd20sjqXwPr+dNOjUcph/ePipFdsJfQtFMk44KsZ8wUqZzf8XeURfXGOCFQCzAsfOStLmuX7iu3EqkbBYGM4QRN3mzBlF+Bh/B2Y+Vs1+pLQ/34z8IqJCx7VoAzle3T8F4BNHelyphIACaGRRxy/N/Yfi7ArjVbldVZVUF0mOt1WZtX56yYGcxFMDmpjatgByIDKiCHq8x8dChIipIFv2RN8N29ZPObH9jy4PQ= X-MS-TrafficTypeDiagnostic: DB6PR0401MB2533: X-Microsoft-Exchange-Diagnostics: 1; DB6PR0401MB2533; 20:CAJwu0+5XW0FdpJPAW0wAtdO1TKDU4dNkXZko6l2b4kUEjsW50L6K3Gv16lxUdP4FfTtTbzCR9PKZsWBScDVOq94MBixr5RygVbXyBrLpTKLENw9ZebzV/JGpblXqMe4kpn+WnBiGw/fLm2RGwlIX3dHrf8SvLsWqKIilqMJ6Shdm8BGaFDAXXdyfoRa2vUF0tdE41cE0ju99OmWyZT3J2cZDS+LUC2ZBquiYhxFpksIWyX023mI0gbcAQQVVZPMh84Y2LG1oXP7I5AoJ1twNJ0fDkllnBdjZhmdtFWcCI/QGcKl+R5R3Hxfr2BKb5h0GjyuUFG4Lcoy+qC8hnZIHJ5XSEMYMp1Q9fxOtqJM5P0RSOSL+fHOrqv2Vk4VfiRpwIpTWiuFlXm6YyaxGZjLhWc0z+CFhx1dJSbEolRPBYtjUHb1USf+lYwwCQFsGTb9k6Fp2IV3ayv6ehJcXM3ro1jBRHQjd7fsPl/hLjkj/dBryf8oobvJ53r1R4vuGwXS; 4:2NL8G0Mmlf3QtT1b9LjhOtGbgmrpxAD8PgfR0veuHvqxXTFIpbVMWmymtcT2F3/eMVbNmxLYBxkbNrrHmTKmeF6N3Bk1PbOE16B3opeoW3i7XEf61PjpbqVc0QGV41AjQn7OOjlCsy4ypJwycPBu0oM0FyPV4SOkpT1B3ujr42r/9qi1JZSfM4k6aflSu7xqJdCNT7Apw60Fxwyo4XxJ0ZOtxyBItRXg2W8bR2VaExAbaGEyGWIoq0Q3iJP+RocZX7eDjaM3Ai4kN183vY+pdjp/Ppcpr4ZJppUNaIVonKVS8HldTnofGQo+OZk/vy36 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(823301075)(10201501046)(3002001)(93006095)(93001095)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(201708071742011)(7699016); SRVR:DB6PR0401MB2533; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0401MB2533; X-Forefront-PRVS: 07807C55DC X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(136003)(366004)(39860400002)(346002)(376002)(189003)(199004)(16586007)(105586002)(106356001)(6512007)(386003)(26005)(6506007)(47776003)(478600001)(66066001)(48376002)(50466002)(97736004)(6346003)(186003)(16526019)(316002)(55236004)(53936002)(2361001)(6486002)(446003)(2616005)(4326008)(305945005)(25786009)(476003)(486006)(956004)(7736002)(11346002)(2351001)(68736007)(44832011)(81166006)(5660300001)(2906002)(81156014)(36756003)(50226002)(8936002)(86362001)(6666003)(6116002)(5009440100003)(52116002)(3846002)(6916009)(8676002)(76176011)(51416003)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR0401MB2533; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR0401MB2533; 23:cEGr59mNUvGl9leq/NyQcpVr7gkaI7NsDGKgsPl?= U4/y2Jn4fhwevb+RjC1OLYmRVC/cV71jlTiXBIncVYfQZd+wA/CLKKuSQSrY5cA5urd0EeqdW5ACaujZfNP/D4MYNGoyBILrigOpy4qZpSUY9KS9mix+5R1T1bPzA7uoAQo9mI7GhrA5XOIkyiEeSA8YmpwEKKP+EPdqQ0xUHcmN8DVnvcBS52EhCj2s4xUcAhaiDfxirfw9vyHFCMOqJVxnbDjLwWhJ2Qne0B7eXlZ3K2KW3wfKxDMGiRwq3ne5z4jXiSUe9iY/GeSEeyWcITPCRkBN2T5vmdCR0IFyHhoz8tn/vuDlIdLOZ2Of+Ik9c8vkcbeu42A+HsLYhc5tZ5R2WSsEVGdY2iaNPd/urz2ZqcmEF891ota8wqGPZL+D/XvEdbJXRV/oi0yVne0CwscROfuQsgxrXho8qxsDAwY19wikZq/ZK2BoNkdaxtwMDET7HECR5RTirLEPc33R3oXhD1Se4a4tc0MAuIVaGe+NpBpw+qajnxrUUj3BrauS1jwA+7Yn3QDVsp8bsPx/EBU0NMB8125sAKW3OXY73PKw+5G/TrzYnpd37ZRWy0FrW6vzbBe6h2eFozpwvYgWWrzTEfVyKxoi9vx+rBoqBIgA1yLj+es+PmomYmhlTJ5FKAhGDKNNnJwYHf1b9p2PR0GDIn6l30sLW1nACMyX0ZFfrrhbF90S32qOtAm6obIgP/D4hqscPT+lyyE0mr5uZAzFj0oeejfEETL6WBzrM9h+L2/dQCrzd2DNkkVA578vGdq6IG0xv+7S9owoUOmpJmLAMqR/ZfCzHxD7bT2m8BMjYjS5WN1RJ0BUAp0lraCu7cdSoywzkrR+G/ugdx/eJUk/Euzd1VWF6tvPSKETBE4rLB5TmNzO4gpkGu8NCKSEV8ODlNttMCVcm5+/RVxEW793fk3hHTHG506/dwW94X94fB0em+hmroRk9aEk+5w86p8OMulKWgUJr17qQdJbBOuNUhjY2nXxJO0s++sM8pWlSgZSuBqutR/qW27obVywj1zA/mvaeN3jwh8IfIrxgf7tsnv0WeBKl94JgLgCfpb03NevT9thsLBAt9mxglnUwQTJANMLraqlfug4Z6iMzZtDKZIeiR4JOf3oMY6oPcRWblAVWazxLjY+lfAp6NH1jb13KQGAy3iq02fh68GQV7NFZnHzOZy4R61qhCaiYemqvusUbkzRpKOFrLiv3Bz5j1VDLHHUF1yWwVck/FB+v4walHCCM8lkGwf3JdsuLPWYvG9GQ8PKHAeERI1XUOmoCKcU= X-Microsoft-Antispam-Message-Info: KmU4pNHoXtuauYQYwkrnME9dV4yIjUpIU8uvrp4vyFL+4T8oKSHwOHWwbZ9YoS2g/eW5uQxZyits2FdcabRsL7tUCpOJEUA/FegsWobNGCxRHwcNGba33sUd/XeiNgB6qyaJup9WlnRPkhhYvI9uzNpQ7z3+HSx7iJLSJONAPMAkJA20AA22Mz+Y9uAQYGMAmCkPTanZKqkiEYsTcwwAi88dW8YHlQ2/LbSP/ASlUPs4DJkX1amViD8DEKhB9yIUrV/dMWFOo9e5MMK+vxP+istfib+BkGEsIwp8+4OuLdb9NJpEgfDLYBVfGSit2s/eQKiSFsJhx1z+cipfi9TU1mfk87ih6zXN+ygrgCbFp/g= X-Microsoft-Exchange-Diagnostics: 1; DB6PR0401MB2533; 6:K41dj09QxHmGhjGRNB4YZ3zq0FL02SOUlnPj0eqxpKoMkpnMDAwfpMV1bn8mkeLuYWFd7xnLfBREgISzm2C/ETZBf5DvaNYyqqlXFSln75unc7svBkpj2ha4tfrs1SUMLMraszzI4wcgN3P8Q2qGn5NWtET/o0TquIpisGE/2wkwk0HxiYmG0HOm036XorE7iqVUrPJifyfjVFueroA4fFMxCgYeXLmmE8JOOuh68tcKHeZBxFbqnCC5W2OjdqG6qCcEr9MqRw71i4HlQz75EqXK7i4ygVo0izKLKPyu3OdSQX16o2FI/OrTzeThJiGAUMNCsR9AnoXdOh5EJwZLfWHfowJgf8ABTy6f0nsixjefRcy0iQwW8EfzMrLqhvVfnnwPJHoyB/86kgC26o1Bu0x1ogAJhZDScm2V47GdKMSDKhYN6gaVKZ87gmUQxQCsvu9/3kRHo/4Xls0Mwp2x3A==; 5:FzMPGPXpDVfax1GQETCGJrJJCz1k9m/JwNlSXxE+ytB3TRLXFp1T2tiOZEXu8S6tuo21bhd8iCKiXFAzobr4+pYC9lJVITw+4pPZbuuHpYSyKaAKfGghDfBPfHBpjB/13+3DztsJOnUr/YRkOXVI5FFNoEpewKa3BexEZgSntys=; 7:7x6ni0Vd4Hs6xQJRO7CwYtoac2sJ3+CSBvMe9M1BCEqQj9HJny47jNXBwlECejUmneAPoz6CfEOE7U5BBrN4xtcuV9THrmKvksWFKxJxea20VIagpQ+vrrbyj9L1H2YgODC/qtskzJ5q9AgfeQYn+hpQ8mJFJtaWEoYhBht+W/uiyvQt8UHabXOdzGIWO9y4rGfYwDoZH7Xsz0EiZhDXvyYcaf5RDU23VndDZG2RVoRZ7eC1EcevFZCa96adLCK5 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2018 06:06:04.6928 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3b2f447f-cb6c-4fc9-21f8-08d60e3eabee X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0401MB2533 Subject: [dpdk-dev] [PATCH 4/5] event/dpaa2: support Max event port value 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" This shall be number of available cores. Signed-off-by: Hemant Agrawal --- drivers/event/dpaa2/dpaa2_eventdev.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c index 4b56e2e..456b446 100644 --- a/drivers/event/dpaa2/dpaa2_eventdev.c +++ b/drivers/event/dpaa2/dpaa2_eventdev.c @@ -293,6 +293,9 @@ dpaa2_eventdev_info_get(struct rte_eventdev *dev, dev_info->max_event_priority_levels = DPAA2_EVENT_MAX_EVENT_PRIORITY_LEVELS; dev_info->max_event_ports = rte_fslmc_get_device_count(DPAA2_IO); + /* we only support dpio upto number of cores*/ + if (dev_info->max_event_ports > rte_lcore_count()) + dev_info->max_event_ports = rte_lcore_count(); dev_info->max_event_port_dequeue_depth = DPAA2_EVENT_MAX_PORT_DEQUEUE_DEPTH; dev_info->max_event_port_enqueue_depth = From patchwork Thu Aug 30 06:03:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 43999 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 516675B30; Thu, 30 Aug 2018 08:06:13 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0076.outbound.protection.outlook.com [104.47.2.76]) by dpdk.org (Postfix) with ESMTP id B7A4556A3 for ; Thu, 30 Aug 2018 08:06:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=z0Ryc0zbUMiPPpZfMQbOy6vVmXdfkN291Vhw/UzQgE4=; b=qHwmUCRbM00+BUMHAkkUVTsScQXVhwp/6qC8VMf5uJLnRawMEkUFtsBvfKIE+pzbgEWPSv7+H40uVBpnWAVKYNDS5HouVRpYoGKFHgCDuX/thOmkfVlYokejlh5S3qcCWUx+0gnlK4lorjrhDtcFxfEe2tL78+I1DIGEh0AuEcg= Received: from bf-netperf1.ap.freescale.net (14.143.30.134) by DB6PR0401MB2533.eurprd04.prod.outlook.com (2603:10a6:4:36::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Thu, 30 Aug 2018 06:06:05 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: jerin.jacob@caviumnetworks.com, nipun.gupta@nxp.com, Sunil Kumar Kori Date: Thu, 30 Aug 2018 11:33:59 +0530 Message-Id: <1535609039-10869-5-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535609039-10869-1-git-send-email-hemant.agrawal@nxp.com> References: <1535609039-10869-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: BM1PR0101CA0004.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::14) To DB6PR0401MB2533.eurprd04.prod.outlook.com (2603:10a6:4:36::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e81fca0c-e4c2-4b4e-327b-08d60e3eacca X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB6PR0401MB2533; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0401MB2533; 3:n1lnTeWJ4sb5UTSs33GLvK84naLMg40fWDZgQvqBJGHzuCAqf1RBs1aAoIB3uGydaI/siJTX3s2M8RbfmMouovSd1uYUfZHpFj+ggpso5ORp2tZzAZcNn1dS5p4I0r91TS15TLwGxx5UPuvrfOrZC66jYf0ZxCkqF6YTONagIeupxdzTvp4dQmdNYcG01ivSurXwHJHkgL2WdpH0N0Iv5z2hBr5r+BpexV+RNBv6OkQufhSGn/EnywIPwrpBsjgW; 25:9Tvm6TfwhoFTWRj+A5CAS4goUOo3gntnqb+RceNYZzXkOkrxamWalEX75c0YHvfTgp4q6IZtaxpmm/h3+HrgC0+aqh4Y2pabMDoC8vPBZPILopiZVQMR2tBYe4bd2dyww1JTlqCk8mJODOvfzMOfSHB7TRrqMrliysBKp90xx0pJRUDLwv/tnjUeFAW+XysFPestvCqi2CPkFWYHCf9k6p0ZKHNCbPxGQmDeF1Mph5DQbxfufquHMpfZrnr7iywVyhdsRj+1eDjLesfuRN2ppuODqfJcaLjna10eH2UdE7PofJGDxeHS/ImZfraM7COak4tMgeHi1VLUX9FhwODESg==; 31:UWI3Xlymkzb29Q66okLzzK2nEa8aiuzu2qXaxk4Eilk9jHer1cFZCeozYkjovRtNc/7L4fHBzF3bcGF4JigeizxzNw2Orxfq19Es0s+vnqms67HYlDJhEDAAGSi+245e2yckQZW/a5SnaWFMfll6mGJng0IwD9i9LWX4fSfM3411c/HbXZkRX6zoGUFQNeqdS9dVaceHigwhQhAgfL3OS7J0Kt6i85tEosJcoQvbvU4= X-MS-TrafficTypeDiagnostic: DB6PR0401MB2533: X-Microsoft-Exchange-Diagnostics: 1; DB6PR0401MB2533; 20:np3Elj97g8LFni1EG9x1M6++aRN3N5cDBsxCymQVusVXxd/yhShyuajIZCIRsXI3jcQKT0nqCXGb4QH4vwMwZ6udWAD5zo7VRQl8Ohr8q/DRym6xGrpw6fX+IQ5oEnRtiE05dRemamhvksGQWiuQJkNiGMpUHd16aiXAg5uvOItxiQgcPY7AuiXKOUjgA5njJnVHq6Wur0RYO7JwHaEJzPfGUQzLNQyiJAx48OEl4uJjQ6Ihqfp11td+cPCKiI2888DwI3NBXFRg7pHpunakpK1VoGIr2n5VPU6oqR6yWDmxLGKdNGQJCuiJFU3uKdq5QP/4Ir6szmz/ARgCD66B8hyaDb/GyDGDcq3FCXqPpgudkTGup1jTyNLLjP1pCYfEy73pumUQKoXXHsC4Y84A58jK4x5w5HxygHO1DFCO5GcfmXFvjvhGaaASdmmDu4jlLbje0W8rfIrEdNJuYuGrWGLYU78KAodbTsE06nAwowq+pTSAKh+xtOK3NiG0AfNH; 4:2lxK+3IrCPzQ8rP6nAmLqqqwOe3Ot0LoNC9ORcsRk2r13lTvWPlQcdDwzQpitdxihooRMyCFsZGOlvn5KwmLgdfqz92zgQJueTvs2iZUU4+4Yq4yLi7xw0CMk9waaiaIzYg4hmoLu31MqtryS/S0cVUK6gPRA8wiKteVAeZExgXM1DSOtDuuAmdLb7PbXTOKMQ8BTdz74ExJPsudBmWQb/xtnPqSFYOzMEhk3/XqKB3z+qWinkA8tEbsGuZM9teYsrB/ttGjQkr3E43INXt3vRxBN3Aj66hQoYZiTHHEr/BaXC2ZLWGx7d0LxJWPDExnF14d5KmNSgjAkOFx/9Lm6yBPi73o17ijKtWxMZcVFfw= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(823301075)(10201501046)(3002001)(93006095)(93001095)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(201708071742011)(7699016); SRVR:DB6PR0401MB2533; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0401MB2533; X-Forefront-PRVS: 07807C55DC X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(136003)(366004)(39860400002)(346002)(376002)(189003)(199004)(16586007)(105586002)(106356001)(6512007)(386003)(26005)(6506007)(47776003)(478600001)(66066001)(48376002)(50466002)(97736004)(6346003)(186003)(16526019)(316002)(55236004)(53936002)(2361001)(6486002)(446003)(2616005)(4326008)(305945005)(25786009)(476003)(486006)(956004)(7736002)(11346002)(5024004)(2351001)(68736007)(44832011)(14444005)(81166006)(5660300001)(2906002)(81156014)(36756003)(50226002)(8936002)(575784001)(86362001)(6666003)(6116002)(5009440100003)(52116002)(3846002)(6916009)(8676002)(76176011)(51416003)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR0401MB2533; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR0401MB2533; 23:4yEe9txERWUqDF9Ts2ytuQt+yGPSz3yGeSx87iO?= uF0ONrDo3E9RWyOxRjvS+VyNgwxS/mCElOY2WIU+bF9UsXz1TiOvCiY/PnCOhDwC41UjcWdpIdokzOM8dn4TdMfKjD0U/42iNLrvSvDIOOjVLSnKHj8LWmhR41vN2eqCj578ION1YaeOysxN5FnHkepx6ew7qdCyJt9LrV8CBU6p9/y6Z4iescTg4mp162MYA3RwR6khUgmnSNodVfGyZsHYpTSEl9njbL3bNaAjqw1Q2ciNVo2SryNSQcldJ55jqLZnvaMvYpXseAWeUrS1p1wl0k7G34zHjrzVwGeowGgO+STh7AsR7n48Vbk2D7NVYa32k6kzDIbjFXQW1c97TZLUxjlboSRDiEs0HrLoLDmbatoe9C+e8QFL9w2qXUeR+f7+mseelX7gTUQ2EkZhTgPwQT930cq0E3QMdiYJYsmhR23yOhUp2XcCL3mtXfIHw5qtNzr/d355Bl/h0f8FPb0oQynfvjOcmcqowEqNrzywnrtYYu7S6/0Ycol2GvflzL3Or1RukzqsJUM22MJmiIG+1Rcn2BF7G/rPx2gZCIAGf43A5Cr6m6eECPfDCurCMGxwHMmymStXZFBSuZ1AUHx/pUNQ7DSXVdT83ipR3Met4luxrNsSa5am9VRbeVqWlGQHuq7uOtOlRkXs8v4Ri/vh2EsUJwaAxVK/oiJvBicU9Uc31tERoYQRXtuIhUX8KJdJkpiiOO7ayBP86uMqsPQnHXv8DE7hgS1y2mj+9xNz+0kOVtxXMiyisUuflHlepaNWGBoU/zoznQgeSjSh/Jm4PqeYGBeTrQQvm4XRwZqTHr0pAkZoaXuEFmmbVUzOW3y9QC+Pokhzb5AfJjmt/NMGdqlJsUrlbkLxjQvjE4j0oYbsqmKMFRIGayVOUro4nm+GVUjJC/KoFUOex16DWPYOlfm/VhQ+gZYtYOtpbsF0vZ10RwyirmMc0Y8Y+NJ50A4hzdHvYpOvwuM0e/tLIzfyTg5f1zN/zbokxAMlWIcg9jBFipo4JSYNh2YqNGcGrrZ7RMSLMiwDnKZ2ZOC/39blOOev0Zsx/bJfIUUj5MMfgk28JeRAYNSTq2nJOs1C88/cOOUmSptIfZlT5gobp7vfAegilYeqUbHVmlNY2aqfRi4vYcLEPxgL63l5ojVepLvU3tGpdtXac2/xVAQ9vZf0xx1XNuz1sN4nGEm/7h8V5m6T0arMck93t3aRch6hrwt2vuUc084FSbQ04NAGDlnYKKUKcs5ycy5uDZN/3nRVScs+z4Yt1i7GXPSjn/QMaheFQWp7ZU2ZKZ1xyVn7J7m8QNqpBUCDnBNYJH9zWQY213wipjTBQ+ZpL+O1WnpwtvTc= X-Microsoft-Antispam-Message-Info: 8XyqDQxkYGZ/vZ/3/4lzv9RuXGiyl7T0gUmmRAGByRkkXqPUV1EwyD9gm2tViLII1c1BrjMAWyvTmq0NnJhelMlDpXcJTpzfKoiiIHcNWifHsY2lACjfh8pW5WRSynC6heriCwB8nAh9kzCWygWkXtDzb9mSXT28rhlpuFoYjr79JWRP+O8SM+OQsIEYqZrc+X22JlfhHZozmHWXYUoC3IRIed+CxfHaBfwxccPcENWSpaHQbJowf1YOZZ11fi6y63xSuJSG2g2y8LtmfeeldvX7Sp+rNaGurqnqNG+E2XOb7j/uXY6IhjTBLuVrevAmmz338oyEw4Cla7PowBVZh70CUXOf7x9HG4aIrlGz0tI= X-Microsoft-Exchange-Diagnostics: 1; DB6PR0401MB2533; 6:d46rfvgrdo2HqBoyN7GU1Art6Aq5+ySRgsBvkGPW5hqB2vYJzj8c9AGJliLQiUMMTxMHTNVGI57M8aH/EAI3QLKWx/xIY1J7YuqnAy5bgqxGZzfZUDhNcz6iFAY1o+V7d2xp1qIZZhRmCX9wexacdpMXM3cjwDmZXAN1Djenq1RPh1Q5ibQfSkdKVbB/dZEBog8KNLwuRITB6C75uSPdqTbdRDQ9MdvNJSW+ex3TOAeTy0+2V64P3UK2THpdmNnE6h1sLsuhQOr258SjOtjvfR1IYBhDhkkq/EtDst9I42wllrgIOT38GTuIKNOunccpFkxeCq8ag5FwO5VH5FKRQLnYUyh7Dr2SMHZMl5FaGaMjPON8BZWVFzF3JCkkuHvmYMfYttg8OPsoT877K5v+pce90mSWQVATHJB89JoKkajP/Xo2fbn4b5M95qOT8NryF/fLL8xDxesHclcF1WZDIg==; 5:wMo7O4a5E9KQ8HVW3XPfHQAcg7faxezHy7s5O1tMiETr/L5mElQH1vvFp4n9U/Oi1FK6uUt2ZJ8ePguYcNFJaCiX8DLjn8eVYG+YSJJHdFyovs+PnG1f70aPmm99peWsYpvRycNx30XADnrrz9Yg70R5m0ed0KhDB3Fw16hrozM=; 7:zFFYjGS4hpehSoiw8wEY7UupQVl/rrpKmR7Br0MPp/f99VWQC28bYCo5U5w9e/sMVqvMQwDAE/GLHdpbjPicaDQdBsqZUxGftfOcT7Q7R2/N8Q9SNTF6EWE1EGjYctsrDGCZcNXVIsG3J/3pMThFLAzGsFsjR9hyMTjIp0gm7SxF7eqWEtXE4zlDabS2WD4e3nBFZY/DdJlz2iDbgV43l0oaB+wu2FXRfwP2GmSuz/t48N94sIKn/mrZBIBmR+uW SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2018 06:06:05.9569 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e81fca0c-e4c2-4b4e-327b-08d60e3eacca X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0401MB2533 Subject: [dpdk-dev] [PATCH 5/5] event/dpaa2: affining portal at runtime during I/O 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" This patch restructure the code to have the QBMAN portal affliated at run time. The device cleanup is also improved. Signed-off-by: Sunil Kumar Kori Signed-off-by: Hemant Agrawal --- drivers/event/dpaa2/dpaa2_eventdev.c | 277 ++++++++++++++++++++++++----------- drivers/event/dpaa2/dpaa2_eventdev.h | 9 ++ 2 files changed, 198 insertions(+), 88 deletions(-) diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c index 456b446..b4e0885 100644 --- a/drivers/event/dpaa2/dpaa2_eventdev.c +++ b/drivers/event/dpaa2/dpaa2_eventdev.c @@ -54,31 +54,60 @@ static uint16_t dpaa2_eventdev_enqueue_burst(void *port, const struct rte_event ev[], uint16_t nb_events) { - struct rte_eventdev *ev_dev = - ((struct dpaa2_io_portal_t *)port)->eventdev; - struct dpaa2_eventdev *priv = ev_dev->data->dev_private; + + struct dpaa2_port *dpaa2_portal = port; + struct dpaa2_dpio_dev *dpio_dev; uint32_t queue_id = ev[0].queue_id; - struct dpaa2_eventq *evq_info = &priv->evq_info[queue_id]; + struct dpaa2_eventq *evq_info; uint32_t fqid; struct qbman_swp *swp; struct qbman_fd fd_arr[MAX_TX_RING_SLOTS]; uint32_t loop, frames_to_send; struct qbman_eq_desc eqdesc[MAX_TX_RING_SLOTS]; uint16_t num_tx = 0; - int ret; - - RTE_SET_USED(port); + int i, ret; + uint8_t channel_index; if (unlikely(!DPAA2_PER_LCORE_DPIO)) { + /* Affine current thread context to a qman portal */ ret = dpaa2_affine_qbman_swp(); - if (ret) { + if (ret < 0) { DPAA2_EVENTDEV_ERR("Failure in affining portal"); return 0; } } - + /* todo - dpaa2_portal shall have dpio_dev - no per thread variable */ + dpio_dev = DPAA2_PER_LCORE_DPIO; swp = DPAA2_PER_LCORE_PORTAL; + if (likely(dpaa2_portal->is_port_linked)) + goto skip_linking; + + /* Create mapping between portal and channel to receive packets */ + for (i = 0; i < DPAA2_EVENT_MAX_QUEUES; i++) { + evq_info = &dpaa2_portal->evq_info[i]; + if (!evq_info->event_port) + continue; + + ret = dpio_add_static_dequeue_channel(dpio_dev->dpio, + CMD_PRI_LOW, + dpio_dev->token, + evq_info->dpcon->dpcon_id, + &channel_index); + if (ret < 0) { + DPAA2_EVENTDEV_ERR( + "Static dequeue config failed: err(%d)", ret); + goto err; + } + + qbman_swp_push_set(swp, channel_index, 1); + evq_info->dpcon->channel_index = channel_index; + } + dpaa2_portal->is_port_linked = true; + +skip_linking: + evq_info = &dpaa2_portal->evq_info[queue_id]; + while (nb_events) { frames_to_send = (nb_events >> 3) ? MAX_TX_RING_SLOTS : nb_events; @@ -99,14 +128,14 @@ dpaa2_eventdev_enqueue_burst(void *port, const struct rte_event ev[], qbman_eq_desc_set_no_orp(&eqdesc[loop], 0); qbman_eq_desc_set_response(&eqdesc[loop], 0, 0); - if (event->mbuf->seqn) { + if (event->sched_type == RTE_SCHED_TYPE_ATOMIC + && event->mbuf->seqn) { uint8_t dqrr_index = event->mbuf->seqn - 1; qbman_eq_desc_set_dca(&eqdesc[loop], 1, dqrr_index, 0); DPAA2_PER_LCORE_DQRR_SIZE--; - DPAA2_PER_LCORE_DQRR_HELD &= - ~(1 << dqrr_index); + DPAA2_PER_LCORE_DQRR_HELD &= ~(1 << dqrr_index); } memset(&fd_arr[loop], 0, sizeof(struct qbman_fd)); @@ -116,7 +145,7 @@ dpaa2_eventdev_enqueue_burst(void *port, const struct rte_event ev[], * to avoid copy */ struct rte_event *ev_temp = rte_malloc(NULL, - sizeof(struct rte_event), 0); + sizeof(struct rte_event), 0); if (!ev_temp) { if (!loop) @@ -143,6 +172,18 @@ dpaa2_eventdev_enqueue_burst(void *port, const struct rte_event ev[], } return num_tx; +err: + for (int n = 0; n < i; n++) { + evq_info = &dpaa2_portal->evq_info[n]; + if (!evq_info->event_port) + continue; + qbman_swp_push_set(swp, evq_info->dpcon->channel_index, 0); + dpio_remove_static_dequeue_channel(dpio_dev->dpio, 0, + dpio_dev->token, + evq_info->dpcon->dpcon_id); + } + return 0; + } static uint16_t @@ -205,22 +246,53 @@ dpaa2_eventdev_dequeue_burst(void *port, struct rte_event ev[], uint16_t nb_events, uint64_t timeout_ticks) { const struct qbman_result *dq; + struct dpaa2_dpio_dev *dpio_dev = NULL; + struct dpaa2_port *dpaa2_portal = port; + struct dpaa2_eventq *evq_info; struct qbman_swp *swp; const struct qbman_fd *fd; struct dpaa2_queue *rxq; - int num_pkts = 0, ret, i = 0; - - RTE_SET_USED(port); + int num_pkts = 0, ret, i = 0, n; + uint8_t channel_index; if (unlikely(!DPAA2_PER_LCORE_DPIO)) { + /* Affine current thread context to a qman portal */ ret = dpaa2_affine_qbman_swp(); - if (ret) { + if (ret < 0) { DPAA2_EVENTDEV_ERR("Failure in affining portal"); return 0; } } + + dpio_dev = DPAA2_PER_LCORE_DPIO; swp = DPAA2_PER_LCORE_PORTAL; + if (likely(dpaa2_portal->is_port_linked)) + goto skip_linking; + + /* Create mapping between portal and channel to receive packets */ + for (i = 0; i < DPAA2_EVENT_MAX_QUEUES; i++) { + evq_info = &dpaa2_portal->evq_info[i]; + if (!evq_info->event_port) + continue; + + ret = dpio_add_static_dequeue_channel(dpio_dev->dpio, + CMD_PRI_LOW, + dpio_dev->token, + evq_info->dpcon->dpcon_id, + &channel_index); + if (ret < 0) { + DPAA2_EVENTDEV_ERR( + "Static dequeue config failed: err(%d)", ret); + goto err; + } + + qbman_swp_push_set(swp, channel_index, 1); + evq_info->dpcon->channel_index = channel_index; + } + dpaa2_portal->is_port_linked = true; + +skip_linking: /* Check if there are atomic contexts to be released */ while (DPAA2_PER_LCORE_DQRR_SIZE) { if (DPAA2_PER_LCORE_DQRR_HELD & (1 << i)) { @@ -259,6 +331,18 @@ dpaa2_eventdev_dequeue_burst(void *port, struct rte_event ev[], } while (num_pkts < nb_events); return num_pkts; +err: + for (n = 0; n < i; n++) { + evq_info = &dpaa2_portal->evq_info[n]; + if (!evq_info->event_port) + continue; + + qbman_swp_push_set(swp, evq_info->dpcon->channel_index, 0); + dpio_remove_static_dequeue_channel(dpio_dev->dpio, 0, + dpio_dev->token, + evq_info->dpcon->dpcon_id); + } + return 0; } static uint16_t @@ -387,31 +471,39 @@ dpaa2_eventdev_queue_def_conf(struct rte_eventdev *dev, uint8_t queue_id, queue_conf->priority = RTE_EVENT_DEV_PRIORITY_NORMAL; } -static void -dpaa2_eventdev_queue_release(struct rte_eventdev *dev, uint8_t queue_id) -{ - EVENTDEV_INIT_FUNC_TRACE(); - - RTE_SET_USED(dev); - RTE_SET_USED(queue_id); -} - static int dpaa2_eventdev_queue_setup(struct rte_eventdev *dev, uint8_t queue_id, const struct rte_event_queue_conf *queue_conf) { struct dpaa2_eventdev *priv = dev->data->dev_private; - struct dpaa2_eventq *evq_info = - &priv->evq_info[queue_id]; + struct dpaa2_eventq *evq_info = &priv->evq_info[queue_id]; EVENTDEV_INIT_FUNC_TRACE(); + switch (queue_conf->schedule_type) { + case RTE_SCHED_TYPE_PARALLEL: + case RTE_SCHED_TYPE_ATOMIC: + break; + case RTE_SCHED_TYPE_ORDERED: + DPAA2_EVENTDEV_ERR("Schedule type is not supported."); + return -1; + } evq_info->event_queue_cfg = queue_conf->event_queue_cfg; + evq_info->event_queue_id = queue_id; return 0; } static void +dpaa2_eventdev_queue_release(struct rte_eventdev *dev, uint8_t queue_id) +{ + EVENTDEV_INIT_FUNC_TRACE(); + + RTE_SET_USED(dev); + RTE_SET_USED(queue_id); +} + +static void dpaa2_eventdev_port_def_conf(struct rte_eventdev *dev, uint8_t port_id, struct rte_event_port_conf *port_conf) { @@ -419,7 +511,6 @@ dpaa2_eventdev_port_def_conf(struct rte_eventdev *dev, uint8_t port_id, RTE_SET_USED(dev); RTE_SET_USED(port_id); - RTE_SET_USED(port_conf); port_conf->new_event_threshold = DPAA2_EVENT_MAX_NUM_EVENTS; @@ -430,56 +521,44 @@ dpaa2_eventdev_port_def_conf(struct rte_eventdev *dev, uint8_t port_id, port_conf->disable_implicit_release = 0; } -static void -dpaa2_eventdev_port_release(void *port) -{ - EVENTDEV_INIT_FUNC_TRACE(); - - RTE_SET_USED(port); -} - static int dpaa2_eventdev_port_setup(struct rte_eventdev *dev, uint8_t port_id, const struct rte_event_port_conf *port_conf) { + char event_port_name[32]; + struct dpaa2_port *portal; + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(port_conf); - if (!dpaa2_io_portal[port_id].dpio_dev) { - dpaa2_io_portal[port_id].dpio_dev = - dpaa2_get_qbman_swp(port_id); - rte_atomic16_inc(&dpaa2_io_portal[port_id].dpio_dev->ref_count); - if (!dpaa2_io_portal[port_id].dpio_dev) - return -1; + sprintf(event_port_name, "event-port-%d", port_id); + portal = rte_malloc(event_port_name, sizeof(struct dpaa2_port), 0); + if (!portal) { + DPAA2_EVENTDEV_ERR("Memory allocation failure"); + return -ENOMEM; } - dpaa2_io_portal[port_id].eventdev = dev; - dev->data->ports[port_id] = &dpaa2_io_portal[port_id]; + memset(portal, 0, sizeof(struct dpaa2_port)); + dev->data->ports[port_id] = portal; return 0; } -static int -dpaa2_eventdev_port_unlink(struct rte_eventdev *dev, void *port, - uint8_t queues[], uint16_t nb_unlinks) +static void +dpaa2_eventdev_port_release(void *port) { - struct dpaa2_eventdev *priv = dev->data->dev_private; - struct dpaa2_io_portal_t *dpaa2_portal = port; - struct dpaa2_eventq *evq_info; - int i; + struct dpaa2_port *portal = port; EVENTDEV_INIT_FUNC_TRACE(); - for (i = 0; i < nb_unlinks; i++) { - evq_info = &priv->evq_info[queues[i]]; - qbman_swp_push_set(dpaa2_portal->dpio_dev->sw_portal, - evq_info->dpcon->channel_index, 0); - dpio_remove_static_dequeue_channel(dpaa2_portal->dpio_dev->dpio, - 0, dpaa2_portal->dpio_dev->token, - evq_info->dpcon->dpcon_id); - } + /* TODO: Cleanup is required when ports are in linked state. */ + if (portal->is_port_linked) + DPAA2_EVENTDEV_WARN("Event port must be unlinked before release"); - return (int)nb_unlinks; + if (portal) + rte_free(portal); + + portal = NULL; } static int @@ -488,46 +567,66 @@ dpaa2_eventdev_port_link(struct rte_eventdev *dev, void *port, uint16_t nb_links) { struct dpaa2_eventdev *priv = dev->data->dev_private; - struct dpaa2_io_portal_t *dpaa2_portal = port; + struct dpaa2_port *dpaa2_portal = port; struct dpaa2_eventq *evq_info; - uint8_t channel_index; - int ret, i, n; + uint16_t i; EVENTDEV_INIT_FUNC_TRACE(); + RTE_SET_USED(priorities); + for (i = 0; i < nb_links; i++) { evq_info = &priv->evq_info[queues[i]]; + memcpy(&dpaa2_portal->evq_info[queues[i]], evq_info, + sizeof(struct dpaa2_eventq)); + dpaa2_portal->evq_info[queues[i]].event_port = port; + dpaa2_portal->num_linked_evq++; + } - ret = dpio_add_static_dequeue_channel( - dpaa2_portal->dpio_dev->dpio, - CMD_PRI_LOW, dpaa2_portal->dpio_dev->token, - evq_info->dpcon->dpcon_id, &channel_index); - if (ret < 0) { - DPAA2_EVENTDEV_ERR( - "Static dequeue config failed: err(%d)", ret); - goto err; - } + return (int)nb_links; +} - qbman_swp_push_set(dpaa2_portal->dpio_dev->sw_portal, - channel_index, 1); - evq_info->dpcon->channel_index = channel_index; - } +static int +dpaa2_eventdev_port_unlink(struct rte_eventdev *dev, void *port, + uint8_t queues[], uint16_t nb_unlinks) +{ + struct dpaa2_port *dpaa2_portal = port; + int i; + struct dpaa2_dpio_dev *dpio_dev = NULL; + struct dpaa2_eventq *evq_info; + struct qbman_swp *swp; - RTE_SET_USED(priorities); + EVENTDEV_INIT_FUNC_TRACE(); - return (int)nb_links; -err: - for (n = 0; n < i; n++) { - evq_info = &priv->evq_info[queues[n]]; - qbman_swp_push_set(dpaa2_portal->dpio_dev->sw_portal, - evq_info->dpcon->channel_index, 0); - dpio_remove_static_dequeue_channel(dpaa2_portal->dpio_dev->dpio, - 0, dpaa2_portal->dpio_dev->token, - evq_info->dpcon->dpcon_id); + RTE_SET_USED(dev); + RTE_SET_USED(queues); + + for (i = 0; i < nb_unlinks; i++) { + evq_info = &dpaa2_portal->evq_info[queues[i]]; + + if (DPAA2_PER_LCORE_DPIO && evq_info->dpcon) { + /* todo dpaa2_portal shall have dpio_dev-no per lcore*/ + dpio_dev = DPAA2_PER_LCORE_DPIO; + swp = DPAA2_PER_LCORE_PORTAL; + + qbman_swp_push_set(swp, + evq_info->dpcon->channel_index, 0); + dpio_remove_static_dequeue_channel(dpio_dev->dpio, 0, + dpio_dev->token, + evq_info->dpcon->dpcon_id); + } + memset(evq_info, 0, sizeof(struct dpaa2_eventq)); + if (dpaa2_portal->num_linked_evq) + dpaa2_portal->num_linked_evq--; } - return ret; + + if (!dpaa2_portal->num_linked_evq) + dpaa2_portal->is_port_linked = false; + + return (int)nb_unlinks; } + static int dpaa2_eventdev_timeout_ticks(struct rte_eventdev *dev, uint64_t ns, uint64_t *timeout_ticks) @@ -806,6 +905,8 @@ dpaa2_eventdev_create(const char *name) priv->max_event_queues++; } while (dpcon_dev && dpci_dev); + RTE_LOG(INFO, PMD, "%s eventdev created\n", name); + return 0; fail: return -EFAULT; diff --git a/drivers/event/dpaa2/dpaa2_eventdev.h b/drivers/event/dpaa2/dpaa2_eventdev.h index 8898024..720e0c6 100644 --- a/drivers/event/dpaa2/dpaa2_eventdev.h +++ b/drivers/event/dpaa2/dpaa2_eventdev.h @@ -62,11 +62,20 @@ struct dpaa2_eventq { struct dpaa2_dpcon_dev *dpcon; /* Attached DPCI device */ struct dpaa2_dpci_dev *dpci; + /* Mapped event port */ + struct dpaa2_io_portal_t *event_port; /* Configuration provided by the user */ uint32_t event_queue_cfg; uint32_t event_queue_id; }; +struct dpaa2_port { + struct dpaa2_eventq evq_info[DPAA2_EVENT_MAX_QUEUES]; + uint8_t num_linked_evq; + uint8_t is_port_linked; + uint64_t timeout_us; +}; + struct dpaa2_eventdev { struct dpaa2_eventq evq_info[DPAA2_EVENT_MAX_QUEUES]; uint32_t dequeue_timeout_ns;