From patchwork Thu Jun 21 09:43: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: 41349 X-Patchwork-Delegate: thomas@monjalon.net 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 59AE01BB9D; Thu, 21 Jun 2018 11:45:44 +0200 (CEST) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20055.outbound.protection.outlook.com [40.107.2.55]) by dpdk.org (Postfix) with ESMTP id 985011BB92; Thu, 21 Jun 2018 11:45:43 +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=oDLQcWHeu9ZqOfzO0AEGeOi4gUOKHLaEPg9SYPpbTVs=; b=gl16Xiid5TXp9Aw5PBO+FSXXegcBm32Kct8yR8LYg59abi4loVXiufF+H/HVchlAPRkt/xoOZo7W6DidF3mCxmt03TdI9u4KIcF2pNdFDUfPRPiDZOdueeIa+gMX9Sa4DUFOIS2NYT5uinpWZ0G8k2tpNFPLgfBuSGjpbsRf/DE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; Received: from bf-netperf1.ap.freescale.net (14.142.187.166) by AM2PR04MB0755.eurprd04.prod.outlook.com (2a01:111:e400:8411::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.16; Thu, 21 Jun 2018 09:45:40 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: ferruh.yigit@intel.com, Alok Makhariya , Shreyansh Jain , stable@dpdk.org Date: Thu, 21 Jun 2018 15:13:55 +0530 Message-Id: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0035.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:1a::21) To AM2PR04MB0755.eurprd04.prod.outlook.com (2a01:111:e400:8411::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 89323fc5-e25c-4f6b-85a0-08d5d75bc094 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(5600026)(711020)(48565401081)(2017052603328)(7153060)(7193020); SRVR:AM2PR04MB0755; X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 3:m6oxCfQVyLjnvX2Go9iXYxs34ETLTGRPC8tDY8xRwQ4C4eaJLtCvNG7n25cpYBFsJ1t/fUsWnr08A4mBFNDzpAI84NkZvL38VT11w5geGCfP7cucxwPVnZRJvArLUbEJs6/b0ot5yTJzqBk1Y6RRT64FYb1tImz275RcCoa2K1+gKc8BRXCklY5+9m6rLflhwJ7CG4nZTkjZV0bUqtBvxUBlI4Ah2ibdT7c809k0AXrQ9uDmw2Z5UCSC4Fex++0M; 25:osCx5AhYHtjbZblpEyr+0Ewqmcn/cAzb8T+QXBCssD63M+LyBRVi2hdSX/bWi55dYyQXg2fMnq5CRrLfLwiBrIixqXZXCgwJLVEq/LsjPiark0FGsqR0cEjl8xeN2pkDi9lUuvo1zxWO5Kv2Rm7KjEha86qgE/qXK7tNN7R2HGN8SmweVzdLcZQvQ8wCv1ILsyaAW2400qwB44DryEqSuWfvm9E4grKaG78kupFl4cayEjFjrl+LLTiUgW/PwfiMR5CoiFujq4RjKDYPX15zGYkUrE3gwKQ6KlKblsBV8a2aDGMDQAjV33CFbXYOIq1MORdM/HZhQ0TdA9kkayKw/g==; 31:QrYaHqebRRIBoXGLAIVky4SbotTxxHFIPbCxuLVcFsJRXHGcDSwlnr6kPEKDjkK4KC8xm9t71ofY9AL0AWIiG6hqRuk+wX9phWoK+NmVp55Nensy46fMKWvacPULN7dDBkDtBn19n3KNx37jeik9cjr23/wutyEQ68umk6HzLK2ME8LzS4erhbDJPO2n8yhm5C4EWD3anYAoGjThsO/Fwszlv8qu4uwDZl1qU0Wrn2Q= X-MS-TrafficTypeDiagnostic: AM2PR04MB0755: X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 20:3zWUJJEluJQTgbxHaR9yTNlDECiAfj5Ya6E3cZlxC6XiJm1tqzFkJMZwK3AMj2AgW7MfGHu1tHd1n19wyFopIAVLmGhtJTAjSL3Au6JvGZoAtK5gqzHSBERjZe9s9C5MEIM9a5EKtd3TLuL8kXy+7cQ+OLcpzDBzIP7mNhlIfEDUkLMhb2hBiArbaVE7hihHbFBNMF4syhd9k+evuL4V4gdEWPOj0XK4x1q+gXNAA9jYQ5am/0DTYoZupL6YSPo41V/mQbN69XMtkSrIjFjmjc18RwdmMjSdmIO69+Yr2c2Cphj/VjXO34ecRvoLMKeBB3DI3zWDJQU96noDGGXrCPghmuAN/o1diLzsPlnQatM8ZYpClq+swz8xYELoUH9xbpJZocsY2bXvIUnc9Dj7R8wH7i74MQu0llbS5Vg34J24yWX78QSLJckmUMj6f/jqccjACtwgvhV1Za5ViE5VI+0aBohIQojBa8LXnocNJTys7UsttFxm3i239tLqG4kx; 4:Ge2NNC1jqHk0yV6xlzbnxmhJnPVrUQAugYsqpBB3/Wd0pWDSZVZfZjn7Uf+/2xVo5Ld/eyB8eLvQrM31iFjIbT4nfYhR93tjfutx5+K5Xgl7EnVL5tnEMbmwPujO6udcwP22UrAdDnD9R+YaYWSAD+yeDSA5A4mImtTobCv6ylHB6TEkGWCWD0c7XIB42n1VzOM3DI+zvu8q2R7/KBeHw5YK91bFnisEhS0HRmjiejgYYylDHGkWl5Aypv0uKqoEuJcKn2h5dl2EmX8DZVA3WXz8sbSh8E56eKGcJ6IrRFoSKdpxaoU9hJhzoS7scDnr 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)(3231254)(944501410)(52105095)(10201501046)(93006095)(93001095)(3002001)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011)(7699016); SRVR:AM2PR04MB0755; BCL:0; PCL:0; RULEID:; SRVR:AM2PR04MB0755; X-Forefront-PRVS: 07106EF9B9 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(366004)(39860400002)(346002)(39380400002)(199004)(189003)(50466002)(6116002)(6506007)(55236004)(2906002)(6512007)(478600001)(51416003)(48376002)(52116002)(3846002)(2361001)(186003)(26005)(16526019)(956004)(97736004)(2351001)(5009440100003)(386003)(4326008)(8936002)(8676002)(476003)(486006)(7736002)(81156014)(81166006)(305945005)(16586007)(6916009)(6486002)(105586002)(106356001)(2616005)(47776003)(53936002)(36756003)(50226002)(44832011)(86362001)(68736007)(54906003)(25786009)(5660300001)(316002)(6666003)(66066001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM2PR04MB0755; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM2PR04MB0755; 23:AkHVEwRV5WXbxb6F59tQ2Qxo8rM5PTHhW6TryEGKB?= avwl5T0+ECD/GUp57ikrFYFarPPlnT4Xxna+Qb/kLSASFudG4kKa/C0JuE0sfORK4IvATskxDcAIQrvc07N6/7+GF6pzKVzZuM4Q+dO0upghHmS5g42odu0cFegbrb3XK3eUh7oMLQ6NaEf0lSYnuKubi+a42oYcK7OnN9IjpP26by6SwevZ4Yw2u+qTcxN0cssSpIfIue+TvDnM/J9OfRzZ7dkmerPVMhAJWY3txtEIM2qfHXEiCUB4KfXo6L2vR9ircUge6g/l9NGRwH0lGPhlCAhuoVmQCtybNKY3yEmP8n4uZq57sT1EaPPlVdDErwkFUB7SyJthV6eUe7qBwBhTpTuvdPk1bYPh+VooJSfBChn8BmHOT+ENQiIyX23k+eCUxJppYSv2MZKCT78NLjIT2ILkbblxJqcph8oWdwHjVS63Ib6QMwjYGKRtGK0TgXhRe7/8n1+4dQySFeU1NFtnf2r5jnXPqpDct1O2svSQFZWH0t9G9DUFN9yR5hjrMX428RCOVdK6mcI3XfoCgdkYLOS+4v5a7p34GtWYBb1YseFpcg9IeCB0CXdSjS9lrvjtxO7BBnjUwcVNQM0+0rRI9cUq0EUgb6fIaCZt12ZpC+gz6WQHHYgmOjEjq3Ar+NUx+7bsmXjkl7SkM5Jyzx9LuXGfBE9Ciw4tlpd160FYmGtedPq0hRCsOqGiCQ3EZ5n3WpSZMfY1ExTgkQk1S1FVZx0B0cobkrzjVsxtd7xUPzSWnJuYS3+g2xduGh809JwMJLk8g1c3ij1bD7nKkpFPV1C4xgL3+ooOh/O9CvuXfiMS9W/ByizA0yed4zkD2Jv2aRqeW8vDM+rT0RyAnghbN7RjQ4Uea4Nvt4pK2QKLioTNZWz6XN1IARsPPACrtWGGRoVUZzQWvEPf6EqBpfygtgsospPDqBknPkjQnBUpi1L5OuvyuO6S0yiOajo29OhwBVprjlr+jMVR5EBspm707DW7p4pcCerAbywqqPeY0DvLbGvVJfpys+tWDYG7OT/A0MKHmP5i7V14i8YHx8rHCNcjS+RrrBYBWaSm2KRqI6HUGaxnxjJcG6ayxNmvTFupvOZTN9o/nPOgzcehdbZ1RXcIJkiGM6StjALdZe49jC8qAFNdYjeMXnSbyBA+xNzByS9c2AojiQCVCCNwPy0aOA7DG7ubDoF1nARf0ffRgAeOUOXKZ4w/wUgvCrZjZzkzQSgo2Ve2iqj3sT/OrL8 X-Microsoft-Antispam-Message-Info: H7Q65HzyxC8nwA1bfaxO5jv9z5rpG/llDX8lzOHYaAtY/C3Uf8qLBAWGUcz9NCnNWVXLnKP1q2/2LDzz2tzMqk/KZoU9StjrYsbGBGOcf/8jfI7TcDO90wvnvbxhWYgYGgUImQHzx4aKsDvU5mlIaeZYUR87360+5o0CzTGKvfX/7gjtlwCKzfHoMw/qWTBcBH+YEZmBFxgw2yKzVty5WTVVfySGFxpfTUhXiFMk8OKkZJrTcOfY79zjME0sW46fJwuOAY+uo3qk7kDwCsTWOfho1KQciSzHJFUf2UKJXtD/cm/IHEw+lYjvZwVdG8UyJnE4/o9rcY/eYs/LQJVW6Q== X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 6:7oNUJdMBsI5Xa1lcUMy38+61/d2u/kAYWhkBzTSnEPVhCnP4wThbX3KZWaQsQ2hV7F7UNgFPLUM92yFqYl68wKyquqOUO4k0T4lWWhzwll43OWBNpXdn57vTyficHBzKqfVuL0h6xpV6RKmAYld6wMIz2CdWROA4YMYF202FtoP4kDJz51Hw1gQF7ZoFt/j6T66F0Tja5+L6CmwWzTJlDktKLPMQgcnSyUoaUWsIQyDsWgskGr1uEiFVIdddgT+vsANeRN7F3kM7K1Jh+/knsmlY1PldscSM6ptPjyTKqRukFcELjkbbZmF0J+O2/W8jPOqA1V0pKwvAd7g3+TBmPMIPck4hMKtJpz/G4B2YpRtwHFebZ+0L1HeUrXrin/A1nqxtQzxSJJG+z1h1lZnG+BXkSK0FiTNkBJv3uKuEX0r0IyppeEoKCZ8ZFzxCN+mV/0INR8nj2WMqV7rgdBnDbQ==; 5:hQtQc8yuxZMa0Iqja6UFIFPgJ75I6XEFZshMs2k99un6GpMFytqtrJGIDCXE1dYe2Y0eEiuDyY4R0Ggz5KayO/gu7ktKdQoa02tLVhP3M2VkYfMst6F3TQdNSmYQPjr6CWdabKPhymoMX5lEZFfM67s5tIZVe/R1Ixnhxt++Xds=; 24:as5caMleyNpSt3iqpJeSwwp3WQbooX/NEsBOSWMD/mS++RPkomTImR6kS6MOtRf90R5rqRI3JVIA+k9Kq7QfxBxOaisBbsLNeGGxTYkY1Vs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 7:Symri7mKzYnc3lPaTGXC22cGeYgwBbzKF5xiM2VYUOsWFi/KkjllpSEoXlow47VD+YAeIfZTUlgRfPKqQi2iZn+clFUQUPz83OfYoFixD3PdqegJKT+yTGULcHR2F2qVz73ID4ZD23seIOWgnlSrQM3BODNF5SEMjtt0uDl2XvwVMIjRijZ/iLycM9C6ceRi0YkNly7miFmyasHatfCft0xUYd3FgOV+bx2AQym709A1yzNsINfaArYKHcjjOQU9 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2018 09:45:40.4228 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 89323fc5-e25c-4f6b-85a0-08d5d75bc094 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM2PR04MB0755 Subject: [dpdk-dev] [PATCH 01/10] bus/dpaa: fix phandle support for kernel 4.16 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" From: Alok Makhariya Fixes: 2183c6f69d7e ("bus/dpaa: add OF parser for device scanning") Cc: Shreyansh Jain Cc: stable@dpdk.org Signed-off-by: Alok Makhariya --- drivers/bus/dpaa/base/fman/of.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/bus/dpaa/base/fman/of.c b/drivers/bus/dpaa/base/fman/of.c index 1b2dbe2..eb55cb9 100644 --- a/drivers/bus/dpaa/base/fman/of.c +++ b/drivers/bus/dpaa/base/fman/of.c @@ -182,6 +182,11 @@ linear_dir(struct dt_dir *d) DPAA_BUS_LOG(DEBUG, "Duplicate lphandle in %s", d->node.node.full_name); d->lphandle = f; + } else if (!strcmp(f->node.node.name, "phandle")) { + if (d->lphandle) + DPAA_BUS_LOG(DEBUG, "Duplicate lphandle in %s", + d->node.node.full_name); + d->lphandle = f; } else if (!strcmp(f->node.node.name, "#address-cells")) { if (d->a_cells) DPAA_BUS_LOG(DEBUG, "Duplicate a_cells in %s", From patchwork Thu Jun 21 09:43: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: 41350 X-Patchwork-Delegate: thomas@monjalon.net 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 A32D81BDD1; Thu, 21 Jun 2018 11:45:46 +0200 (CEST) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20043.outbound.protection.outlook.com [40.107.2.43]) by dpdk.org (Postfix) with ESMTP id DE96C1BBB4; Thu, 21 Jun 2018 11:45:44 +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=6KI8FBcsRl8o9LxpK9jAQv24safcM0wyg+kPy56T44s=; b=JbC63ExpU+BUvTJyaJtKbN/k3Bq7HupRYi6/JZQrI71/f8sQonNAcdXBHR0n0IaF/lcVG6N2lfGGX+QRvSnAr2euqX1zZfuobqqTBHwEWKVLsWznBLDAR9qNycMnkaeR687YJdOmFW8XlV7r41MVzXE6vhJgGBz8F5SZPv/+5H4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; Received: from bf-netperf1.ap.freescale.net (14.142.187.166) by AM2PR04MB0755.eurprd04.prod.outlook.com (2a01:111:e400:8411::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.16; Thu, 21 Jun 2018 09:45:42 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: ferruh.yigit@intel.com, stable@dpdk.org Date: Thu, 21 Jun 2018 15:13:56 +0530 Message-Id: <1529574244-18997-2-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> References: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0035.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:1a::21) To AM2PR04MB0755.eurprd04.prod.outlook.com (2a01:111:e400:8411::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 28475aad-32e0-4cdc-aaf9-08d5d75bc159 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(5600026)(711020)(48565401081)(2017052603328)(7153060)(7193020); SRVR:AM2PR04MB0755; X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 3:6f6VUvy8E6dAytjUdO65/6HbbvJHXQsgZrsVL5Ph0kzliI6ARYiWGQloRJkcO1ZV5xKbnyJLy0ZucdgHejpRbQ/6VFc9l8H+emoUEp68zk98LiYMlZqoStCM6wPWUqzZL/VKs41jgLkeL9+xp0Q/UI8nWS65D5ClVgCcXBwYI4VS2fGVOY8hVJ4zpMgXjIJiCYnhP1bDzYANgsbzUsKF+JSVa4fCjJ9ZPg6I3HSr42jolo0pWC93s2ILr5J+UsId; 25:hcaGhsa7V5TDRdE/PGw7CeVYB12PNZ5hNo/Lw4VXhy5CkUfG2ooL4hhtjzRLztTCeP3kuC+EssJG3l9tW+N0Vst/AUx6KEm7UxKe4kFKFi0vy/IIYILObmDCowSy0Jdev30pSJ2K7EMZj9MUdki2kAqPsXd/csd7gX9ulC8SjlV7Os3KHq8vIB84Gt2LiMhsd+6fwcqnDKGi2hN1RwIQ1R1MIpFQpbHL7TvDSUMy2WFtzJQ2vmVVlsMtx+YubEGu5x3bLQBRA+Ar321ZTw2nLYpf6MW7k+z41Zd+tHa/cDW3udSxnrZB40V3KiqpCUG9OYqt0m3Cg0trztSogO50FQ==; 31:7ZgLTdG3CD6Zt1CQhOo9dbzhFfFEYGQdG62vDIDJNtztAGxBj0VjHC4BqtS/NWlu1X2IH+fps+9KdnEyMRZzNsW6PKza1caVoarPcH80tSye/zbWCuPF4u63Aq1O8A2pIs9cqPqVzllNQmYF5JMxb92kFMuulPE1lq0H0RmhNu54HpEkxaAi3xIq6EDqcF47MErJK59O5t1CJzh1KI5rUE7ZRKS7fWRTZR+/8/+AhCk= X-MS-TrafficTypeDiagnostic: AM2PR04MB0755: X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 20:jARF2tM236pl8cru0rjIQh+bRoPTDkuFVUVznrH6D9vM0IWwwG89XWGrEF6Ipg18p60UjgNY8aPC80EY8gjoHYYmRlu6qoTAhZqKn1h2OjBycNbjfMEyPbYq4+kBD779z7bAWUC19Eyxq6M9Ch1P1LUuX1y9tyNWwur/+1Tl+yT5pJ9I66wxdeB6OfwgxdxrQiqDJHjKVtcEgpI0vh78uHFA6cQp5nVgY1VvD4mrI1GJl9/f96IQ/hyD3YFcvuSBMZW5DwSJ5bfQzgrzGJClokd1p55d67WfzZkMeLkn1i+GjN5QpaioB/heUor/ah9BbW7QZ5I3pCYbhtk/Q+VD1ln6ParZ6M/hPSHnWw7M+OdMnwFd5m2px2wXz5CjIZtsLbNzhfEPxBgQlS3PZtZAKVcq0x2fkhA2paCG4kDZmdKkOqq9ZmBEFf2ChhSd2IOgwFQgJ82Kl2Q4qQJko3UJDQM4cxgWk2cnGezw4OeMjbAq1wWHLy2KuGMz9B8yXRKo; 4:2RuZ9lMHMGuOvXG7v8vjUyRmX4DkbFDZaOaGkTYsmp2/pNxWvbRE8SHAlsjKrUDdkadMQiC+TXZzzhUscwvHYcLnJz2y+n1XOA0Mu/XjGNHoYeMkK54iN8mLYJ+4O6S3IB27yDtOmPOP+OGNjQzoR2CRM3Qd54H+Tgoczdbcr3tS/sNPkTx/OCg7XRwLCpQtGxx5N9xEMyc4Ep82dV/YfPZlszEcfiBNNAz7B7JBJbD2KyYLsHe80exlupF0vqoXYeYHFGmQVfThexQwVwJbRlv9HwawFFk3mApwnYD6ylyaiQuiGE0eeBeGuWTIhPcF 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)(3231254)(944501410)(52105095)(10201501046)(93006095)(93001095)(3002001)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011)(7699016); SRVR:AM2PR04MB0755; BCL:0; PCL:0; RULEID:; SRVR:AM2PR04MB0755; X-Forefront-PRVS: 07106EF9B9 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(366004)(39860400002)(346002)(39380400002)(199004)(189003)(50466002)(6116002)(6506007)(55236004)(76176011)(59450400001)(2906002)(6512007)(478600001)(51416003)(48376002)(52116002)(3846002)(2361001)(186003)(26005)(16526019)(956004)(11346002)(97736004)(2351001)(5009440100003)(386003)(446003)(4326008)(8936002)(8676002)(476003)(486006)(7736002)(81156014)(81166006)(305945005)(16586007)(6916009)(6486002)(105586002)(106356001)(2616005)(47776003)(53936002)(36756003)(50226002)(44832011)(86362001)(68736007)(25786009)(5660300001)(316002)(6666003)(66066001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM2PR04MB0755; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM2PR04MB0755; 23:ktdepMM5AVrTJCDjJ8/WEYYaqBxKrGAadN/eLphmy?= mrkemjpkNwdODrngv6fmuj3TMyu2oXfisZzp9vRxGtlijS+dIIPj9hPEPdUrYNddESBbuicHQnEDGPM7SsALOzIOyDZch3R2B5IOp/bdzQtD4xowZ5l9hSiRH5kSOr+oGJWnTmwjLIZGfAOKW81N51oI1GnZ63T2cwpc23D49zQufEuXMwrr1NpEJThWg5bHRWzzC/EL/gKaTgEyIuHUVQQfdPqcHoYLGpOKhSYekfLYkfMzU5sEOQ1Hi1+kRBigOXM8ixEhp6MdUCZWcAQcE0va+pTdhywnw5IxEjgIpzrFwI7fbhhOb2UsQdNwNw6wjsUFhduYnxPFYyLO8LpZqjnzUfFHPOsePZ0diHpQVIQsFDcHSgb1Ue0x829zhth2cFxh/qNLjr9DlXDGp9e/ETV1TXFzk6yr9ELYwk0oFE5r/BO1cUx0W+vIczeLJpsGDSHjnm8zRF9J4qwqrOVlwUkb826nwdXpPMwx8xan/HntN+pz/K0vsIzjwXIlobC4OKTaCoLOS7SCPX5iT0gOg0mkbdQtEvHMX8lPykgGswUt7U1Suwp+mncf/43tLJdJ0V7VY35psb+MV7kG2MhtMXvRIDM2Jss21WfVCv6YpG0NIaNLNiVEWTdvnRzBB1KwNLLVk2zPEalvu3HS+hjwd9fvjTiGRWqYmaDYMdihsn85rTG4g3m1BqU+FBnxKAU6qbLN5Eug0BU2FVl959wkTZWoPpbJwLmGiHQecQoUkn29pXIOKWjgnNpuPcl7xfhq3bMQLopFk0vVrpb8K5c9fTy22Ccp8c6hSDhbR6+mxsAsz35Ro5KGkOYNRTGlub9ivdFsKg1dnqyF/Ptj1e4oujjpMrBeaQQtCbku5Fa0el6Y8KenD+VOVeMgFuGIud7+4G6Fj8hRhy85oHF3ZZ2Y3OSL6xEaiXFK7MElnidDREZGOUWAtzcAc0o2ZMsjE4/jTH3fzs9uaEKh7CfBG5hF81MU6H6W1k762vsL69d1SI/mtwt5ezBZpLH+fd6Yrx46M4SaWXbwBr0sLfSLtjKogw0yG2kI16VbQDOnxcP2DzhVLwtcE39zxS5E9P0EaWWe18Jd91iuiF+KKKvcP0M2J/FLD/waGWVw+25vujgGYZFVkFx8NP7gjh+Gaju8DixF+rso01GXruhWGNYIeKhlBWXyLws7lMXAn4RAudEWPcya1WLahpbBfrdpnN22F5z2cCun2wvnWktBOeUNqmUutWntvcKcC4XKAWafCJk9UoB2/3wiPfgXaMvZu3IIV04AaqrX/hxEGVkVuPgiAgc6SCw X-Microsoft-Antispam-Message-Info: A7gvX5PMwypX+0LTyIRSjriky2p1/VJHzqBlc8LdaXD8UawLzq8t4Um7Nr65VS324jegXHUVzq2Rkpw/apPQNIaIdamgpBbPacwFavar66+2pyAAWUPuIE+hByp3JI8Wl+z61eUP7LQFupApNYDIGGrm4NxOoM6VsgP5aK9mUKs2wj/TPHahgAOL6qtdvQCv2RN7OIxZsoJ0MtIXydEGh4tC2juwsknSewmqMcn58s3nDh4o2HwtmySE5FUF3R8J7Sj9x2K9utxzucQmAiKNa/p6rAdjNYBwqkZV0FQQ/sJpB/XEaUpVei8QAalRONr/K/3QVlscrtm5s4p/aX4Q1w== X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 6:apwd7nQfuqqju7OpuOYphx8yDxyUqIyiZwUcopYW+xuuCPkcv91ZCURwIj3GZRLWkCytnNvxLIo09+4lGvdPA/APX2yyppwMgluaO62z4fztoDauDKcfnPsCCSkLQz1DhTo0WS4gozlGhw62Ffy+Dt4EHcheMcIEL7XRw2wBEaqvDTYNKvxi9gl8gLfMhM5mzfKGj1MZ7RowYma2WgvapjSf8uvobrLufDewROvoGxWOn2g8IzMlEF+Ik4W+MaXQ4TRvbNs8fqmYk3jSxJ+CbUDD9J8vpdTqfaW1bbB/jkGwfWEwxHUSieAmhjI54/yXJWF51IPhVVnpgsPfpQWUOy+JLC2Yb8O+NIfZwG0L8FDLnbyu3ZdCVODgol07hFhifnDWUefEcVkSjGbiigSiJFxiM8Ck+isgrKuVYBGAeWASMaPHJv6jDhf/1voUe4mo/+rGbpjC+MoBPadpi1wIEA==; 5:cY1HTLzTyIub0v0su0PzZFmP5HzOItMsXrIxz8/F9xFyRxCq0u9cf/QWOeoCSMsQoPMRsslDjDJJKtgmieMArwH6WhLwhWn4N3QciEw+4/6bVqiKIWeTFSvVVdvwY7iql+uRRGA2FoSWme5ygIK7/660PlLECti/rMPfbuKdUvQ=; 24:JIboWUNsdRS8q4tC0QAaH8Leg29OPT1zL+Oimd9B8qmstl7zWPdorpbu3L0ujAHh3tsifm9U/7vqGNR8wxgo9VwkL4YhF1fncT818xiSAZ4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 7:D3iiXTI1HamHYanft45dQqJS2fvJB8XY3ZLpEQLh06mKOQ8OwXlTGMJhYlICASuM1xWH3kJHeuih5OiZh94HYo8bx6/ABY+ysQ7HVYVUNdxRajGekc6dJvvudS/YBfwTksjDXPwhiZiLDt7BYA/2UeQfzoPnrbawxCp/6ljvUkeggBQeNSykHcPQeJDK+BVmatJZYEZN8PtJF58ww+3mQ6KI5Oyo151naDNRHDIRTb8X7zKeTowKrLZogfnURYUp X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2018 09:45:42.0051 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 28475aad-32e0-4cdc-aaf9-08d5d75bc159 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM2PR04MB0755 Subject: [dpdk-dev] [PATCH 02/10] bus/dpaa: fix svr id fetch location 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" Otherwise the SVR may not be avilable for dpaa init. Fixes: 3b59b73dea08 ("bus/dpaa: update platform SoC value register routines") Cc: stable@dpdk.org Signed-off-by: Hemant Agrawal --- drivers/bus/dpaa/dpaa_bus.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c index 2046206..7956bd0 100644 --- a/drivers/bus/dpaa/dpaa_bus.c +++ b/drivers/bus/dpaa/dpaa_bus.c @@ -539,6 +539,13 @@ rte_dpaa_bus_probe(void) unsigned int svr_ver; int probe_all = rte_dpaa_bus.bus.conf.scan_mode != RTE_BUS_SCAN_WHITELIST; + svr_file = fopen(DPAA_SOC_ID_FILE, "r"); + if (svr_file) { + if (fscanf(svr_file, "svr:%x", &svr_ver) > 0) + dpaa_svr_family = svr_ver & SVR_MASK; + fclose(svr_file); + } + /* For each registered driver, and device, call the driver->probe */ TAILQ_FOREACH(dev, &rte_dpaa_bus.device_list, next) { TAILQ_FOREACH(drv, &rte_dpaa_bus.driver_list, next) { @@ -569,13 +576,6 @@ rte_dpaa_bus_probe(void) if (!TAILQ_EMPTY(&rte_dpaa_bus.device_list)) rte_mbuf_set_platform_mempool_ops(DPAA_MEMPOOL_OPS_NAME); - svr_file = fopen(DPAA_SOC_ID_FILE, "r"); - if (svr_file) { - if (fscanf(svr_file, "svr:%x", &svr_ver) > 0) - dpaa_svr_family = svr_ver & SVR_MASK; - fclose(svr_file); - } - return 0; } From patchwork Thu Jun 21 09:43: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: 41351 X-Patchwork-Delegate: thomas@monjalon.net 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 B6FE11BDD7; Thu, 21 Jun 2018 11:45:49 +0200 (CEST) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20063.outbound.protection.outlook.com [40.107.2.63]) by dpdk.org (Postfix) with ESMTP id 133531BDCC for ; Thu, 21 Jun 2018 11:45:46 +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=jTYFYMgVgx25W5ScxRyWoFCanS/M94HrBBZYJRb4wFU=; b=fwqx0bswPAHIJl2iWRw3WVvgUm/4CqdKFKKWzUuResPDDAbOnMTHKSZMAvlEZyr+/ViFTaYvj/YUJedUu2ZFpL3Ye1+MfQ27hO8sl/62/Qel9+JLoHw365cr2Q2rS+xuu0Z6+186yUthcNzh8F/3LoAo/g5TOlBp/7y+AaTiS+Q= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; Received: from bf-netperf1.ap.freescale.net (14.142.187.166) by AM2PR04MB0755.eurprd04.prod.outlook.com (2a01:111:e400:8411::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.16; Thu, 21 Jun 2018 09:45:43 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: ferruh.yigit@intel.com, Sunil Kumar Kori Date: Thu, 21 Jun 2018 15:13:57 +0530 Message-Id: <1529574244-18997-3-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> References: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0035.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:1a::21) To AM2PR04MB0755.eurprd04.prod.outlook.com (2a01:111:e400:8411::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ab7a44dd-9c6e-4228-de3c-08d5d75bc221 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(5600026)(711020)(48565401081)(2017052603328)(7153060)(7193020); SRVR:AM2PR04MB0755; X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 3:BFVgjn9+xPBBKRRB4AmLwx754xhlEaf7OcrjL/cTneA7l46HVTkDPx+90B5OJC1ktN8q3LVTW1YdntyCKbYW9On4WkphW/JS0eOgPJx2VFTBok+dkGPjvjiuYqLjSnXFu+A4WE4zUdYQR3nygcQCj1ggmhBIf41jofDjLYju9e4C7sK1xy4if6zGAWlDBjmhQYACewje+WAbi+F96yPWJNTWHcvNy+2/7mcX5GVF/7f5Sx1jEpIWdBanITx6HPWn; 25:4OL1wu0l5ch21Bh8HRcx6ha6soUxOC5YwgPfOklNL7j+lp1B7qVn4EN/uloruWd/eQN9ycvyn5H/fVTc/hZkFlVAuegdM+Gau4pHq1nEZKGWIMv4S+JQv8clcQvLGK/mKOSHLsYhuVYU7EAZ3vB+QZu/XEjKiMDoVAcjJwN5ueJ1aawZ53/AYuNqRmGYBQSaRpBOKIOyF552LVazjUIU9mkEeL6CPMhJbd8RRxMf2IaBw8JefHj7oQwOkzncPln2K956z60KJe3BWMqswAem8nfsZyhe1kdwOzKTMle1oW5Q2B+C40bnUK70aafx+gi3KISIvBDxTbJ+1mohQtjx9Q==; 31:KBqWF0wCBCsPfCcGYG08ZBYrLBa13mjqAHg+9/Qq7BHDfgAQIV9rHp5BBNDEKDQIlIUbT9npGTElfOpJM7QxT2MPPloiU2Mhc2D8LCRfhLDV9Di9vbxVRvajs2mmOGbLxY3qW2xJ6Zd7U0QR/q5kXJhL5fZnzXpDAMPGQP91aQ6ESowlXG196inAXnsX2CUcpNO4OcwVJdg/SRPwcoe/EfcJxKfrjQWtkJp9I8qcaWs= X-MS-TrafficTypeDiagnostic: AM2PR04MB0755: X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 20:XfBTJ+0aQ3qOYsDk2M95TGYnhjYbS6NW6h+ydC+evZMjN5LmjUL48ZSWJsmvO6uaysh5IKwuTwov3qOu3OFLNFMgq5yMmv7Wu7Yc5ucS1g+Ovv0zwwE+BOqsdTBMgI5UU2e2Agxlwd2P608ZU9YNVwFPg1L+pynOYY3edZGzPzplevM7z47Jht1AHtHKMTJL158lI47h/XaGsERQar2RQWCHdYwtMWgQUKGIh9aKDaDwWxAxui1nD/ey0THABz2A7Z7qPCnR/nNFAc8mu9HMG4gdQMAX8lZZc+JLJwu2EejCgFYz4K13SB1Qy/NDIj6hhw/LAxHYAbBQyDp/FBYRBJUm4/38jcTvHoUO0eD0BlBPVfkyWqTR4hAcw/2vg1z85LK3hGFZMTREuGhHmRIvmBjaoW8noBVlz2e/qPI5Mf8zceAAHCiimRtRjCFvu3OeOZPBXchUKnitoiPtzyNIcKCjyf63g/i7wM6KyqrboH71dtcTHClPnrVpU7mSnIz2; 4:0v4ahZwbskbTnYP1ir+iLesdcVTAowbjOqjkERIad6yzw+hG1w7WQ+e1ydnCrtlaGkt3/zIOBZboCQcfusgX7yPn5URQJMNn2P0wiT3K2lk/gnC0PQi1ntZgpSzTWV4rs246Iop0PaqRN+IA4L03/La0yzj1HQc4TaC1rmG0KUNJ/8q31CYILjJZTbXOqCFlPaWwHh9Mjo8DWzFwgvbdMMkvltXJAMzMG7tKbSyZ2FrjneiuqIefM7vTKUvcOE715Ef15pao5V4ej5vMNNoNDoTUrJdKoPNt1IIubdA6uZ1XPLzpnCsNfqU+YxKaeWS3 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)(3231254)(944501410)(52105095)(10201501046)(93006095)(93001095)(3002001)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011)(7699016); SRVR:AM2PR04MB0755; BCL:0; PCL:0; RULEID:; SRVR:AM2PR04MB0755; X-Forefront-PRVS: 07106EF9B9 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(366004)(39860400002)(346002)(39380400002)(199004)(189003)(50466002)(6116002)(6506007)(55236004)(76176011)(59450400001)(2906002)(6512007)(478600001)(51416003)(48376002)(52116002)(3846002)(2361001)(186003)(26005)(16526019)(956004)(11346002)(97736004)(2351001)(5009440100003)(386003)(446003)(4326008)(8936002)(8676002)(476003)(486006)(7736002)(81156014)(81166006)(305945005)(16586007)(6916009)(6486002)(105586002)(106356001)(2616005)(47776003)(53936002)(36756003)(50226002)(44832011)(86362001)(68736007)(25786009)(5660300001)(316002)(6666003)(66066001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM2PR04MB0755; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM2PR04MB0755; 23:xytLdzaj83pGNHjqPrk6wuHAHy4PMJrwQXLMF8LQM?= 37aIxdWiBCt/8BIkLDD2JddLSBwpuhTaDl8kbSm4zL0/HJB7DKr/xB93SAu5BiTRxxVKqGxvhV7mIuXJB1y0CW0eSd+4Zb0+LUoKrvpsNU4st+MY5qyOH9TkQfXPamEEkBOXtju/ljQUL7iN5nYICH8wi7Gmmc83V24xH4ZFLbZZGNu4LN4PssQsKbsTSSIi8BkipQWtGHsaKpXHzw+yFOn+6pvscfN9+dkcuhPNPyILo7vsKqt9er6M6wpM5s6CQlxBcr2J7FoOiUPKawrPkDIR3Z7EcqDy2O4h32YS6J/41vjaYdQ3wksKr4zlpG8HfiEhr38CelNm6ZGmRLCMVS79kc2r0B6MXF8fGrHMHASAoBP5vx7PNUTwhxuYyivDl1shvaL2qo4pLR1qHXGZxx7t9OiGo0pp5EC1TCH4aYUpFUJTXqQ10BLDGzrhPZRm0Pk0Vl2g1M9hfxoiqef1mQX0BcUZmfDb57tnR1PNr1LTsOqx9FmyMmGwTB9fmuNjX5e7ey/O3kTxECuFQva+lVAuOrevM/YbuZQBVqG4l8GGEXX+vfnBvWcvuTgt1J+3m/viaskDOZmjvIy0REGs3+8gmrxpnvBA7VaZNuwhwWvoYEdi7gyv84VI4kNCs5bQa/Yty/O9X5y6xKB9mKyZgDchWjDSEz9UH2R+UySQqGoMiDst9Fspu7rdLsoHz2sUY4zGeEzw8620Lt8wKtZS2jhyTAD7n8L0tWC7PHmQPodsIt3pMxiYtaSHppM8wPBr8XJZHNWJCW4Jhn3jMW9g6UpftvQ8u8m66QdBFWk8nihn0tarkxa6bpeYK9Cu7jal0KuPfYIRcupQWA9AZIMfb/cjZa8OwVkpHStNiH/vDp7lwrkXve5j+0p2BAk848LryudSbHDdOIipWg9opXD/5dLx5wkGJkV9WYIpdtdrWO4TgxJWpQHEXH0VNLhCyNvNju0LcCI1Ym5/YC9yLqSQHgeZOp1UWmqDykzM3KHPy8JQjy857t/S20ldWBxcc3rC+X/CYeaqoslBTr1ZnTIBhodBJn1hPXU4xJ9cRCOvDDzPjaJve5LwRgY+DDJ/sL3s9Rb7biXAiCWgBKNvh8mgipqQFeG9RVOApnMLs3olke8LvrvjIGl1VKg6eTiFPqWdgpN5Fmz7dyA+HpIxmE1BGOenPkVCJBfd2+7OupfvcQqGtftvmkATfrw1189A7l9wiJ3DyxmQjSedyQFecwJRUcLZxKQs00J6Mt0KygkbRCr6jPAlZzQOhhXy93LcAsawj9FgqXg10yx/GuKIME7KS40 X-Microsoft-Antispam-Message-Info: RZl8VtsTnSKbGrHv8ikG5c2sPF8QwgrFBxWgR9d1nt0YS5TSuPhZKcUosktpK/rhN6ah0YCtKQTqTDKdj6mQ3x5/M2YxauFQCGio/zSJi3vq7anW1PXEFEK+qd4b1xv8C4kHIhZCClhINUhAdgQ16bfwrwnAkFxretx+6+tm7YbNVhb60Ae4ypTehsFb3B4XwLetCLYQy18bU03u2JyQtuPpcm5ibdCG8woTHcP1PSVR7eBeUyUjNUDRYwZplLwsWrxXi3zE/H6q+wbk5Qv0F3PXQ0gyQJINM/AnLcjue9XLef1oPz7Yh8wZrMPBLLDVdGUrZbmyde/39+szWYN+bg== X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 6:SRdl+WDmAO0yuqjJAPCFf9iQfLgOtGsryap5VutQqkzy1Cm40a/NKzJluFbz6n8pC4qPYtVhY8xmVMyIpuQdEjmj9yIQ5LUDLx0Nz0B013pDCypTi7ULFsL5JyeNfl12XonqL7QO7hziSH91Gl+7r9kRU1wGN92mvFfgZF2n2Fr2zqPTPSYOo/Z2XEQQRjnA2HWEAJPrwXJQr42wJtgt47gWznlXFHX7LugvWjMJbOnIblHZUiLYd4gIz52bSzsaGzhIpwbzUy9+XXqv6YXRUfrV/rlbmrF3L8c1enWktkcWZMtvoNpi6c3dist533TBCxPOidPduATRp+a7LOZsWavgwLfWSaSRg1E6rWVT/+OmQcJStoqdfhMd2e9abFnWgK1u7bEJo/sk7aD/kKHaV4OOrMCfTXFxsOMNCvGMowzl0m+h2fm6CRXRJVcJoSjF5lxp5PIQ3uL44wJd6pNLjg==; 5:ntMxHrPOkt7VESdjnY5ngANo7K2eBfoQtrTDgb6OtDvqJ0Q2Eo8uI1EyRMeKwWYXiaeMP2sJ6HMH46hVE2IFg+oxbEq3pvaafDU7SXNggAhnn2AoRMt9MVf+4I1StNCD7lEiFb8fEn0qWWAfrBdVdcScpDSinlE11klqyiA/ohM=; 24:D16GWkB4YSuNjYXbHv9W55iD+7TcqFaMMW7OXLOzSDtpjbmuiR6tS7mrlvsBHFNjiGPyHkm0QOoyfWj+m1oXq+Oc3uhRmRuGQPWBRv1N0AY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 7:2rG3X4aWgBjdG45tXquAMiqRwY9IujccvfcWcu3elnJQc3UqkWht55tQ4jvLc9IS2zPNnt8iE5ESsXYzbo2CVH9O2BjjuGPD/wRRBdb5InJBbAn6vsjzV7T9VEnju9/LhDTzLha6cWU7tiLx2FFG9peWTd0HBoYHYt+IqlUHUsJMVReJR/qt5ac50TSXwkGTrsE9nYnKCKWENIRxTaQaS02unOrS4Kus5xLQkMlNdueRcJjzxfQXC/oab5SjsqU5 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2018 09:45:43.3121 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ab7a44dd-9c6e-4228-de3c-08d5d75bc221 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM2PR04MB0755 Subject: [dpdk-dev] [PATCH 03/10] bus/dpaa: optimize the fq callback routine 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" Avoid array of fq as packets are dq only from a single q. Signed-off-by: Sunil Kumar Kori Signed-off-by: Hemant Agrawal --- drivers/bus/dpaa/base/qbman/qman.c | 15 +++++++-------- drivers/net/dpaa/dpaa_rxtx.c | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/bus/dpaa/base/qbman/qman.c b/drivers/bus/dpaa/base/qbman/qman.c index 27d98cc..13c4315 100644 --- a/drivers/bus/dpaa/base/qbman/qman.c +++ b/drivers/bus/dpaa/base/qbman/qman.c @@ -1058,7 +1058,7 @@ unsigned int qman_portal_poll_rx(unsigned int poll_limit, struct qm_portal *portal = &p->p; register struct qm_dqrr *dqrr = &portal->dqrr; struct qm_dqrr_entry *dq[QM_DQRR_SIZE], *shadow[QM_DQRR_SIZE]; - struct qman_fq *fq[QM_DQRR_SIZE]; + struct qman_fq *fq; unsigned int limit = 0, rx_number = 0; uint32_t consume = 0; @@ -1092,14 +1092,13 @@ unsigned int qman_portal_poll_rx(unsigned int poll_limit, /* SDQCR: context_b points to the FQ */ #ifdef CONFIG_FSL_QMAN_FQ_LOOKUP - fq[rx_number] = qman_fq_lookup_table[be32_to_cpu( - dq[rx_number]->contextB)]; + fq = qman_fq_lookup_table[be32_to_cpu(dq[rx_number]->contextB)]; #else - fq[rx_number] = (void *)be32_to_cpu( - dq[rx_number]->contextB); + fq = (void *)be32_to_cpu(dq[rx_number]->contextB); #endif - fq[rx_number]->cb.dqrr_prepare(shadow[rx_number], - &bufs[rx_number]); + if (fq->cb.dqrr_prepare) + fq->cb.dqrr_prepare(shadow[rx_number], + &bufs[rx_number]); consume |= (1 << (31 - DQRR_PTR2IDX(shadow[rx_number]))); rx_number++; @@ -1107,7 +1106,7 @@ unsigned int qman_portal_poll_rx(unsigned int poll_limit, } while (++limit < poll_limit); if (rx_number) - fq[0]->cb.dqrr_dpdk_pull_cb(fq, shadow, bufs, rx_number); + fq->cb.dqrr_dpdk_pull_cb(&fq, shadow, bufs, rx_number); /* Consume all the DQRR enries together */ qm_out(DQRR_DCAP, (1 << 8) | consume); diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c index 1316d2a..805bc30 100644 --- a/drivers/net/dpaa/dpaa_rxtx.c +++ b/drivers/net/dpaa/dpaa_rxtx.c @@ -431,7 +431,7 @@ dpaa_rx_cb(struct qman_fq **fq, struct qm_dqrr_entry **dqrr, } fd = &dqrr[i]->fd; - dpaa_intf = fq[i]->dpaa_intf; + dpaa_intf = fq[0]->dpaa_intf; format = (fd->opaque & DPAA_FD_FORMAT_MASK) >> DPAA_FD_FORMAT_SHIFT; From patchwork Thu Jun 21 09:43: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: 41352 X-Patchwork-Delegate: thomas@monjalon.net 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 9F68D1BDD4; Thu, 21 Jun 2018 11:45:51 +0200 (CEST) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20087.outbound.protection.outlook.com [40.107.2.87]) by dpdk.org (Postfix) with ESMTP id 2011E1BDD4 for ; Thu, 21 Jun 2018 11:45:47 +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=+Xigs0/pycWk/Bxzn6lQFDgCQg7JbKx5lbTLF7QyEIk=; b=JashanxP3yPph9wV3b81JnqF+qF/ppcRVsg+0NdIW8heintFtbg0tkWI0FpskjzL9+2Md49408X5GVAmH9LTvdo3iZaAT/XYYq0C0+Un/VTtQaEq3YeJ4oLtri2ZmJRK+WCl5lXWFWTJBAnnaoEScrPkhtP4p4Rev29vQeCgngY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; Received: from bf-netperf1.ap.freescale.net (14.142.187.166) by AM2PR04MB0755.eurprd04.prod.outlook.com (2a01:111:e400:8411::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.16; Thu, 21 Jun 2018 09:45:44 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: ferruh.yigit@intel.com, Akhil Goyal Date: Thu, 21 Jun 2018 15:13:58 +0530 Message-Id: <1529574244-18997-4-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> References: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0035.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:1a::21) To AM2PR04MB0755.eurprd04.prod.outlook.com (2a01:111:e400:8411::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 608672fe-679f-4b0e-a14a-08d5d75bc2dc X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(5600026)(711020)(48565401081)(2017052603328)(7153060)(7193020); SRVR:AM2PR04MB0755; X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 3:Wcmi+KA7znm1HfZNzmdDA+97VuP84lItintI0exAG3DmKquo//zMXPGEYwEPMRjwjxDM5EgYPdwMJ3nFW6ysq2tqM0lbmFNUiJpCNVG6gMrikwLww6zg39gRXOx9OHXVqnp+E26Aojx+zbOZwyW/s2dhreVXo8Z9ULXeI8crUQol1a7DOghe6d7qxNfbwomyQCZFpM+yWfEmQ33I5IyUHuTK35soVOGL6gGwFfL+oXDFubUoP4KzcF5FiPD03B09; 25:kcHhQlMsQrlMefoEFjEMaPHN7xuZBBRulAGz7YgkpdChtk6STmg3Joct8AVGSbuRFmuErOn+U8XJV2AXI7pY2LA0Vazw4ZsJhQcGlXpuNBkwiCzrWWgETMyzwsgBs4R569Uq1n8Xx+zj9x4J+NGRG2Ft+KKH2JIeYb67tpVhQuFTsC2q9UCx0lWPqEItCVIrvMaH2k8tYb0Y/nFzeEaGlsaB0xeVvyg/c6nLI+tWF4n+H4oLqk0vldrZD7KD3hFD7udATMNxwdmvHObTeiR9ejt0nx8l4pCDHJ/hKbElw5zgrIUK4Mbnto/PaYWFjQ6qKu/E0Gmd0k/xn9UQ295mIA==; 31:xT2GbwhF0MVv4yqNZx5GEIIYaGJdb8sbZomGwk6tdvcMNodmkJsIl+JvqpXOcQjcosqhwSm71Ksebs+8Vl9TkFTa2EPZ/JUtHe6Cgpfiryl5no9zFVRkjanLzwiVLWkbM8mzi4/D1257XhnMUA6K710DkeDD/A9So524lgPR8Xfx07K04/BMvOPvYiwCeZEOAQIkq9qlWAFB5bxDiJSYTUqXwHvQ9blNmzq5hqdxrfI= X-MS-TrafficTypeDiagnostic: AM2PR04MB0755: X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 20:E0G+35zs0ZPwibU+yIH4U9vRe+9/9ObH7CEC0q/lZnJJJQhI0wVmLoZhjwu+I6A2iuoLKLCwppzvxomastZQTcPpSZS+Xatc2plUszCPu3qmYnbFCcsg7wfZxdcMdHIbCVXQwwjn64dWpmZKoBfHVEZFXFi3C2jOHplvJAxV1KlS0jUm+TrX5R6aaKlP+5cfHhfY1BPkFJwEqbp0KSIdLyYLrbP7GJ9YcrhyYtRkWeOZS/KnFmdXEK4hKgAZPMFPMJdF/7AcPVX+QnYg+MUgZ6nTRVQy70R5eOXFT24fy8V2zUNYW9DkV3z5NGmrtdhfrVIdsh/l2E9XP22cEUMY84tURbODPvVjcpYmZ3hb8vw83uRWNjLAIKXA2v0DT3cU1IqHrqCX4UkRhCnp+zCkpISfGBAdX/ChXEqDpK024LSrE8uXocnFBt0xfvZXV/YnPxzcXntRbvcao6HwkV2Cj2giwC1nJDGOqT3zQ6NcPxE6z7B78hIs0ECqYbp3h8e7; 4:zXSdVRNd4Ily56i7aFewNoxhCjxLqTR3aAro2RQyytYMG7oSJzX3223GX9O9/Qlrywg+IuZeC0GJainG7C9Kg9SHYikDRHL1C7Ceohu91lsINyzkLzk/OgzpaFJX0x/8Z/6XVHBbHLaoHJtQSLwfRi1jUlRNcM+1ZK/iAnVbxtHbryoq/faMvp26f7DO1KhMK8Ln8RkITiIdAvPxiypN7CATZNqeOAIPxRo36eION0t9vmm8RcRTobxNxPOi823Dty9mW1Bl2i4CDTtg1OCYJRaWYo4YF2N6hp0LtlKphQRT0p4l2HjfT89AUXaDzxz2 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)(3231254)(944501410)(52105095)(10201501046)(93006095)(93001095)(3002001)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011)(7699016); SRVR:AM2PR04MB0755; BCL:0; PCL:0; RULEID:; SRVR:AM2PR04MB0755; X-Forefront-PRVS: 07106EF9B9 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(366004)(39860400002)(346002)(39380400002)(199004)(189003)(50466002)(6116002)(6506007)(55236004)(76176011)(2906002)(6512007)(478600001)(51416003)(48376002)(52116002)(3846002)(2361001)(186003)(26005)(16526019)(956004)(11346002)(97736004)(2351001)(5009440100003)(386003)(446003)(4326008)(8936002)(8676002)(476003)(486006)(7736002)(81156014)(81166006)(305945005)(16586007)(6916009)(6486002)(105586002)(106356001)(2616005)(47776003)(53936002)(36756003)(50226002)(44832011)(86362001)(68736007)(25786009)(5660300001)(316002)(6666003)(66066001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM2PR04MB0755; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM2PR04MB0755; 23:nGQvn3b4XY1Xa9MjOLqF1njIHFBCvC37sNMn3URhy?= u1PtQ2FRwmKf6iDBI/aYN78HNe9/OtBUz/2O7V4OYOLS/ng0OAPdjle/nPMBCvAtTMcFipqNRZXw4K/The9SH3PiwwSTGvtRmGHmntZw2x+oenf0tl12VS3wg5PF7UMQkTig5uGdpxpAooBNaw1vezBQMosnHl/94uWVvtjuaF9buY1Rj84hYCvR++5b94KifeYwj73iZeqR1LKoIQ6MW0I0a9c/39QThyjN6LpbfgLoesFZ3GrNfHlcaPoX/sCzicFSYoYUm92iozypR7sWueL/rFCtv/rPwazbdQXvren7g1rqwskGn/c3fo+1paPcRTztc9cKuSC4d9AiEuS9YrbX3PH39gbEeOPegrNA3LRZs06N24gHby6tiIzR7QekdzTWPQQK2ymrdQcIz6V8rNx1sNnvakxm6gVp4E2gbMuM/5/7XLYBmYIf5F11LGLucQChctpnBs0fb9bRRGpYI8qR/Gd2Ae1UMvHPu6Y94GMgedYq4wlu/nbruofzw307AWDX6iSJUVO/tge3CRJSxxgQq6WJmbxu8OKriaU2IG+xYs3T1ZyvZ8dR7aDntZQ19RzXNvZvw0IxNpb/P1XFfbecsaaOzFeV9U/InCprGWyyfhgdAcaJM30Zy9ftyxUajHxfqp8l17tH5yGKUQl5HaPV6gzEVzLkxPUiBIqcNHcdn81cJzzCSdbx/HN9BI21ebwcI31xryk6va7HRnuK8AxEqOuQMPs0PPzr3ZU829x9keoN2e055VmbpxpXGT9iwXJ5cxxaxeZFBXGtCNWR04WqL2/U4Wj/BZpateGPD2mT0pczFx/j1nlaKxtPADD/bXrv9i/GLJB/QTeOMZpsn0CPB5oi/PS9mLLlDlxoymlktk8fxitut5ghRdWgEOVCAMV5DdYKv2vCdvyOzodPh2jR9HQUlXBoIvCAGFzRdBeMWnTCz8tpSj5hbp/UEnv4LWVB/gTNkbNUwcxSTgOQV+7gFur2dmLZylQQreGcpsMnQs3xMFExSJE1d6G8zgGxnzpPaWezuOxdRoIhCyUDNN22WWZlvpHdC2AvdGLNb4slDdsfAiIqT06sLYsjelnbX6I9FExRUPwxoj+KyhThKHppM5ItGMXCPqIkti/1p9z/ciLqxkVoUlLWppN00cabywMuIgF+lf4GRBD0ddbudUdY/oM25dt3rOPmokC5UG0bmeBQQmmvfqtZh4my+uoER5JyntmTSGNtfLM5POIspDdXSpVHweYLvZWsoJuGz7eIcp2rC8lqYomsn7y2jNOA14= X-Microsoft-Antispam-Message-Info: ynOvNF/cLoo8dVisqRsIK7hD7Xm/37ecK3IL+eweQrZGMBWlorAPOoylV2yejeLONrCpTifB2B5Xnv3499iyJcgo6O0Vv1KEklo6pWBCsGPSng3ehNjmH/lNJabDRxPDjv07CyJNLwj8V+b/DL1k1KS9NnswTIW3hwScHNMwuPoM4yK46IrOUrIAphGrTVy9AQymCQYOoVLUWD9MCm2zm0AN37D83uTM9Iz8AhlvFqV0KY0hRDmyE2ZUsSnOcuveUU/RdCqNFGSxUft5GA4as/oigG1mdD8lF7eHcGLKzgkSv6rRgjsUVtZMF/9MbW4OqxyfTbnSeETqKzCW9gbmow== X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 6:7G1czOWBmGZphI/IdABQBLogUmjIbIPXimfXgodpCnx2zWF6UUIUMHLilyvfoqg/m/2z0xB4yOApa5v+FQP6gjd4E40sm/W6YErZwns98ucVh9IM/61uD3zGMBheb9AJYYZHedQ46I7AIMiXIvHV7WgsZx5nLpa/06QZahtsTvFMwhPDOAzn1WIfulcNCqnGdagdwRgXYbetZlYji45CKc42cnE5kOdawO6ltfhe7xuIsAPB6RoS3P4lmD2Pj9NK/pBwJffca6k2ohSWUbj+Uh7JQrjPg7NiaDvTdz0IIAPpUQqybpdf5ou4XXBPwy0pfPPOzmfRHiE5pwNdg720/h+mWyCjVMfv72Hg1XTYhSktolMLZo32lrg/Whq+0La1jzFIT8HFFIv8+q34WZA8Ed+2oAQy3ErDTda3qVeXmTO/Te/kWwVhxvd2McZH0JXIwHgBoh8EE5Zf70S44EIkzA==; 5:0ZOW1DjpjyC8qNkDm5LFfRk4oc/GBQ77rxADtqRMRuyhdXAvuYW0/GnBzOyQT04KlgRcHCxVASiC/OXYFVsTnaSEJUg7VuCd1EeaZz2NC0IPgafzJhqzGIpinsZoZqoiVhrFKM/yAokbrZ+bYQJ43rJeSXhFih3K4JhP4AgrT9g=; 24:qQ9kJhxkKNZM9hseoLh3Do4coCbajw9tGwzcLSyc5I0BGnx4/cYAmX7ADValYu8flB+FoprgcsJbN4IqqWNTWTbOwZXmSU8FioFujn0xP8Y= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 7:my0SUM3whjbMAr2taB4++daOe8LrbWLQkkNQNpGpuCtppVOspPj3uvUAZp0kYtz7ms9pjJGz7TtUayB4S3Q0EvilaUgs0amCLBoCCzQ7ZyD4upRHa6N+ZqVY32CzUJ27DvAONN1kdtPK33HRxvk2Qqq5zXGCNf5t5fv6dYPSUVkKXnwQXmcPNs7UVw0AJZo5JhRXDW4nIlrQFRQQPv+WUSYJMsNn3EZylYcxs8o8kz0fsC4f5ZSsKl4Si6NSE+6P X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2018 09:45:44.5261 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 608672fe-679f-4b0e-a14a-08d5d75bc2dc X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM2PR04MB0755 Subject: [dpdk-dev] [PATCH 04/10] bus/dpaa: implement new of API to get MAC address 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" From: Akhil Goyal Signed-off-by: Akhil Goyal --- drivers/bus/dpaa/base/fman/of.c | 39 +++++++++++++++++++++++++++++++ drivers/bus/dpaa/include/of.h | 2 ++ drivers/bus/dpaa/rte_bus_dpaa_version.map | 8 +++++++ 3 files changed, 49 insertions(+) diff --git a/drivers/bus/dpaa/base/fman/of.c b/drivers/bus/dpaa/base/fman/of.c index eb55cb9..a7f3174 100644 --- a/drivers/bus/dpaa/base/fman/of.c +++ b/drivers/bus/dpaa/base/fman/of.c @@ -546,3 +546,42 @@ of_device_is_compatible(const struct device_node *dev_node, return true; return false; } + +static const void *of_get_mac_addr(const struct device_node *np, + const char *name) +{ + return of_get_property(np, name, NULL); +} + +/** + * Search the device tree for the best MAC address to use. 'mac-address' is + * checked first, because that is supposed to contain to "most recent" MAC + * address. If that isn't set, then 'local-mac-address' is checked next, + * because that is the default address. If that isn't set, then the obsolete + * 'address' is checked, just in case we're using an old device tree. + * + * Note that the 'address' property is supposed to contain a virtual address of + * the register set, but some DTS files have redefined that property to be the + * MAC address. + * + * All-zero MAC addresses are rejected, because those could be properties that + * exist in the device tree, but were not set by U-Boot. For example, the + * DTS could define 'mac-address' and 'local-mac-address', with zero MAC + * addresses. Some older U-Boots only initialized 'local-mac-address'. In + * this case, the real MAC is in 'local-mac-address', and 'mac-address' exists + * but is all zeros. + */ +const void *of_get_mac_address(const struct device_node *np) +{ + const void *addr; + + addr = of_get_mac_addr(np, "mac-address"); + if (addr) + return addr; + + addr = of_get_mac_addr(np, "local-mac-address"); + if (addr) + return addr; + + return of_get_mac_addr(np, "address"); +} diff --git a/drivers/bus/dpaa/include/of.h b/drivers/bus/dpaa/include/of.h index 151be5a..7ea7608 100644 --- a/drivers/bus/dpaa/include/of.h +++ b/drivers/bus/dpaa/include/of.h @@ -109,6 +109,8 @@ const struct device_node *of_get_parent(const struct device_node *dev_node); const struct device_node *of_get_next_child(const struct device_node *dev_node, const struct device_node *prev); +const void *of_get_mac_address(const struct device_node *np); + #define for_each_child_node(parent, child) \ for (child = of_get_next_child(parent, NULL); child != NULL; \ child = of_get_next_child(parent, child)) diff --git a/drivers/bus/dpaa/rte_bus_dpaa_version.map b/drivers/bus/dpaa/rte_bus_dpaa_version.map index 8d90285..e00c911 100644 --- a/drivers/bus/dpaa/rte_bus_dpaa_version.map +++ b/drivers/bus/dpaa/rte_bus_dpaa_version.map @@ -92,3 +92,11 @@ DPDK_18.02 { local: *; } DPDK_17.11; + +DPDK_18.08 { + global: + + of_get_mac_address; + + local: *; +} DPDK_18.02; From patchwork Thu Jun 21 09:43: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: 41353 X-Patchwork-Delegate: thomas@monjalon.net 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 7BD0C1BDE5; Thu, 21 Jun 2018 11:45:53 +0200 (CEST) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20077.outbound.protection.outlook.com [40.107.2.77]) by dpdk.org (Postfix) with ESMTP id E43361BDD7 for ; Thu, 21 Jun 2018 11:45:48 +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=osO80at3KwZiplIAhS0bQYzWNJz+a0hkztBldgU2HIY=; b=tyD0A4ZwdcZvOkvT1W1xHZ+rC0IAfjlcevmsyJTNigvYJaHxIMwbZREMThDGdRTGLcForKtrSeMC1xWflNV9hu7jwWb8Z0e3RNRceif58dHkrODThEDy2cW3sw19YyYLSZSewdwZrLlbws02WfPf50/OtggQQOVunPtNTvyQjzM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; Received: from bf-netperf1.ap.freescale.net (14.142.187.166) by AM2PR04MB0755.eurprd04.prod.outlook.com (2a01:111:e400:8411::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.16; Thu, 21 Jun 2018 09:45:45 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: ferruh.yigit@intel.com, Nipun Gupta Date: Thu, 21 Jun 2018 15:13:59 +0530 Message-Id: <1529574244-18997-5-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> References: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0035.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:1a::21) To AM2PR04MB0755.eurprd04.prod.outlook.com (2a01:111:e400:8411::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ed949c94-641e-4098-c41e-08d5d75bc398 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(5600026)(711020)(48565401081)(2017052603328)(7153060)(7193020); SRVR:AM2PR04MB0755; X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 3:vb/h0vIKxpC6a0D8zUiTddtU5XLzqjLRwefXy8TiUkmxw6VWhRxZe9tJhbYxWYnp/TB99yFQqD1yyeDOMdDC51U3RV7cu8oUn5qcuAvcViNHQja59km7PctbS6wzEIjol45jNIq9lHWz6FXcrE/ciJBj3tFgDv37beXlKcWMA3uSDdxZOoqTrxyiWrRS8PXaoe5xBK4u+qqaUiBvFd9Y/e3WiYtnglO2d70Gk9tQmRBALwMJ7AvRDTdrFq1TSl6E; 25:4FaErcAcMKt3XKMPfbco8e4fYwn6pGy/UAZyssprdwD6iHXjmjAwlE+xK/c8v5SGv+daCYAAcCCvH9OrFdo1uoqjgUKd2tRXHS3dldxyQkUg17H4Ahd+stBrbmi7ZTZFW2aWeBoLROnmVTGYWx9YQ+crEWt3/clNvYEbaxwGQ7F6JUnuRBiJEfx9xies8JgYXlNRqzkGc+6V1lPSnjMpCraGaHoiqTTEzyZFS+4Z+IGWLxe+rbN04cBLbtqcRo+pmzCexpHKg9VeUuGxT8H4eResNHJiF7+lYymUcdRsjVIuIknD/dVXdKAvody63YEth+gkBu6i2JXtpu5Wk2iFXQ==; 31:U7NUP99HgqqntSGKqBiEUvq51QqVIo9t0efHM4pW1ONPZM4Z8Ib3po1JgkyJlZ980t50iZf10Zo5f1BLXxvMs8FONNOO876yjrXaVgB48MGTvH8b4cUw75yp+Dizdq7M8eJA4s8pt6/n3xGlm6ToI9LP1eiZUy33mY/fLercauZpNgt2lNWrlK8vFLAnShuAN1dAmFlvQ05LNjLd42tqghDDGO2CQLOgtZ9mJ/t8XJs= X-MS-TrafficTypeDiagnostic: AM2PR04MB0755: X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 20:NY3oachd9cYvg26iWjhR8nUKCJ2AL9wIsaDHj69k+JUb5gOEI8iCvHwm76KocYmCxpuzBlhyq0yWRd+hkWaIwW97ztK7MmfMJNZNg8doVGg2rRnKD2kLpf44EdMZCs0wetFjhlAq8SNAr5XX+VdSMMgmGdWYqCg0w8EMVhUnStzurCU+IyEr2LevELkzT2rhfMdEr5KkRBYORaYmoOHC1Ta5hs30VXruI1o9JOWziTxC7xITfL7yHv5EHsyemWErLcC7GFtTUfJ2qaJM7+pNNXHpZz19N5vl5zqH9Bq0RDBm0NaOLSZctZIFZEEXV9/7bwNa9hnwF9CUPlkclAWJH5nFa57QkCdDCQT/x0wnNu1k1HpiAK5yh1m8h1O7qSygGN23r6zs4pcvTiws2n7sGcnRKInCW2uiKwRfv24/mOwCwviCVVYiS+u6Jf3+UyuBYwHKFS6cEN0Aiy7wcyhTX7qgdOuozYL3JSrv9ltQIQvJ5Yh+0mdfKf3oSg1A6oOV; 4:lXuxOraKFr/9xnGXjZO6yeRRxVYU3JqqF+KxpyLbT+bNfJ657akaIiE/9absBL9rJE/bGVocXUWI/yH9/skeHWO1wMGY2y6b6Ssqc7tCske1h6xDIZ+A+xjpecUb35+DoyVHEcNN2QrDMn8Jr4uR0uZ1tnsj/5moJ2JIquXPfAMKN6+QP3RnF8ZKP0TZvMP/75GQxqZRnUGnvtQOk4fxTfqgRr1u8kuUHEJT6MOTIgYW21Gxspqg3uDCIuzeDJ+QVaVsa9IrDAmzRQi6m1X2nkmU3G0ZJ/jZsBFR0RVRVSqzVLx4HERVKwwXsLZHPEtG 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)(3231254)(944501410)(52105095)(10201501046)(93006095)(93001095)(3002001)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011)(7699016); SRVR:AM2PR04MB0755; BCL:0; PCL:0; RULEID:; SRVR:AM2PR04MB0755; X-Forefront-PRVS: 07106EF9B9 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(366004)(39860400002)(346002)(39380400002)(199004)(189003)(50466002)(6116002)(6506007)(55236004)(76176011)(59450400001)(2906002)(6512007)(478600001)(51416003)(48376002)(52116002)(3846002)(2361001)(186003)(26005)(16526019)(956004)(11346002)(97736004)(2351001)(5009440100003)(386003)(446003)(4326008)(8936002)(8676002)(476003)(486006)(7736002)(81156014)(81166006)(305945005)(16586007)(6916009)(6486002)(105586002)(106356001)(2616005)(47776003)(53936002)(36756003)(50226002)(44832011)(86362001)(68736007)(25786009)(5660300001)(316002)(6666003)(66066001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM2PR04MB0755; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM2PR04MB0755; 23:lbOHOBS2oiLlNowlb/Bt12YZaNJURpgIIxVeyuarC?= /hvj2qcsRuOANHmXuHExHhkTPeEy9EbccT0Qqlg1NWiFqBVKkJcG1r0AA/sHKlwYOAdDrdKGFckr2IqoDr6DODSjfxZCTeT1YAd2BqrZ2fcybCBmY72xEcwmcKvQdLIhr9P8z3utlMAyFR2jfyogL52N2NFVjF/kknYS0IiuSzTAc/Hgtun2ycGbDxiiS1gnh891efFiIOk51lwvAQJXKUlfdL4q6PTlhKhOdcuoQKYO8OikkwkfhEqOfztj8Jco+8AXV4LSzFY/qcKA1zc+VWfltHlbm1AuDRMfNOWPwFdFwbrepPuverAVn96b6uGKKJ+ITQN6/GaN5hU6Ogtve9iJbt97tQCXz5zMcKu1iGuREvvI1rJJNh1oKHK6AGudHKQ7vO8rDce9cifzF0Tp5/fJ8eic/AJOjOq+ngn0SV2xUp25dPM57t2l8MpPm0AHG4iqJqy8Q6ifw5mL+UA6QCFMZJlKvLh8wRA7+WmqYj/Aw0FRRnqmhaNhthLr+5aoC7ve6JoTXoODRqfKmMWQHuCZUC7sl+CpXUFoc9/iyrZt2R9gFoOQqVM6xW3xKZ61JAl1N4VxOyxEwguihy5fITeu/TSiGdP6UYWgnYzBqthe4ZwBtN4NeZ+7OTA5iM+Gl1mDl+qVCEhsw+opMaTUxl3Va0JObe0VE2+I3PEy2YE/XD57dIS2sAR6NdBUNXUSwkEkm0cyyTt2gRA+2KyQT1/4HnJYWo6FAUZnvJihmRB/RWkFBPWyjI9Q+6O8o6jzh7kP1hEaWyEiZTwTKNmghb2s03VIPaWLpOjSgnEO6nSNW14/IC54yzM5FxRjH2p8TwIgR9d8ki4U7Ud40vGxLGHFOuRQxJGnnlM3YQEu+Xv44X8i4NSxhZHwkPcAqYka30l+D6eCPLQLoM8iq9M9AAwH3naruButPK4AU1TTSb9WC8+MpCmc2C8epyi9ozISBksF7d0dVfwimGj1OpUeqWCYs2Tk7PyqlEfZA7WmZa+JyTdQel7M0vsU7JiEJZeqETb3B5PbOVTqj8l52ekIn6Q+AmNRi356LJ2B2BSUC2Trfzk6n4h1LvzN9q7ztDU4UlI6ZhXfinJc4977RCMtIOYYOAdY2wpH+lbDV3f5JUmOSgyqBISqRVW+OVzvOj+gx37bv0iQ48tUIeON232N74yXKYGUl+LVNAeGtpX81IqUX3TrCCHePJpuQwgCeuaRLsp5E6SDc/aaTPWysYS9+WgxGKoVXQTpXZ2H9kpYeSmRs3pOVLTBCaQAYkQ44KK2OkZjnbI2A4AurXqO4iujtQ2 X-Microsoft-Antispam-Message-Info: nKmGeSkC74OhJmJBCzCcyR1eq4MehKsRbzEiVrNpUBS74UPpP5xCp1UA0PR3+atogOqmcbVeHM0mEgVVueyGcUWKvyL2LwMfkEBwNAYX7tw94aZhlymrWT/3tzxMUaUd14S8NtaPzSGEw0Jf4W+l/twTXiJNAMPWEvh1JAweoMIp/cP6ZCB2/A2EbyA8zCn/JrBUv9MGyuTdFF29ls0OSlqYXhW/oqDLtTviFF77LGf3uQpSs+pQH8dORbjFZF6FNHnz+Yf13mzrYuWy4w/AOO1Ab8YyWY8zQGM3oKYuX7YzRIpG1ci6FOwl0XCKwvUkdpPYwYZTNz5VSFRtOCag5A== X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 6:RA8kyu/toPVztVYxLjwhLFVOPPROwCXrTgWDpHs5QqpyXGhRnOjh+wN5OAS4acIUILtwXY55l5pUZjKb7dkteE9k66C5kh5To2HP0Lbq07sCpIzRFxEEahy1cKgqq8Gh7/AR7p21JRhatS+1103gIjrsvYHe/eCK00fCxFy2jnAOPrYsK4eFdY+yAIv6AzXivM43DtU7KVDi8NuQsVfM0kzzVTydpXOLyEniYwpXaJMT2bfwslhDvGQRRWwmdfTbiYbTLEAkU+wk7/eWorVDSfeqN8t77VQISPZnoyDH0EK4SlhpHbQ154Az/p+wYXV7rXLRGiBDvofPILAnznRdLLHFENpt2KfP0TXCgCGbTXI1e474ClT34QYLdWDH5XsJzZnWFNT3kb6BzlDch7seflyFytAz0kP89U9J0kmmlMqbOpKJdvhEa5G/E+AKC2FJwsSWHbiZQ6064V9AfRfmfQ==; 5:WSXBQ8UFuaoIJK8zQz3uaHm/kSGIwA3BKpeCqV4vVZnJAGvVyrfYeAQC/Iq23bJwcYSYSqRv0rSLEzsoMS8F/wlhao+gcCiVbLaGsroyVylptCsIjC5TzXMCM2LEy0G62EWMcujpVqXzvnP6il8Mel401hetZkGRT3agJcMXByk=; 24:mqmZXm8hcbKny+/uHoleK49CytDiBiNSXOIMNB8bTfJ8YAgG4u0tuTSx1lay12Sel0ssyXjxZzbuyB/a5LmAdQrUb5Dkq7CSJnX0uRif0bw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 7:vRR9gUngEoR2tsTpqQPqzjSeayzFaaJsHOagDvk1RRQKchUTXhb5wU+b8eTWn9RCgJ/+CqDpIg0V/4t/0+R82GW9iHPLASoJxVY/wfEQWNI04yAxdMC4ghc1SGcLXCxi46W+kC0xIXVJ2gS1B9/OkynSrhiVuJvesU6NZsdLgNLStt+4R7X2I0pFnNUYT0VJdh6/WGzk3q1rgQAQddRzEPYO8U+HfOk/hl8Qb1oOx2jQIYuURc1rIUIbzzI2uOfA X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2018 09:45:45.7590 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ed949c94-641e-4098-c41e-08d5d75bc398 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM2PR04MB0755 Subject: [dpdk-dev] [PATCH 05/10] bus/dpaa: make vdqcr configurable 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" From: Nipun Gupta This patch add support for configurable vdqcr exact flag. This boost the performance, however this can give side effects for some extra packet fetch. Which has been taken care in the patch as well. Signed-off-by: Nipun Gupta --- drivers/bus/dpaa/base/qbman/qman.c | 4 ++-- drivers/bus/dpaa/include/fsl_qman.h | 3 ++- drivers/crypto/dpaa_sec/dpaa_sec.c | 19 ++++++++++++++++--- drivers/net/dpaa/dpaa_rxtx.c | 18 +++++++++++++++--- 4 files changed, 35 insertions(+), 9 deletions(-) diff --git a/drivers/bus/dpaa/base/qbman/qman.c b/drivers/bus/dpaa/base/qbman/qman.c index 13c4315..f5fe5ef 100644 --- a/drivers/bus/dpaa/base/qbman/qman.c +++ b/drivers/bus/dpaa/base/qbman/qman.c @@ -2002,13 +2002,13 @@ int qman_query_congestion(struct qm_mcr_querycongestion *congestion) return 0; } -int qman_set_vdq(struct qman_fq *fq, u16 num) +int qman_set_vdq(struct qman_fq *fq, u16 num, uint32_t vdqcr_flags) { struct qman_portal *p = get_affine_portal(); uint32_t vdqcr; int ret = -EBUSY; - vdqcr = QM_VDQCR_EXACT; + vdqcr = vdqcr_flags; vdqcr |= QM_VDQCR_NUMFRAMES_SET(num); if ((fq->state != qman_fq_state_parked) && diff --git a/drivers/bus/dpaa/include/fsl_qman.h b/drivers/bus/dpaa/include/fsl_qman.h index e4ad7ae..b18cf03 100644 --- a/drivers/bus/dpaa/include/fsl_qman.h +++ b/drivers/bus/dpaa/include/fsl_qman.h @@ -1332,10 +1332,11 @@ unsigned int qman_portal_poll_rx(unsigned int poll_limit, * qman_set_vdq - Issue a volatile dequeue command * @fq: Frame Queue on which the volatile dequeue command is issued * @num: Number of Frames requested for volatile dequeue + * @vdqcr_flags: QM_VDQCR_EXACT flag to for VDQCR command * * This function will issue a volatile dequeue command to the QMAN. */ -int qman_set_vdq(struct qman_fq *fq, u16 num); +int qman_set_vdq(struct qman_fq *fq, u16 num, uint32_t vdqcr_flags); /** * qman_dequeue - Get the DQRR entry after volatile dequeue command diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index 06f7e43..a07869f 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -526,12 +526,25 @@ dpaa_sec_deq(struct dpaa_sec_qp *qp, struct rte_crypto_op **ops, int nb_ops) { struct qman_fq *fq; unsigned int pkts = 0; - int ret; + int num_rx_bufs, ret; struct qm_dqrr_entry *dq; + uint32_t vdqcr_flags = 0; fq = &qp->outq; - ret = qman_set_vdq(fq, (nb_ops > DPAA_MAX_DEQUEUE_NUM_FRAMES) ? - DPAA_MAX_DEQUEUE_NUM_FRAMES : nb_ops); + /* + * Until request for four buffers, we provide exact number of buffers. + * Otherwise we do not set the QM_VDQCR_EXACT flag. + * Not setting QM_VDQCR_EXACT flag can provide two more buffers than + * requested, so we request two less in this case. + */ + if (nb_ops < 4) { + vdqcr_flags = QM_VDQCR_EXACT; + num_rx_bufs = nb_ops; + } else { + num_rx_bufs = nb_ops > DPAA_MAX_DEQUEUE_NUM_FRAMES ? + (DPAA_MAX_DEQUEUE_NUM_FRAMES - 2) : (nb_ops - 2); + } + ret = qman_set_vdq(fq, num_rx_bufs, vdqcr_flags); if (ret) return 0; diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c index 805bc30..168b77e 100644 --- a/drivers/net/dpaa/dpaa_rxtx.c +++ b/drivers/net/dpaa/dpaa_rxtx.c @@ -560,7 +560,8 @@ uint16_t dpaa_eth_queue_rx(void *q, struct qman_fq *fq = q; struct qm_dqrr_entry *dq; uint32_t num_rx = 0, ifid = ((struct dpaa_if *)fq->dpaa_intf)->ifid; - int ret; + int num_rx_bufs, ret; + uint32_t vdqcr_flags = 0; if (likely(fq->is_static)) return dpaa_eth_queue_portal_rx(fq, bufs, nb_bufs); @@ -573,8 +574,19 @@ uint16_t dpaa_eth_queue_rx(void *q, } } - ret = qman_set_vdq(fq, (nb_bufs > DPAA_MAX_DEQUEUE_NUM_FRAMES) ? - DPAA_MAX_DEQUEUE_NUM_FRAMES : nb_bufs); + /* Until request for four buffers, we provide exact number of buffers. + * Otherwise we do not set the QM_VDQCR_EXACT flag. + * Not setting QM_VDQCR_EXACT flag can provide two more buffers than + * requested, so we request two less in this case. + */ + if (nb_bufs < 4) { + vdqcr_flags = QM_VDQCR_EXACT; + num_rx_bufs = nb_bufs; + } else { + num_rx_bufs = nb_bufs > DPAA_MAX_DEQUEUE_NUM_FRAMES ? + (DPAA_MAX_DEQUEUE_NUM_FRAMES - 2) : (nb_bufs - 2); + } + ret = qman_set_vdq(fq, num_rx_bufs, vdqcr_flags); if (ret) return 0; From patchwork Thu Jun 21 09:44:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 41354 X-Patchwork-Delegate: thomas@monjalon.net 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 5C52A1BDEC; Thu, 21 Jun 2018 11:45:55 +0200 (CEST) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20042.outbound.protection.outlook.com [40.107.2.42]) by dpdk.org (Postfix) with ESMTP id 85C0A1BDCD for ; Thu, 21 Jun 2018 11:45:49 +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=7N/KPdEWO51AJZX/Q++JYfWhSkA+gu8/eQTXbDBNIoA=; b=U+ZBq3LmtOO1pVQWGJVryiiu2qltO34wI/3j/D5ajFwGgvrnCG4tGFgcP+uov8YjNC8lbLhOznq2Bez5S2KdQI3nYN0wlnxfBdMBZXuu2jaCfr7O1t+xwE8SmxFKOc9vwc8LSOFjXQK6tX1jP3XD8FMVzGU+dQTlAZP9C/aWxcQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; Received: from bf-netperf1.ap.freescale.net (14.142.187.166) by AM2PR04MB0755.eurprd04.prod.outlook.com (2a01:111:e400:8411::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.16; Thu, 21 Jun 2018 09:45:47 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: ferruh.yigit@intel.com Date: Thu, 21 Jun 2018 15:14:00 +0530 Message-Id: <1529574244-18997-6-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> References: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0035.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:1a::21) To AM2PR04MB0755.eurprd04.prod.outlook.com (2a01:111:e400:8411::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0f517316-2335-4065-84a6-08d5d75bc44a X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(5600026)(711020)(48565401081)(2017052603328)(7153060)(7193020); SRVR:AM2PR04MB0755; X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 3:Q50VmUrUxpbUR9BgqaoJz6XwXd4YScbZa155CL6OxPvjKRhJHxKJwbWExWCkaRN50/54Et5J3/g6VCQGqPGP9r0LI0uMjLIXYrZbf3XM4oPbsaiDz1xw3UzzSdaE7UO6N891e3zqm4nEM+pOTatFy+KnYHWxAHrDgYOW3LNcJNDaWTHc2lri1TwauoN+vUmKaR7oWj65wMiGi7+fePe07f28BSgnldstwkG+nyaDyzrx4usM04DKgCqrrB7dgnhB; 25:kgcKB5K+fB5Pd0IIiy328YYgJFe6giKM3hj/FXVkYiGIWzEm/cQoc2SUj+EvXJnqHA1SQEdeDI639+/MNu0u59AdwJIuveWwEMHKexeX8yx7x7J7o57DEDVT8X57uvXdt+mbKDkZBA0Wp14HxA82dMiAjSPjF7AaEjYtXzezctcBbyDuIdHlHhy6rfmwdLRu9GYWtiXoX1fDlfk2pkibwP2r0bTcnsgG6TjrBhr6EWI3z5/aYDelC0Hs54hOzArLtl73M24yedcjxFKfrsQFhHRXnkZThBInbkk7yBZEB6eAGLcLFRqMZZSF7TI01fvoord0cQ6wz7QSlL6urbGrTg==; 31:om35WF9cg+Oi7VXYi6JH2zom4okgA99u1DxCYSFKOqhJaS8Ma89wl4KHVRtt/AtqeD0E67eRdgLjF/hyMXcCz7U+b0ZrfwtzvAdAgHQTwSb+5PL8eA5bwiKHd7ssvq5kB/ABiBjivCP+g4S1JudHrK1gmgOn1X4vPt4m0d1Xj1NpOB1p0a6VMh3Q1k1FlJRfcIpS6HB/1eTbd4BtmGH2hEzhRk/IATjoQCPO2cVz8Eg= X-MS-TrafficTypeDiagnostic: AM2PR04MB0755: X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 20:F2mi1nnV5KVNsrfkYr+DstK9DSfI4QD65g4l9PppB4TYGihDwSVQ2+GTHSKvsR4WBh2E32XmaMRJpnir+BnbdFAMmZLj6Hbp0jpRNPX01MCE3+jvAtPI2hGIP7KqhLD+0jPO5xEvayDOUPcms4dsOZD3bGqB5K1dZwcXap5inymbYmXI8NBQ5Nn+MvLL9qV9UNwGWOSigHMnABLWSfSLuPrYO2/mwrrC+nLBOC+9R42up4Qy+RYM4Dt37/y0kFrDEYp+itvzBg3+ib5sa6BieAAmILBJulBjOXy9nSn1SZbplvm1jRc0pAOO9FBEhiJiWwQVSGZAOBbDLNMNuXioVMRfe3A/MzRb0sm6eZJUEn0SKJ/FyuyiQMerSQvudy0zvaL1Z/GOMPd0cCXnLXsKUbmvmRND2uYGRXqEY43REO8A5pw/nNZQFjgBieS6XX0sfxRBiXfQMY3kygcrbqmZ8qD02j1qjvshvHVCTHDJ4zRKvs/dDm1DefEGBE40y8u2; 4:H50UGKMlLm6A6ElCny6y6gRNQH0GMe4vDFuJOCuV156AeFJn6ie+ZMaTCZ7rSF9CPCNpjm429I5mzoso+i0tckE4YVd67NiXOX+50o7kBoo15r3vxZRtmW6J3QSclDhNWfyECyMEP8IaFo6DxSw+weD3PLlhlT/2nOio9RFU9ZVwkAoe1zTes51J+apuqY/pp2ANYaEHAdZ4hg5ESzEDeeXW+XLTwQMeKtr/+cpJSg+yS/XTGQm7yeu7frZOyocPn41y112FGgAG3RQvj6uj8Cajx+tgpxP/qoYfgky2Jjqy0amiySfaiNnXjBNdtfLZObgXYDP7A/Uq8++uv9xWG8cQs6YVmfMGq3x42m/7ybI= 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)(3231254)(944501410)(52105095)(10201501046)(93006095)(93001095)(3002001)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011)(7699016); SRVR:AM2PR04MB0755; BCL:0; PCL:0; RULEID:; SRVR:AM2PR04MB0755; X-Forefront-PRVS: 07106EF9B9 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(366004)(39860400002)(346002)(39380400002)(199004)(189003)(50466002)(6116002)(6506007)(55236004)(76176011)(59450400001)(2906002)(6512007)(478600001)(51416003)(48376002)(52116002)(3846002)(2361001)(186003)(26005)(16526019)(956004)(11346002)(97736004)(2351001)(5009440100003)(386003)(446003)(4326008)(8936002)(8676002)(476003)(486006)(7736002)(81156014)(81166006)(305945005)(16586007)(6916009)(6486002)(105586002)(106356001)(2616005)(47776003)(53936002)(36756003)(50226002)(44832011)(86362001)(68736007)(25786009)(5660300001)(316002)(6666003)(66066001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM2PR04MB0755; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM2PR04MB0755; 23:KbAD/laiYP+svaf8O7Lxz9A26GWFeogq358qh4Jah?= Tj/oyN7PPjsvIchsZwcRH46/Jwb42AihEbptzXZVpo84q0Il9+tilxCrXwLP+oCMBWRyyq2+2LIs3p6AUnWru3cNin81pP+Im3QuVjKU3HabxfVcxE2aV+H43dIeR/rxhiT+39pxfvd0teMuHPupDn+zY+3Xjc7j6XCszElhIwD3/wT/elByZQiZ2HPEez2c9FGjz1eWLAHDGVT/JQD5biSx5wAkcS4rkVqLF7s3kb6cv2g/76c93tAoZ3itL6vV8GgFYBGetfK58bbwzjNTh85xwakQIgKfb6d9NNx/jp5p+mcCbox1mLj7dKTOSxyYwMRctaPDdrnxO/5pQKSaWz49rAWZeh5n43AOEtW5309Ri5RvLy9xo+gkJyOG3PM1JeHdClDFaZp5Av8fkKDjAn6U+IEwu5ueed2D4u/K7FOP2izaHhBjBOKBSYFmWICGDUpBQWG2leOlGn+ip43hUF7Ps6b/HwyV077AzqKMmrA2RMNbZsoCT9t5VxydURhGl3cHywskMrTDt2eApts8TD5QOWcrhugafSrMPJav1fcIoFmvCIOLFfoUI6i6p++1GktP3KNDe8ckofFDwH92KYNIPsIdpIR3TXgbjJU9YbAJIXsRLJQxbk1/MYZX23V4B6yvu+0pBJ3Y+QnWxgBYvSNwQwpoYppu6RZsDO7pFFV5DpUe1l7K4cRJg51+t4r6YxOgAqCb8NWFDC5YIAonEm5b13+OBWdXuhVzyRUDKlezNuXxuhUmZX2lJ0rpvgnhrht9Si8P65gSte+KfWcM84IjkJGefgmou7rN77U2v74DWMmNbNk1PoD1cV/ZNz5tL9KBrYx3xVrz8kb5X6SIXqjSxVaV8TRFbiFToBvIOKF5iTbE8hlDZtThh6tRKZYdK6BYCQeGcMlsTpozcYV6HQi1mzra1fikIg1ZpLsZwmEsUQPvaiknUUZZ9FWxkplG04aEBkgWmY4ohudqQpuqlRvx0IxP6Cu3bQhGSrPquM2Q9SzqRpCv7bK6Xx0a/qxNbfZSMLcY60/HvyMtkS7AfBuR/d2qFNmeA+y7f0nriLN5Hel8exNGkF5aA5BgOvRWqNGu2SpeuIKUJTznRUckAuvOn78a2htL1FqejfcnWx2t+WFKWBYJByFvkcGWcp582DuxaQYXO2X6kX7PLpPThOEFmtlPdVm7L5NbOK5fcJn/RPJ8AsSOgNnU2/Qsz4hp+ec74O/OE/KmcLHS8y1yy5QE2pnmKuwGnbGJZP6iXvmT1fJT8iEf0hrh5TzLNaTEOfMN91k0HLwPSoUOlJK2Tkd X-Microsoft-Antispam-Message-Info: pf2EsPBQaT7aj//GCqwcju9lnUMhbzmn6Oiub2oit21WVL5/4KIdJx82bbY49Dnh3jAUTjjLHv3TVNBIZtWQrksXnyOLtT8qHc28280E2KrJSxc0/WyMF3RS2I+kivBiEPOul33kTEFqQmq1asVTQt4vLCBr/U/xBAL+TunTmXE3Wcdvvn6Vkb6tpNStQpjdccy38zld/fm4HFSPheb3IV3yEjYi49MF5Ichi6ur1BlHFxwQznU0TFosunSuHh34TITuUi2MXCkRBxdnyZsKViS9UVswQSc2Ma11foc1ws/hKs5MlnzFnD8kk9oTkPOk4fOdG3+vqClZ1RrbKH2yHg== X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 6:nQ/xPxwmoyiobPu9LtbbaUl8ITZlNCDGBieh+s2wJVeLe/Fflivb9V03ai/J8yaUPoKlHm9D8FWjsFSKDPCvixkMYJ6kxJXr5HIKPOO0WjaQXlCbT3neVov49lpnUeGd9iTenIZB2pqm0atL2m7/7xRI+00Ux4J95YA3nKQY8kjF14JE3zwHXC9ZZCPPPYGaQbJjo6Q4iCRUnj0Iw/h7Pz3aechxiQ2VnihXAWcL74uAfgUv3mKOexmYOYbFaaoiwPxPEJDC8mufXsjQmSBMs/4iDEdT9wcdWrvxvlCOprm5e7NQiq7pcQoYL+0uPUlNP5MVYo+/ScXYC+qBILasycFmzz4H8h6n9+EF9FWK/1GpZD9S46qOWG3YKb13q5Ow2IfPCLrzKSU3lmde0kDMP07lRScM9BCD6BiSOYQPHkXd4mk0Ym8aWjrSPGTxvBLcKjW6qpmPUQwKTJI1LgJSlg==; 5:aWeVmiSJS5hkFjoPMqw+sOtL6WYwZYV/d0ZrM7/w6uSsKYYkpljMvpiNbZKDjSThUXV/zQypDjpe2Y78KIuIzkWKzoEp9xvvGfx9upCMg7bZMuQRpW6/2tHX5NV5UF7bRipagur2jHPbL5lJt41NcgCfKTruNAWebQJ97L+OR68=; 24:zxDOrhkxjLvhhtEYkUl4xEmfUuHYGqgLKtJrZ6mcJ8JoLMCgINv58UwolJwToj9CFxrJw1Fe1EKcjtwDW/gDSpiji/qC2wExk/e8xKWZ+0o= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 7:7emCNpInonmqHbs6zqxkyFoiMvgAOeXb1Yg4RMhlBT1be1M/ip4nsFBQplllOMRE1wVRa4s9NRUnVP57cP0Bof/f+5GMMf6ErBF/xLhHgprI/Yas5leGaPcwuZDhalQ11DSKQrWzUwaVmIruRzG3VNdWkv4/jWsdQeyjmhtKCJ96ezH7Npe1IjQS1VYKwDeXWNplzxHf9Efb3RyegJZfzWysYukTAxctZITcZE69u8ZXYt0kIf7BIF5g7M3R3H3/ X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2018 09:45:47.0781 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0f517316-2335-4065-84a6-08d5d75bc44a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM2PR04MB0755 Subject: [dpdk-dev] [PATCH 06/10] net/dpaa: support default queue mode 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" In case DPAA FMAN configuration tool (FMC) is not available. System can still work with default queue. (1 queue per port). Signed-off-by: Hemant Agrawal --- drivers/net/dpaa/dpaa_ethdev.c | 43 +++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index d014a11..cf07d25 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -74,6 +74,7 @@ static uint64_t dev_tx_offloads_nodis = /* Keep track of whether QMAN and BMAN have been globally initialized */ static int is_global_init; +static int default_q; /* use default queue - FMC is not executed*/ /* At present we only allow up to 4 push mode queues as default - as each of * this queue need dedicated portal and we are short of portals. */ @@ -516,7 +517,8 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, PMD_INIT_FUNC_TRACE(); - DPAA_PMD_INFO("Rx queue setup for queue index: %d", queue_idx); + DPAA_PMD_INFO("Rx queue setup for queue index: %d fq_id (0x%x)", + queue_idx, rxq->fqid); if (!dpaa_intf->bp_info || dpaa_intf->bp_info->mp != mp) { struct fman_if_ic_params icp; @@ -715,7 +717,8 @@ int dpaa_eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, PMD_INIT_FUNC_TRACE(); - DPAA_PMD_INFO("Tx queue setup for queue index: %d", queue_idx); + DPAA_PMD_INFO("Tx queue setup for queue index: %d fq_id (0x%x)", + queue_idx, dpaa_intf->tx_queues[queue_idx].fqid); dev->data->tx_queues[queue_idx] = &dpaa_intf->tx_queues[queue_idx]; return 0; } @@ -1008,12 +1011,12 @@ static int dpaa_rx_queue_init(struct qman_fq *fq, struct qman_cgr *cgr_rx, ret = qman_reserve_fqid(fqid); if (ret) { - DPAA_PMD_ERR("reserve rx fqid %d failed with ret: %d", + DPAA_PMD_ERR("reserve rx fqid 0x%x failed with ret: %d", fqid, ret); return -EINVAL; } - DPAA_PMD_DEBUG("creating rx fq %p, fqid %d", fq, fqid); + DPAA_PMD_DEBUG("creating rx fq %p, fqid 0x%x", fq, fqid); ret = qman_create_fq(fqid, QMAN_FQ_FLAG_NO_ENQUEUE, fq); if (ret) { DPAA_PMD_ERR("create rx fqid %d failed with ret: %d", @@ -1032,7 +1035,7 @@ static int dpaa_rx_queue_init(struct qman_fq *fq, struct qman_cgr *cgr_rx, &cgr_opts); if (ret) { DPAA_PMD_WARN( - "rx taildrop init fail on rx fqid %d (ret=%d)", + "rx taildrop init fail on rx fqid 0x%x(ret=%d)", fqid, ret); goto without_cgr; } @@ -1043,7 +1046,7 @@ static int dpaa_rx_queue_init(struct qman_fq *fq, struct qman_cgr *cgr_rx, without_cgr: ret = qman_init_fq(fq, flags, &opts); if (ret) - DPAA_PMD_ERR("init rx fqid %d failed with ret: %d", fqid, ret); + DPAA_PMD_ERR("init rx fqid 0x%x failed with ret:%d", fqid, ret); return ret; } @@ -1071,10 +1074,10 @@ static int dpaa_tx_queue_init(struct qman_fq *fq, /* no tx-confirmation */ opts.fqd.context_a.hi = 0x80000000 | fman_dealloc_bufs_mask_hi; opts.fqd.context_a.lo = 0 | fman_dealloc_bufs_mask_lo; - DPAA_PMD_DEBUG("init tx fq %p, fqid %d", fq, fq->fqid); + DPAA_PMD_DEBUG("init tx fq %p, fqid 0x%x", fq, fq->fqid); ret = qman_init_fq(fq, QMAN_INITFQ_FLAG_SCHED, &opts); if (ret) - DPAA_PMD_ERR("init tx fqid %d failed %d", fq->fqid, ret); + DPAA_PMD_ERR("init tx fqid 0x%x failed %d", fq->fqid, ret); return ret; } @@ -1145,10 +1148,15 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev) dpaa_intf->cfg = cfg; /* Initialize Rx FQ's */ - if (getenv("DPAA_NUM_RX_QUEUES")) - num_rx_fqs = atoi(getenv("DPAA_NUM_RX_QUEUES")); - else + if (default_q) { num_rx_fqs = DPAA_DEFAULT_NUM_PCD_QUEUES; + } else { + if (getenv("DPAA_NUM_RX_QUEUES")) + num_rx_fqs = atoi(getenv("DPAA_NUM_RX_QUEUES")); + else + num_rx_fqs = DPAA_DEFAULT_NUM_PCD_QUEUES; + } + /* if push mode queues to be enabled. Currenly we are allowing only * one queue per thread. @@ -1196,8 +1204,11 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev) } for (loop = 0; loop < num_rx_fqs; loop++) { - fqid = DPAA_PCD_FQID_START + dpaa_intf->ifid * - DPAA_PCD_FQID_MULTIPLIER + loop; + if (default_q) + fqid = cfg->rx_def; + else + fqid = DPAA_PCD_FQID_START + dpaa_intf->ifid * + DPAA_PCD_FQID_MULTIPLIER + loop; if (dpaa_intf->cgr_rx) dpaa_intf->cgr_rx[loop].cgrid = cgrid[loop]; @@ -1391,6 +1402,12 @@ rte_dpaa_probe(struct rte_dpaa_driver *dpaa_drv, return ret; } + if (access("/tmp/fmc.bin", F_OK) == -1) { + RTE_LOG(INFO, PMD, + "* FMC not configured.Enabling default mode\n"); + default_q = 1; + } + is_global_init = 1; } From patchwork Thu Jun 21 09:44:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 41355 X-Patchwork-Delegate: thomas@monjalon.net 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 CEAE11BDF2; Thu, 21 Jun 2018 11:45:56 +0200 (CEST) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20084.outbound.protection.outlook.com [40.107.2.84]) by dpdk.org (Postfix) with ESMTP id 7EDB21BDD6 for ; Thu, 21 Jun 2018 11:45:50 +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=OtCRM+cdU5A3OUt2DrGvEZfaBzpN2bxAi6w5tY3DbJI=; b=QCRTzSlUTXR7TAyvICF22tQXedkBcD+zZTgY4ZUKBQxXKWa4vb5DRUZ1CaskDfO576lX7y+SelVnLH/C42eP4N8qIUWDQSGvbpnM6mhwc1EUJyEP8z+SPUX6gs48D7rXQOihSUfWNDCMNjAWpqK/FuQyfdenxo7vcMsbMRbQXGI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; Received: from bf-netperf1.ap.freescale.net (14.142.187.166) by AM2PR04MB0755.eurprd04.prod.outlook.com (2a01:111:e400:8411::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.16; Thu, 21 Jun 2018 09:45:48 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: ferruh.yigit@intel.com Date: Thu, 21 Jun 2018 15:14:01 +0530 Message-Id: <1529574244-18997-7-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> References: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0035.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:1a::21) To AM2PR04MB0755.eurprd04.prod.outlook.com (2a01:111:e400:8411::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4ede595a-eff7-4487-d8c9-08d5d75bc4ec X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(5600026)(711020)(48565401081)(2017052603328)(7153060)(7193020); SRVR:AM2PR04MB0755; X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 3:mEuLyfkJpDjYtyTnaHS0VdIWDL2ztBARfVd4Q333CfWIHjJh3QI3WRx0AaEqaui9Sk/gELVsuBQ0e6qfXHhdwj59R62Novvy0I9+6C+oZHdJNEh1pkLQFT3Wx0BiWB3Zlr0mR/af4FK+40QzFezkmL+LczH9xJsXD13STKhU6urwOn4LV7kIw98h9dB4wUGTViMUA5Hoi8cGH+y8moMhi6/hNlR5mqTGdjlRgCpjf4D57c4enj48hWwFA1I5xrQx; 25:JtOlWTx5Abf2n1jgD0AJcjjBLdQNetNHupL2eJEkgc+QT1Czy1dLO3iwcaOAlGNnfvWRY+UyO6AFGt6ex29P4WhUhsdAsqVZTgPBEiMCwEqrZuu7cDit1CmTpnJRPlVN+SVSd60+pj0sGXRmLSm5wneWhVeFQQofc5CAsiXZLVx2KoVJKpgILLisBS4x5GSolJiG+ZpzU/2j1Tx2BD7+IQxYBB/q6j3d5FQm/1DCoEbBL5mSdsbZvfJmd1jV00KP4ZqZfcKv1i9L4lp7deIwSuVu8IXulSkHi0hIcj8CHeXxoQRRJhXx32wvzyAVcQ03itql8R9KBJTigM0CiVD++Q==; 31:CZFb4q/c7pA3kkJ6pkf8w0O+eAjF5YKINbfC7GDa/LcRqsSA/BwvJRrcE7S5+LMvplV8FcWjIY6RkDh5XlDD9omKH3pTLvtlDiWXA4wFZWdIneb8XbZvEY9l2jVPG3rjpeyo4NJWz4sPTzMEetSrxp1MdT9pV15f9XwvNLntB77c6jtVG5C57eanosV4Pd5Qirc/D9UsElRs8KwrtqC9IPoGOoR9VCTGfcQpPQJLQDY= X-MS-TrafficTypeDiagnostic: AM2PR04MB0755: X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 20:ilWS+KA3O84Vn7ViP3Gduqi9tnFkH2gDcrPV6EimMUMFd5PvVN1RDqfKd1lPuEc3+mnd+5wuqvzn49INXzCaMtnTVaYsVUk/YBe0MnHcfq2SQt6mOXa1yWcSibcixgbIYGf84uwm6BPbx4ouFaePh9WOM+Pdlg7Z+qZwBc2rvzmFwyJY1aLqLZ6WWtlVY5oKE1VldofIUHDUwb8X3BZlVNSkq6Xd/RKQBbJb8PvQUd5iZh4AADRmWkefofYoUbp0h+meVg24B5gnXbuj8GZqnMuYTtbPF6Um3VxSe5czibbCcl+cbAfAhukIddULuFMnpLgPHsOyQSrch6/EGTxqGpIRDMJ5wLSHdMvtYWwPxO90jhLLy+bfTYqNNj1dA7fUXyyTacTbLwAMU3ffURvDq/pwZ5RVmD7O/Lh4qhXMtjiHZ7THJPlm/8aU/JkpJulTboUwPEN/sdOg5Q9bUzmEFsYAQlBXCRvwUK8oK5jhz1BwiUvrV5Z7LYKdrKbL7cDI; 4:LZT2/kYWiNjewoefWh4/nmWXdIQD3NJS7jdu4bu/b7g1+etv1i/GXLeVpcnr+JVd0qzRl2ASjWO53M6QUGgWOvJGg2TRqDv5SlBUkz1HZkGRxtTDT+w8T3nSGpvKA4ed86D4rmMc7lBbLr8fVMWstdqUIRRk0HYHbsNf5wulqx9oi1KC6X/C1vYxuekh1+lXtLQFcfnt4GhqDV8LgIyQ4rhDJadcUFSV17ShG8sVgfnTkcYG8tiYFXQwE+yeCN+aMgfzEVHJVDawijaL48tkFPO6Y3IJMj75t89dheXgpDhGBVV5UfwV1Jh5sqRwW+fg 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)(3231254)(944501410)(52105095)(10201501046)(93006095)(93001095)(3002001)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011)(7699016); SRVR:AM2PR04MB0755; BCL:0; PCL:0; RULEID:; SRVR:AM2PR04MB0755; X-Forefront-PRVS: 07106EF9B9 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(979002)(396003)(376002)(366004)(39860400002)(346002)(39380400002)(199004)(189003)(50466002)(6116002)(6506007)(55236004)(76176011)(59450400001)(2906002)(6512007)(478600001)(51416003)(48376002)(52116002)(3846002)(2361001)(186003)(26005)(16526019)(956004)(11346002)(97736004)(2351001)(5009440100003)(386003)(446003)(4326008)(8936002)(5890100001)(8676002)(476003)(486006)(7736002)(81156014)(81166006)(305945005)(16586007)(6916009)(6486002)(105586002)(106356001)(2616005)(47776003)(53936002)(36756003)(50226002)(44832011)(86362001)(68736007)(25786009)(5660300001)(316002)(6666003)(66066001)(110426005)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM2PR04MB0755; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM2PR04MB0755; 23:nSSQ8pWEfs+uXPMrdtTi4J4OQMlXLqIqRxyHjXHjk?= Mjx5GhzXNcotxghEwcijrF1kP/zQzO7Ud7o6ym1uZawSR7JktYl34SH+OyE8JlxSH9DYjagKKMa3K5WSrx2YH/2VhCBvJgJeLCRFTIL1Cp56zJOuc5BGg/dztWm7iiQDJ45rmZlA2loTKFv/016kUfFIpoK/MmEvMcmmWj7akfWyavU7KLwC//ldt7Xp2zyzLP0DnjGDNmU3CBQ2WzxcH6vqu0KO7BhtcJhQoUxVKAXjne14Ef5Dl8H+GPsGuO+MMGUvBmA3u7l4WasJlUNYiBMq5k0zxLOYzs7oaVKhZtvWCjapoiILu1rfengEsJXacw9Lhmz38zm0+DntjQlQzlVvrvinZr8uHpHJVfxf7gnrHldpM1EEFxvk3JROI2EF7agHabUccVoAZpB3ocyr57lmN2TsqpVeWZ1cI9/DynZCtZP0MEXgH0RXTRx2JnJXBHYq/wzB8Pg85katrlpOTkmO+dtmf6oDYqmGdm2Alt6LrsiILq5jebKagYdzdGP8E/LeB8F+KSPhgj2puzLSgq+XvAT2Vd9t/ikI+tlruzD+VShBsncEjgyxw/F52upB9RRVmzEweIwI3gJ+uijTVDfJ/NuHYBaYMnb9V912eifkK6uAMwky3SLT9v1WcJZUGfJER0Tj7rS4xrgC5bjJR0eIunQQx0rAWVtpcx6kPKmjABuRvVAihcGuiHUUVybjeZmYPk1TXo+Wn/CkUGKcmkWpRJtD0KKaTy7Ao6PZLGs1M3hanJgoQB1uKYRfnh1Ac6LkB1yQaBNihPNz7g1nQ1BwU0HhyUKlxlwz4i/cqAieOhY4u/cCJ10nHsdLAZHBvfTAqEulRYQHzCYn0HM5Ef7EkgM21vMkU1bbaS4MAs5xJpdDwk+YS0wVJKgjvOpv43w3XUIMrKgI1/bBZPIsAmb0gjInPzJXFa1IwWwyoAUxVCCxjmljNulAVyipzjctKAEQi9LDPtrVFg8urcacLbXGo25JmzhtSzisqEfcNzzwtVQ9DPc/CNmqLO0IimHwxe9XtFjQ26QVb1i4WALfkQgO/5aZx2JAu1b4X3w2pBbg4GTAfxDBVUQgtzxPy78bInSjz5HKy/ebVruI6qeeIdqLsLeLl9s0/lZdZEMzRJQCmM9nH3nLMwVjhz4PkZkfIghVv50dNzkNwaq8cg/lBqsWG/lQTRgq39bKbEO4UDF0UwOgHo2pgkze/d9QqekkgQfVjJ9JZmPgfDCQXYkK9LoYODr4tto1et17q0LjuNvsERJXAr2TiL/EblGeSNuXnsrtbfyFnTGlzGHkweESsQ7XG053dEA8n88dE9MfXIdrhbXRFSelD9cvimee33eo8uKc8xD5J41qeWZUmttYfVOJ31E1loOK3OAFhAg1hGKoAD18ruZ1UtHwIRTaTbdNjSKa2bSs/n5bWojm+9qv3vj X-Microsoft-Antispam-Message-Info: 3RdSjYwTBp/50GHulkdmlk8rMyKl16M/El6NQ58kyPGqsTIQgI/jZQAd1rUFpdjnztgNrT48Num/anFd2vHCFydMIZYpY3E3vrUTp7xYbbVEZPkkbN/eLKa9mIcUTH9hvxANCnUeP4KF1xtStx4c2iBkXjlopL6a6HnxttlwuiBw5wAI+WsE9FWZsx4il//A2AtgnIBtoL35dTOXiFKlF9IsZS5FxXS0aJoR1kKP3NlHiAQFaZbgOVFzhdYVTOMVhXy2CUXwAgtnnw6gVOakCxI3+NWgbbobV8NiQT77j2o++LygQoSHDoXDlAsgw+j6AowlcyFJBfHIHamorZ3Vmg== X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 6:wOWzn+Le51qEV2HzGvdfBZdos6PTSvuGrd0EqXC+XYYFFlXM0PoyMwhrjzwM4r91tJgKcZjettIi/DPayTob8oyq3A6iOFtsVNtjM7WcvW1PyTKc/Sz+6ZQMvV79SDshGXrTFbKWYFDptohG8jwv+JiRAPjnQJ2ySJ6QV1Zmt9mF0AE8OC2j0q2y5St2MKdD0B+NSJKYXqkgME71nCth8XuCXJTkwOswPdQe+UsWdNYEkqIQoJit4d4vJSHYfiNoXuaXealY2ybtdGDeq2rD90FMdawYZj601VBK32PzTqFjsPRWLxP/9cSn1+ap0zFafrQitOLsYplVoAyDoLgEKj8ooreJDVUpD6K3PUDvUYX0nIsxLe5SBPr7pCP++1+ha4aomD7wvzNiNJuDEWyc/Pw9S7tMxzTtvqMxq8ETDjKoTR9g5gm3JYQ88rGTbooD17qDemF2Vj7+JipR2QzXIA==; 5:144hpNkOu/grxEIcL+D0GXvKI0DI7MK8myRkuN9g6E6gOh9k26RdVGqqWiieq7IV4PiVewTPGwQn7sEXUyA9ftHfq/xXp/+b7UaosesQZYF6E3F64vH3VIUD4mNCQLhQ5S5Sqlx0jhCPnrR0c2u9aEDDjF0dRsf/7UX5hsdwTdY=; 24:EbZ9gN6NO3PyKr/P7MtUp9uccJl3izbqvyjeKD5J40tj3jclG7KK/gyvDNNBwbNZHDZ0aoAK2POwXWAAB39f7qYdhxPQPlHGNQmScgoRZJE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 7:+pvoUt7PuRG10668e/gd9YGnVM8dfpt50APShGEC/4Uaq5CBksZakQEfGj2ka7wKGdslPkYG6vjHG6KltoDiOFFvZDUPL6q4Qba0eg9gqOp/41rgQC6bxHaaq2R4/O1v/rnZGNrQTvyXw7jkfhueJBDf8AOsXXk60bIQp6al+cBWgapcnBPzZRcMCf+x6DTDCVwDMnlUJVllQXCivrofCaWLuc6lf0nLcZKmYPfp8rGtWa4gcf67lqt+Jut1BRi6 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2018 09:45:48.1409 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4ede595a-eff7-4487-d8c9-08d5d75bc4ec X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM2PR04MB0755 Subject: [dpdk-dev] [PATCH 07/10] net/dpaa: remove experimental tag from PMD APIs 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/net/dpaa/dpaa_ethdev.c | 6 +++--- drivers/net/dpaa/dpaa_ethdev.h | 8 +++++--- drivers/net/dpaa/rte_pmd_dpaa.h | 5 +---- drivers/net/dpaa/rte_pmd_dpaa_version.map | 4 ++-- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index cf07d25..ba269a8 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -608,7 +608,7 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, return 0; } -int __rte_experimental +int dpaa_eth_eventq_attach(const struct rte_eth_dev *dev, int eth_rx_queue_id, u16 ch_id, @@ -671,7 +671,7 @@ dpaa_eth_eventq_attach(const struct rte_eth_dev *dev, return ret; } -int __rte_experimental +int dpaa_eth_eventq_detach(const struct rte_eth_dev *dev, int eth_rx_queue_id) { @@ -940,7 +940,7 @@ is_dpaa_supported(struct rte_eth_dev *dev) return is_device_supported(dev, &rte_dpaa_pmd); } -int __rte_experimental +int rte_pmd_dpaa_set_tx_loopback(uint8_t port, uint8_t on) { struct rte_eth_dev *dev; diff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h index 1897b9e..c79b9f8 100644 --- a/drivers/net/dpaa/dpaa_ethdev.h +++ b/drivers/net/dpaa/dpaa_ethdev.h @@ -160,12 +160,14 @@ struct dpaa_if_stats { uint64_t tund; /** /** - * @warning - * @b EXPERIMENTAL: this API may change, or be removed, without prior notice - * * Enable/Disable TX loopback * * @param port @@ -33,7 +30,7 @@ * - (-ENODEV) if *port* invalid. * - (-EINVAL) if bad parameter. */ -int __rte_experimental +int rte_pmd_dpaa_set_tx_loopback(uint8_t port, uint8_t on); #endif /* _PMD_DPAA_H_ */ diff --git a/drivers/net/dpaa/rte_pmd_dpaa_version.map b/drivers/net/dpaa/rte_pmd_dpaa_version.map index c7ad403..8cb4500 100644 --- a/drivers/net/dpaa/rte_pmd_dpaa_version.map +++ b/drivers/net/dpaa/rte_pmd_dpaa_version.map @@ -3,10 +3,10 @@ DPDK_17.11 { local: *; }; -EXPERIMENTAL { +DPDK_18.08 { global: dpaa_eth_eventq_attach; dpaa_eth_eventq_detach; rte_pmd_dpaa_set_tx_loopback; -}; +} DPDK_17.11; From patchwork Thu Jun 21 09:44:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 41356 X-Patchwork-Delegate: thomas@monjalon.net 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 8542C1BDFC; Thu, 21 Jun 2018 11:45:59 +0200 (CEST) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20080.outbound.protection.outlook.com [40.107.2.80]) by dpdk.org (Postfix) with ESMTP id 059F61BDDE; Thu, 21 Jun 2018 11:45:52 +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=pZ2GAnx77W/FRW6xRRiWNQx3G3XSFb3aJGvlEkuvzy8=; b=HI6u9Rpjm1TSGA4Df6lVugfdKAtl7AJfkqdU0D3ocsY+b7rXUg0Ou1O0eKVAV/g4ChaxFME2EFe0p0EvHe5cST9543NC/5SjCFfIJkzsi5Lm2FOugWxnIcvJ3lnvlqVIB9CahDNPXpa+SE5qTax0MetA+vRPCkam5ghoPasXlNw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; Received: from bf-netperf1.ap.freescale.net (14.142.187.166) by AM2PR04MB0755.eurprd04.prod.outlook.com (2a01:111:e400:8411::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.16; Thu, 21 Jun 2018 09:45:49 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: ferruh.yigit@intel.com, stable@dpdk.org Date: Thu, 21 Jun 2018 15:14:02 +0530 Message-Id: <1529574244-18997-8-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> References: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0035.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:1a::21) To AM2PR04MB0755.eurprd04.prod.outlook.com (2a01:111:e400:8411::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4c6333d1-758d-4812-d854-08d5d75bc5a6 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(5600026)(711020)(48565401081)(2017052603328)(7153060)(7193020); SRVR:AM2PR04MB0755; X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 3:jmbyigMTUUiiGfZi0bHkmPasoCLK290DfsrGs4dxLiT8ncTiGhD8OrhD5WgkhHJ9fRfgpbur3Shf64MFPJR7nSGORPM2ZRGMzKhoLK8nD0WjpoCEGsAjbQgSNCm+XdHzP+6sBt84l2pk9E/ZGiIQ3OhU1rKZQKy4uNIctvFX1RVwwwrzCFFcNYaXAaIsvp+ZiwvGIvuUB/XII/AUD29WGoJfpFYQJI0h4Y53MLaKmtuOjvOqcf2ou7Gqpns6/Vnh; 25:vtZPn8o1CkQF3blsa2JskEcUjbQv7gFONxAAtP1Q+Ix5PnmD6dJtXiCdBPsAn/5lOZ2YodhTFgjtR/WgshFCojNCHKyuT1XaKuMXGibBE+t8PIP1GNHhk0jL9dc6K7mjFLgGGdOpCtQ5QsFUS5dkGySIog1FVb39upA2lj1QsyoHZK0sJhqoNYdFoxMmM9MYr9BLKCvlVbD6i7kx0EbSiasklFWWZLivnInJ177KVaO419rB3vDB9A1jJhEYx004L4htnli2fZl3XyOFHPHiOHS0rZnCVqej2AdPoBsVX5p0s+hrrcQEFinoDgxozY4tqRFIKt4iqE62hWicaFKj4w==; 31:2Iz10DrfdGSPQAmhFIxzJ1s36LZfLgVRD02Xa/NENj7LUhWPSz/5POSTX3ilkXiZo81j9ngZWi9i0cauC4VjH+hh+ehreWEYGgvHqk4jp4kVz4OddGKMI9PUtBPCRK+h820aq300QhQ+ypoZytP/iw1Ghy0s1xLZyqWObD3IUb8xJdQi2V9EseED/12LJMQRF66IocHdXeucvcKCYsTi9z7p+YgcoyMh2plX/AKruWU= X-MS-TrafficTypeDiagnostic: AM2PR04MB0755: X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 20:F9/idkCAGbwtVjWLxOXOv1tkHAGG1VSG7CnUvhuskg3MEMvGK+EwzWJ1KNHJVj+kSXFwVcnHn9WGC284PmrIYJGHD6MP7cZhPISogxj/oZfwkVwsRg606x1Z0LYqezh5VW3wz/2n178FbazIkuGj+FchExE6mKimujd8MuErweeiuCzFGORqdQ/tEOdx74GlRnQmmkNQGkCV6ZNkZaKKz7op8Ciq1+J3izCrxTS86H+f7YkALfKrbL+wLG+CDTfsvraQmJHsBRxfn2FmdSFRfijPr4hqn7SSp4rx/jx0dz8XwmjXOlaupuCrKvADgKSdjXvOc/XmpTYQ37/DLsfJM5j0oJxQe/oCFLGpr+4cOHXrUHLFgvq2R9CI4JQjkKZqy45+HUtGf5pFAk7Vgv+upVVwhIpthL+ML2WbONQzvIveH98sH7Ai6uuDZti3RLoma6YD2qg/CuV7CVrWawvj6c1ywelbiaPbe8MynNgn+0h8y0WFpIVXT/PsnhmjWC5R; 4:fU3B6O1hmzdQeuRtSgzCrA0RGUIrh0dLt/z7aLz/aOeSpxFgBai8XfnMPC7QLkjZP+3nivr4VpxNnorhI38Y1074MRq0GpOAhyMkryWHfOE4qB8tM0CMbSl8qoNYvTmdLDPARW854NLFhjPRCF55Y1YBpNWwVilHH7ea/neCUbtF4inzSLCAXLVZmNX9+c3OYH0HUA0tvR/twpUaji+GPB4zALNImOwlybZFywA605UaFbQY/sFkHQlk12SCAEH0BssH+TCVVSA+Q+SQ39e0QH+DV0zZDTPFGTMDe2NmVfLVfTI6lGzleAA64pOUZqFd 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)(3231254)(944501410)(52105095)(10201501046)(93006095)(93001095)(3002001)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011)(7699016); SRVR:AM2PR04MB0755; BCL:0; PCL:0; RULEID:; SRVR:AM2PR04MB0755; X-Forefront-PRVS: 07106EF9B9 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(366004)(39860400002)(346002)(39380400002)(199004)(189003)(50466002)(6116002)(6506007)(55236004)(76176011)(59450400001)(2906002)(6512007)(478600001)(51416003)(48376002)(52116002)(3846002)(2361001)(186003)(26005)(16526019)(956004)(11346002)(97736004)(2351001)(5009440100003)(386003)(446003)(4326008)(8936002)(8676002)(476003)(486006)(7736002)(81156014)(81166006)(305945005)(16586007)(6916009)(6486002)(105586002)(106356001)(2616005)(47776003)(53936002)(36756003)(50226002)(44832011)(86362001)(68736007)(25786009)(5660300001)(316002)(6666003)(66066001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM2PR04MB0755; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM2PR04MB0755; 23:g0XHz50EW2P1barwIIYHzsE5qmEKlG+hFOd1fpBQS?= dhgKNauPWiAGZGtVMaGiyMEEq7WsQ1763ywbuOHtMAlZ8oWh4o+OxKcjne/Wi+BxxxRHHBxZFdxxcW1l2/jlDYZ1tmCdzfV/gK31v0nWBs4aNHCKxUiyzJuwwqeU/EmfSCQNbG/fN1jZWhvrK6LDPiZUa6+OuDbxg/nBa0tMDy/WYR0ExfJSg/bxnJvbY5hPSZ4bBqN2DKXjQ10zNZBhBaFkOEGgyzVn/97S9iy02kcVhr7BH85k+E5dGeG6VRH1x0jWtme7jI5VdVqGZ9YNC/7/xo7VLgtt1lK9dCnICYthxGEmCZxYd1iONBR9RIW5frTXcmQF4gnIxquyqRPoJCBI4BkI97AV6myAPn3V0IfQE+gjh1qseqCy/9LOpNa5vz2x/qQNy2aCgWYQRw9EAVHKAloY7nqlid1J+bBLNTZ/3DodbH4ZvencSBVsB4OufjvAnBH3vJp3ZbTpZZ5yiWQwbvpHtSlLAK0Ek6LGzPxvIu1pZ9sXpe9tqkY+6x/VQJc8RyxGz9KznuZolczfIyGTO/IvpbVksYkgb6b79NrOPlirT6wmXZetl+EGkUwNbO2nNvRrOelqyrei67KLpiB3ros+VQGL+ETPhpRyX0AJIG9FTmPcz85r+hEW+3ezmXxSepqOTL+8xCE/yBvqvrdpp4O9JJfkUp91dWLLY0SdWAV3FClZsfpjnI7tJvMJxmNS6QPWx8PrUINIto7iy3+pFubQx0S1RDNXAZs7wH0ChIMW+Cq1pCvxn12xiovkhcMhWCYeFOB06afCzanMhCe4GUMa5aUpIZ69kDkrUSrPdkmWMwS5FzxFAFfHINalk4S8/7WLxq99gLJ4k+jsOqIakOZjQ0AlnyMNoxK+gMm/NU/MUfNuCqgeUVy89rc8kDK6+z9rMvisQ3trwH5ChGM5CBv8PMsIohYahiuua1h6gdn3B6wVeM2Wf7cA7W6YQIOpbQGrVQMpwfoWKHOzSepbzUJT2ZQOZKbvIwS6qJxAJJsnxJ47pho40DbQO8x+DtqiiHX26NKTU6NHOvpfwepbDkmIqaI0Q6lk+YbkvjLYWe4/T3Kniv8mG/YwPXofsy8gPwzyx9+V1yfHId9pumHfLKfEL++w1clUYpi8vzDiLkhvDppRR/yUaFiupkRPlD2dN1FQ6a38yVjwmyNMxl/gxS5gNo6ciBJFwvKOb+X63ZzLyZBRQEJ7E0tHhcTxc3KShuTYw2MJhnbykGq9ShI82DAtTaSqkCYifUTB16vr2LCvEu6h4A0dEcC7MoXB4nJdo8zihphZ2g/SiQjsjfR X-Microsoft-Antispam-Message-Info: N2eCBxJkFmvyOmNzDC0/BrQau2yweuGKjVeu5P5gblqRlytc5my3h6eq4I2mGQn66UrmrsPosoIuVbltcJe0zvypQgfo0PrzCOcAbYkdai5RlGxHUgAydY43DkvMFgXAacwIde8JVmHYTp0PKFnNxTbShLcIz1QTwsAMDmMSSgtDNvDzRr2aGe+kkPGEC0Fk9Uk/z8R7VHjmjn/Phb3Gnrxif10r+fVXxfvfKKB6kxhRP4SXsGc7PXOpk44ztV6WuxQiPB/TJfHMf44g3D/nxxE9LaQzCgBF2CGachHJCoApbBB7nVxIoyUz4sutlMuEA0PARbktdmbVzz4VGwGeGA== X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 6:74Jk265aJYArMJYIJ4zPY5fVCqgef/FbSV94IjodMsT09iOKGuRsR9EkogLBancG/u0zrr2rGhdErmTcgQhszykO5Tnp8to6XYfS2SRG1THdznVtVtEq2CbKbeyhg15o1sY0mNG1yXLHqgZ6kNPPB3NDEs039PMsQWZFdG8NdTU20DQ+8SD2jiPJaELSDhrrhhkbf7E0KQco3ALvFT+7zY/Mwm402deN8fBtTRAgEIAFHLl1G2drsPnaur9e0cGN+ZCQbQ5EDTRsdsZa8bM2tb3OKgJNcPuKeLpbBZGZr05VP0Iu7B8HbVxabb24keYjFq9FFkfDrA4eKQt+BpR/Gd3N/K//Yiq18Rx7fkxtNBXS+utNCfKnMLzEIx3VJ+RaqCjWdwFjNziM0JFv2lKAieUQP4e9NwTNpMhW72nAxvEAvId1lvN4gYBvH4boIhkFzx/pi/bSAblS/GxLKMXxOg==; 5:48357RT+bld76LH9HzaqMprswImj1bF/jazveEnYc7BPzZXhqsGjR4wOKECGBQqfEjcO+PzRFD3zaWH3iPhe44s9nVuFO4fck1tXpnfyUk9aUaTTWlJ8XR2kyGMDYOcs/O1ngOBjXNQczq0sfYQdA+YJOuhN4geXcKSMHEq6UL0=; 24:FBvZcR/W+SwRRrUhcYsyWt+oncGM71H1U/EvmsrfwlSWqZa4TGmDfL0okO21jsqvfHn3nnkEE8PXPSwUaLMaLuQJg1idOsDZ8VlZd3aof6E= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 7:NKaYXqO5/19pIWa13z/JjFA7pwVFCL9Y7R4V9Y42Rv82luOjF9aS0/dNAoSRBFrdyQ4JCyWg9YJxtRaTZ93sXutOtBoO1WC8d87KL5Ll6FU1mLESXJHPhGohyUPpRNwOXnQiOY00VlHcygy1jxW+/PM/Ltprr4FSjul3Y8HBEQDEVK/xG9m1jYcxX/Z1iN5fKAMl8Q+d9pQv0iO4DD0Sa8GdOxcXH10RuSpyOFRkd4Kpm9c/BET3n7uKNL18bEXy X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2018 09:45:49.2118 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4c6333d1-758d-4812-d854-08d5d75bc5a6 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM2PR04MB0755 Subject: [dpdk-dev] [PATCH 08/10] net/dpaa2: fix the prefetch Rx to honor nb pkts 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 fix the prefetch rx routine to set the next prefetch request to the size of nb_pkts. This will assume that next request will ideally will be of same size. Fixes: 4bc5ab88dbd6 ("net/dpaa2: fix Tx only mode") Cc: stable@dpdk.org Signed-off-by: Hemant Agrawal --- drivers/net/dpaa2/dpaa2_rxtx.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index dac086d..311861c 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -447,6 +447,12 @@ eth_copy_mbuf_to_fd(struct rte_mbuf *mbuf, return 0; } +/* This function assumes that you will be keeping the same value for nb_pkts + * across calls per queue, if that is not the case, better use non-prefetch + * version of rx call. + * It will return the packets as request in the previous call without honoring + * the current nb_pkts or bufs space. + */ uint16_t dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) { @@ -454,7 +460,7 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) struct dpaa2_queue *dpaa2_q = (struct dpaa2_queue *)queue; struct qbman_result *dq_storage, *dq_storage1 = NULL; uint32_t fqid = dpaa2_q->fqid; - int ret, num_rx = 0; + int ret, num_rx = 0, pull_size; uint8_t pending, status; struct qbman_swp *swp; const struct qbman_fd *fd, *next_fd; @@ -470,12 +476,12 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) } } swp = DPAA2_PER_LCORE_ETHRX_PORTAL; - + pull_size = (nb_pkts > DPAA2_DQRR_RING_SIZE) ? + DPAA2_DQRR_RING_SIZE : nb_pkts; if (unlikely(!q_storage->active_dqs)) { q_storage->toggle = 0; dq_storage = q_storage->dq_storage[q_storage->toggle]; - q_storage->last_num_pkts = (nb_pkts > DPAA2_DQRR_RING_SIZE) ? - DPAA2_DQRR_RING_SIZE : nb_pkts; + q_storage->last_num_pkts = pull_size; qbman_pull_desc_clear(&pulldesc); qbman_pull_desc_set_numframes(&pulldesc, q_storage->last_num_pkts); @@ -514,7 +520,7 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) q_storage->toggle ^= 1; dq_storage1 = q_storage->dq_storage[q_storage->toggle]; qbman_pull_desc_clear(&pulldesc); - qbman_pull_desc_set_numframes(&pulldesc, DPAA2_DQRR_RING_SIZE); + qbman_pull_desc_set_numframes(&pulldesc, pull_size); qbman_pull_desc_set_fq(&pulldesc, fqid); qbman_pull_desc_set_storage(&pulldesc, dq_storage1, (uint64_t)(DPAA2_VADDR_TO_IOVA(dq_storage1)), 1); From patchwork Thu Jun 21 09:44:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 41357 X-Patchwork-Delegate: thomas@monjalon.net 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 650F31BE03; Thu, 21 Jun 2018 11:46:01 +0200 (CEST) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20077.outbound.protection.outlook.com [40.107.2.77]) by dpdk.org (Postfix) with ESMTP id 0950A1BDDF for ; Thu, 21 Jun 2018 11:45:53 +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=DoMIZs2eX5RH1Grvprfh3Z+pf+X8dcErySbnJWwOk0A=; b=REBJWo2KZXaDjQJJJAVf8k5o35V1h269Pwba1+eQXAxJpC4T0Si8YAwJiTixjYt51fvXWhr19CUIP6swS4m9lcK4ZEP9EO8ZKxUd6QOQs7ePpNpZHlivO9zKnsbPfvTJ3MrWfzKROFbL+YJFt/syic46ijs50GKvyrlLWPpE6so= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; Received: from bf-netperf1.ap.freescale.net (14.142.187.166) by AM2PR04MB0755.eurprd04.prod.outlook.com (2a01:111:e400:8411::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.16; Thu, 21 Jun 2018 09:45:50 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: ferruh.yigit@intel.com, Pavan Nikhilesh Date: Thu, 21 Jun 2018 15:14:03 +0530 Message-Id: <1529574244-18997-9-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> References: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0035.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:1a::21) To AM2PR04MB0755.eurprd04.prod.outlook.com (2a01:111:e400:8411::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e82e161c-1737-4d97-24cb-08d5d75bc66c X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(5600026)(711020)(48565401081)(2017052603328)(7153060)(7193020); SRVR:AM2PR04MB0755; X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 3:FoS+xSA5Ebh83vd12LoiaZAqJFy/xqUwB8U1qNT4J3pjOkIUd/5Fcv4mBBRsXsz7wnhOEtP2Si7q5etYpuykzcZyq34IHnhXJUUCpE5iYJdoOagaokEu/uaodxD38JH2o8NZXR+BVY1GhN//1A3YlVlIXOXWnNpzvRdqHsCozMdAoYyDFt/sL0HM2llkwJLkzJPv4Ps/P2EfgQq1N4yAqaDy2Dcxosh1MRMD5xDlbT3rq4aagTOD7DezH6Ik1ENs; 25:zua21+0+giAS8oFPdsMfbHU7cDaR4aHha84c6ChnH+XNBIJAVh42+E4u+ddnB/kupvTtcGX6sOcB9OIcfEqRU/isrWSrDNHLQsc5sliEyp3AVy51vyjSkeK22ow/CmNzEaQtR3qfiMGgf/TT+nr4f6Wql3JjLVQk8WvMSTj2h/ChglP+k5Iw7CIvt+Tuc0Ocntezc6tuZujj0jAituaCKCuCmlzVPptvuwzyY3nIegif72MqfyDnnDpynatUhM9oKmCkykHdJuQ7NuWNtI7US0Hy86UAyqx0ycvvBlcqELY3eBMO5XuEVLn5ySBq8FHKRwlvW6ddIm9xJe3Mf20AGw==; 31:6QEYYXLLXH0WGU6IzV6kI2yssevxFyCoLPMgW7sReARRwhrTact0oMe4yhuEF2IWwu+qsqBOAsnO4ZyT39GTVC0X4LuYzT3rMXA7UCDzqDuXvuDHBlZszT80BitevhTfZLn1HmRV7EohHi9gt4IixSrs4tw+ckQWxPgq4t4yYsIq3+oFPT/uqn1a6taCAB1+8R4zJMYUSWTfcsSs9ak+rGWgPtBW3Ys4Zj5c646qbi0= X-MS-TrafficTypeDiagnostic: AM2PR04MB0755: X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 20:sCWvAtjL9s2mH3jt7UOsJoTeVvp4s5JyZtYKIdOGN8D/RIHF90nUfng7jOEYYIr1na62nUxGL+6GqKUQeMLINJuHUZZuVq4ThS/XhoyFzFQZAEfO1wAMrQNA3h55L0zHNfImV9MLd+nllcT2zgP7dcDlIVJZkZPDqIxFyqgVXGRqO8yrHRQVt3G+XxtVevs6dsJeBH4F3CtUCIC8kShoSSjAqxf7IF8oZRAfm7JSRuVUztw0Zf9yHRKO+dqYpD2wClUojWEiIvJvjbO9OXv8hD+paRuIHZv9gDDyfdfeXxdIHmu9WYMroHUWBmzqnr/2eZRrxtcmaQ4jiw1wx2GVbv2D0lZtz/aW8KP8EddofjiqppU5DlX96IhX7Xk/SiEQ4u0ZMwL8efUFQfzachE824HU+liSaQVixywbJMgRH0m7UjCS63t9GNgLTEas/pZRwp9y60ZR/4r0EuxT6kcHbaZbO4+PnCSE165uyI342OTWcbq6aLTRTSk+s7E5rRgv; 4:t+ovaYVVD7oSEF1KA/hWblm+KA2D9HKOYyV1FrCRYS62PUu1nDUW8EqB+qrVwUZHMLEmlKEmqTTIPopx4k0GTiNVu01gX6FKBwHtbkSKD/W679cVFYR5DcKMVxLFDMRDghMboCa7KjHE16sXp7zCQCaeV4EEAW86WQa+IC3BX3DbP40Rln39WLVtPzzKlUEAbXWTvO50TEnjwfTz+77mg2nU/3J9qRUFzqWBBeM91ftIQ00oFtdovxebJfxZiu21EweLpdfCTZK1v0eOLDPETtsVAYXoJQX1Z/5qfPJuCda+0rbM/Lke2Y3tl4dY/GtFiAufkEAxiN4qn/Ds8ZXh/887kRrJeSJo/nu3v8td0uA= 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)(3231254)(944501410)(52105095)(10201501046)(93006095)(93001095)(3002001)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011)(7699016); SRVR:AM2PR04MB0755; BCL:0; PCL:0; RULEID:; SRVR:AM2PR04MB0755; X-Forefront-PRVS: 07106EF9B9 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(366004)(39860400002)(346002)(39380400002)(199004)(189003)(50466002)(6116002)(6506007)(55236004)(76176011)(59450400001)(2906002)(6512007)(478600001)(51416003)(48376002)(52116002)(3846002)(2361001)(186003)(26005)(16526019)(956004)(11346002)(97736004)(2351001)(5009440100003)(386003)(446003)(4326008)(8936002)(8676002)(476003)(486006)(7736002)(81156014)(81166006)(305945005)(16586007)(6916009)(6486002)(105586002)(106356001)(2616005)(47776003)(53936002)(36756003)(50226002)(44832011)(86362001)(68736007)(25786009)(5660300001)(316002)(6666003)(66066001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM2PR04MB0755; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM2PR04MB0755; 23:jZrnTqx2DnTjlkBCnPHZtnsK5b0QttlB2l8ZCaqyD?= KKFe4dwMdfqsVN6tF6QUe3u/P/0F4iq4jzkRe9R0LSoNbBDP6QlPyqHwmHUwS0GsxKLZ71bPisG0Dy6DKhKBzN6YEiF0qHurNncxBpPKXfReK6IGNlpun2eqdSjb3pPXdLJB0xKZ9wVvGTo0HXBpImt54pDHpTO8s5Y4UJC3ti4NmDtc1b1R44uDquu4dsajglYk3rSFLMKWYl12jNEYeNTQHEsUmfwYsgy3ujZORBMfEe3W2ddXeZemdOkil63IUuKRmCzo0AfLNkcUfL/OaUo3vjrkq2v6rz0J2k7pNWu6a8+TsUwz24NGQz1WAOekQ9Nw+5rD9JcMvJAK/dmNRbHBdyUHmHKPgmQrhTyX8zAwlcn994l7g2BwfKRsm45GwwhfHtrWps6GElIZUjbQWIVy9kdlP4Jah9bQBlqECWWHj+YftIeDrr9IWuyzqqOv8+JqHF+Zs9bbBmN6qmJuBDcsOCrVqsGErZZ0Fn3erjKB4fAYpa0cAAH2uaaHfKT0CwNg7Lvu4G9UHIsluM7Hr4t85cBwGUYpqmlFRJn8m9i//eu4FzEQocmslQqNNh3Jh2tpSCdy480LYu3+PTWI1J6RtUeTI9c5V6gsA1o12uqJFQ5Ii7RITvGmsOKWTBXd7L69LvjJ/0xCYBh+KV20FfZFAo2YQ8sEBbI05fcw1N+jPdkUY6oirtHtQnhOJYXnb++Sq2vyKZaz0ovJkfkf79K2w/VwgfYWTx7M60/zc3afbtopAnw9naoHAUgaiagbN5nezX+Ap6gtKToRJJrx4+ebYXUf5vLka/Sdup4ZEdzfDxXFpy4DQjsIqDCMWsXyY/PHW65xdq6efAg5t3Bm3pGS0ddT6F5/sPtPHarT67vGw99os0DxEgGGP/ap8W8iagritsASJvwb6giOHkewA4ZJtHcHuBXPE0nOk6mQy/Wr4T5xo7n016zt5ukU79Ne9xuHN3mYQdRct0s6xI4v4QZDXDmpQtqO1hFrxnaOwenqu97UzSdMU4VUTy3FpcLOdJZJG5+m/u6Sxkp6KfSnMkO6oLAkDLYX8kMFGOt5i+hnmMJLXVaz1+7dx/VIsSrqyG6DhXrheMi81xVqywAwb7+ujbdFzVN75liBLk6xW2VA8gnOKw8GDvhNEp/858geDUdkvhynouMOgs96p5BAJNwaif1jgIK7RovcuYf4QrMbOPLeIV9omU7Fu4bOQTYuSLoKg9FmJSx2pYeFwZ5O9YH1FmQNq9609YDreQt/bikj31MRFdzvduespmbx24NHezlFutgZbgf+OUWZSzfMYWv X-Microsoft-Antispam-Message-Info: LymJyv4tc8xuehEyf8O7AigQhReNV6NkVeovtnNfIyS9YT9VABw6aANDJ/5t18TziijpoCX2orDg7qtHvKfHAydU9PpmY8BnLMEeaOI+9twXURS8+QraZ8i8R+0PNgNANPXblhfEmZWgr4fjEB6PMChUNqPOQQ2AuIxsVegwYa9ii9gSmfEBdIlQ9QaK/kdXLTZAyf0Ani0Kq7JxCPLjxXPw2d7TuhBDsVw+HfFuK3eF2FrG+ar9iH2Uc9F1Dc5lL1gASuiqbgZxXUnc795KU2H15Cbqg3E5+qa3sNYynPQtI8HgL9WDIRnSQcUzCsaXJVv6lQ5GOVpJ+nHp5+SS8g== X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 6:aqIndcXiq0INcWGfgMKUrOHf5byyRF4tJORBibVg3VCiObPStgh/dgJaitpw7PJlm2xEndZlEWVqnhPbNVAdL4Lk1gDE1FKcLI/Vz0ImlctHXqluLJ6MWZ4fz/ve3bFUY16l//L6WYz1lQxvbCt9NmFahwkUgbBemqaBpgnFoLiOmXSg0srYeNryzUm77UMf64BUsLQFF5uUUKie0gqHlpfiAAMngmpHd9lSHH+i0GofGkBYMFbiTE4pui3MRG2A8TKaBDcoNFU6BC5aHIJLA9H0CxsSpa8TkxlaK4HZYIPDi/0hgzuqkoz/qQ5JOiGweuTGD06MY4SiKeLs+DULChypA078sCBZ6+Je7CP5B4Vvt3W5uE3JUpOjv/4tZabHKF3L390+sshZ3oVGzPZg6TxjPugSrTRkkKdEY2aC+tV6/ciN6R6kw0aaa4ZldowTO1ay3qJGZ1mLry2hxg5DRA==; 5:bwXxSKQ962h/JbdcO2mvhcQlsZDaME4KxhwOEvK5OE9rK1nVe38xbjIguLF+MMcbqT+ePrgzx5vN74m0ZoLaOcgH5+E/54u6il/qkL9xAUVYtARlyli8WM2jiA24+guCVovoadiBmIPDk8BXHk8yegQRiqcT5sJmItB4akb6ISo=; 24:7CzDe52tJ/dnUjpmAxyn08o77WUuhE4RodHpdgPIAzoVAl21FMBTW3fj9c/+VgtskZtDfTBZSg7GfNtBzNVO1KHMqv4Znj6MQOC2a3avIOI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 7:qEHdTFMrdoS5mZRlfmUYtexA/I+Frv8335pNgz5vcRTznAJyOUFp+M8o6pe2n9mnSQRoIZnL6Vvj0WQGLHLOrmZjwOCzhdnMNTLUYUbISbF7n4dxqxEMHImUHFss6IDakk3or+dNIMGSwn418M4o6hpee/hXrrhelX/c7cO/yGwYR2u1RB9ChhRD0dWh0ybwfa97qg0yaQjlx+QAQX3+hrRAk+elQWfJSjTR1MjPKCxjQ9FSMW+KiVR52odX+VmM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2018 09:45:50.5078 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e82e161c-1737-4d97-24cb-08d5d75bc66c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM2PR04MB0755 Subject: [dpdk-dev] [PATCH 09/10] bus/dpaa: cleanup unnecessary global variables 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" Changes originally in the patch "drivers: cleanup unnecessary global variables" by Pavan. Signed-off-by: Pavan Nikhilesh Signed-off-by: Hemant Agrawal --- drivers/bus/dpaa/base/fman/netcfg_layer.c | 5 ----- drivers/bus/dpaa/base/qbman/bman_driver.c | 4 ++-- drivers/bus/dpaa/base/qbman/qman.c | 2 +- drivers/bus/dpaa/base/qbman/qman_driver.c | 4 ++-- drivers/bus/dpaa/base/qbman/qman_priv.h | 1 - drivers/bus/dpaa/dpaa_bus.c | 2 +- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/bus/dpaa/base/fman/netcfg_layer.c b/drivers/bus/dpaa/base/fman/netcfg_layer.c index 3e956ce..031c6f1 100644 --- a/drivers/bus/dpaa/base/fman/netcfg_layer.c +++ b/drivers/bus/dpaa/base/fman/netcfg_layer.c @@ -18,11 +18,6 @@ #include #include -/* Structure contains information about all the interfaces given by user - * on command line. - */ -struct netcfg_interface *netcfg_interface; - /* This data structure contaings all configurations information * related to usages of DPA devices. */ diff --git a/drivers/bus/dpaa/base/qbman/bman_driver.c b/drivers/bus/dpaa/base/qbman/bman_driver.c index 1381da3..b14b590 100644 --- a/drivers/bus/dpaa/base/qbman/bman_driver.c +++ b/drivers/bus/dpaa/base/qbman/bman_driver.c @@ -15,9 +15,9 @@ /* * Global variables of the max portal/pool number this bman version supported */ -u16 bman_ip_rev; +static u16 bman_ip_rev; u16 bman_pool_max; -void *bman_ccsr_map; +static void *bman_ccsr_map; /*****************/ /* Portal driver */ diff --git a/drivers/bus/dpaa/base/qbman/qman.c b/drivers/bus/dpaa/base/qbman/qman.c index f5fe5ef..7c17027 100644 --- a/drivers/bus/dpaa/base/qbman/qman.c +++ b/drivers/bus/dpaa/base/qbman/qman.c @@ -625,7 +625,7 @@ struct qman_portal *qman_create_portal( #define MAX_GLOBAL_PORTALS 8 static struct qman_portal global_portals[MAX_GLOBAL_PORTALS]; -rte_atomic16_t global_portals_used[MAX_GLOBAL_PORTALS]; +static rte_atomic16_t global_portals_used[MAX_GLOBAL_PORTALS]; static struct qman_portal * qman_alloc_global_portal(void) diff --git a/drivers/bus/dpaa/base/qbman/qman_driver.c b/drivers/bus/dpaa/base/qbman/qman_driver.c index 07b29d5..f6ecd6b 100644 --- a/drivers/bus/dpaa/base/qbman/qman_driver.c +++ b/drivers/bus/dpaa/base/qbman/qman_driver.c @@ -20,9 +20,9 @@ u16 qm_channel_caam = QMAN_CHANNEL_CAAM; u16 qm_channel_pme = QMAN_CHANNEL_PME; /* Ccsr map address to access ccsrbased register */ -void *qman_ccsr_map; +static void *qman_ccsr_map; /* The qman clock frequency */ -u32 qman_clk; +static u32 qman_clk; static __thread int qmfd = -1; static __thread struct qm_portal_config qpcfg; diff --git a/drivers/bus/dpaa/base/qbman/qman_priv.h b/drivers/bus/dpaa/base/qbman/qman_priv.h index 9e4471e..02f6301 100644 --- a/drivers/bus/dpaa/base/qbman/qman_priv.h +++ b/drivers/bus/dpaa/base/qbman/qman_priv.h @@ -139,7 +139,6 @@ struct qm_portal_config { #define QMAN_REV31 0x0301 #define QMAN_REV32 0x0302 extern u16 qman_ip_rev; /* 0 if uninitialised, otherwise QMAN_REVx */ -extern u32 qman_clk; int qm_set_wpm(int wpm); int qm_get_wpm(int *wpm); diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c index 7956bd0..5ba3d28 100644 --- a/drivers/bus/dpaa/dpaa_bus.c +++ b/drivers/bus/dpaa/dpaa_bus.c @@ -50,7 +50,7 @@ struct rte_dpaa_bus rte_dpaa_bus; struct netcfg_info *dpaa_netcfg; /* define a variable to hold the portal_key, once created.*/ -pthread_key_t dpaa_portal_key; +static pthread_key_t dpaa_portal_key; unsigned int dpaa_svr_family; From patchwork Thu Jun 21 09:44:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 41358 X-Patchwork-Delegate: thomas@monjalon.net 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 12E6B1BE0E; Thu, 21 Jun 2018 11:46:03 +0200 (CEST) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20053.outbound.protection.outlook.com [40.107.2.53]) by dpdk.org (Postfix) with ESMTP id 3D3601BDCD for ; Thu, 21 Jun 2018 11:45:54 +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=5ihYnQrMRraQQYHOBkvDo3prICPrk061VT+pWZzETp4=; b=IQ5cGAOBGqbJWqCQo+CrDVsBsnZtl3eSTo9zLjL8MnNcbRKwNk1rs0OsVs3eDmRquVz17wMJrjOgtAi5g+AONTLJFoATLH+7QJ8Wy+K6ewOtNb9NQu3jxfP7oZkv8jGORrlO77jnlRcxqGRaWeCF3aCSegYiyDcq84/ljb3zTfs= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; Received: from bf-netperf1.ap.freescale.net (14.142.187.166) by AM2PR04MB0755.eurprd04.prod.outlook.com (2a01:111:e400:8411::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.16; Thu, 21 Jun 2018 09:45:51 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: ferruh.yigit@intel.com, Pavan Nikhilesh Date: Thu, 21 Jun 2018 15:14:04 +0530 Message-Id: <1529574244-18997-10-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> References: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0035.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:1a::21) To AM2PR04MB0755.eurprd04.prod.outlook.com (2a01:111:e400:8411::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 88ff4e91-fa94-4907-c484-08d5d75bc724 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(5600026)(711020)(48565401081)(2017052603328)(7153060)(7193020); SRVR:AM2PR04MB0755; X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 3:xomRpbDC+xc9DeyPcn4ZtmjdeSWwsWW9AKKewjzyVwXJH0FQPPTkv6C+FLPhatwTbVI2lCf2rZ4zt2FshYvbUePzlwduypdaUbl/opiAVjgbe/c3KU9+3gBSgCtYi3PJ/o1T45V3z+iMMQgBI6wQ0sB51Jvj5QtzVLXEmu1Ga2692yGPyQj1SBg6AerpQlV36WYhEvQhGtb5fmNUCqxAOg3ka1nyqWyKd6fMvw7iFATkhMCmSPDEBTT+EZSnP25x; 25:4Ntlfe6w2V8BCVpaSnypYE0oOmlOnmD77Tuz8rsHqL4G3ZACWbbBV2l8zOk4r8BXes25Z9bAcoqRpiU0DTuaUiPKmeGMMoI3gwkYFNccRFMb3MlbZCHW5CYLnASgSut8l3SBJL82XoJSHgmRk6F7uW0rMHpWZjOV62uEd+fE1YyAvf+qB8FuBcP1Pg8sEvPeN6uROnQeMGY3U+7ADiJ/zRXGzsk6Rlz/hDNSwcmMbhwlGDAsVTeynKwnbGxKAlbMIR4ek9mAeN6xMHKTB9YAGZArgYgaSjMb2YI5ciSXNpjLhMU5OGsuSx8ARNR1duzEYqGFJWv5NqYCdDYR1VfFdg==; 31:SnhhyMJguQgdhi2948LYrLOjsb71nvEjYE3h0522ouYQWskVMJNugvXdfxOZsDZ24p28x//CFt0nDLVPfk3CN+99ZnBOhEMCsPYzvl+G6wfPi6tXClqq9EBiHCDMFo464MI6ehWg4sHQCUgjvFh0hnOvHqNXsjh8qPQe7uOyit354Wr4KTu6uadH7HFTKvk8zx+6QXJ8M+2pXHZqi1+hX6eg6ouxeN8DhCtRYBVU+kk= X-MS-TrafficTypeDiagnostic: AM2PR04MB0755: X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 20:Lb+MLzV+G9yge+G1CNHlqSI44T4oSdV60SnCf2kFrW1MJG97L8GjBvhKzBT2KmKcZJ9OwPc7DPdFCVwHIc0iqn4Gb7FC1KJuflB0eLKWR7UCFAcLfKQ3zwmiy2ytviReKe6V2RRW7Rjx/v3spUTiDpDc+S4S3AIniO5fr9VJ1Y1/Q7lEdBgM3imMyaqAQLr4xtSl7GpKW22e15RyugIGxmcF47W1ikWrBBcQP4LDfMYRYVUIXqe8RULbIL7VmDg0upD+eNuUhrafxZklzoNirZJdOXIooGuo20NfoCSZmRHWh7ge7NN5WeRppC7bECXctnJXbkLTuZhjV+s6MFUvCAB18RwzD6NN+nHUmWqO373S2Qa0YRmfeSs7aMtOk+l0Jem35y0QJ1ppefC6/5nYqiQWCW/oMxiohJzwqjN0n8I/HsSPstfLcBFU5UuwFEDODVXFGOtJPBO14OOwrGAp7OOkyalecUDjc9Y7ka6JQnYNoFNcniM5Rf1SbQP7Wz2+; 4:ZBfY/tC/Rd8EgrFYsJQQz6eQi5Cg9Se0I5dZxcuyQyJjWS1akK1DKzsRGjdAvZ3xEbLpXDWTA+leTeHf0l8PrG8Ij3/3PF+abiIM3WnyFlEeKJqCGLjuVnb1ZG8CQRPnnbGa/5nfBike3NpR6fttQ3cUu+PHbj/BkIApFARzvbSDNYOhIrTVPgqi+sNfHzyVwdRQt0ZnLjC6B44y1Rr0tacIJ2BHc055nwUYYlsPoCChTPETLutEJoXZaqBjbLW5WEaPCvSjEV2YMfFPhfmJgwZIFVLGGOE60VuCovDi4nArwh76lJteDFEGwwWKz76e 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)(3231254)(944501410)(52105095)(10201501046)(93006095)(93001095)(3002001)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011)(7699016); SRVR:AM2PR04MB0755; BCL:0; PCL:0; RULEID:; SRVR:AM2PR04MB0755; X-Forefront-PRVS: 07106EF9B9 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(366004)(39860400002)(346002)(39380400002)(199004)(189003)(50466002)(6116002)(6506007)(55236004)(76176011)(2906002)(6512007)(478600001)(51416003)(48376002)(52116002)(3846002)(2361001)(186003)(26005)(16526019)(956004)(11346002)(97736004)(2351001)(5009440100003)(386003)(446003)(4326008)(8936002)(8676002)(476003)(486006)(7736002)(81156014)(81166006)(305945005)(16586007)(575784001)(6916009)(6486002)(105586002)(106356001)(2616005)(47776003)(53936002)(36756003)(50226002)(44832011)(86362001)(68736007)(25786009)(5660300001)(316002)(6666003)(66066001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM2PR04MB0755; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM2PR04MB0755; 23:F1FO8dRuk0CZKH98AS+uHhsNwA8f6as48CaVpuRkK?= kAUEi+qKXpm3C6gX0RuTrdw+//jcIKxbofAYdu6egj9wuYmAzum1EAShjmdVGdhThVS8nzKu/oVwkJ2Bf1t/jx232YiRx7N1TwWmEnzhNOPvXFOBeMqJ/paskdwt4RbhlzXzsAiM22ndh5yLUaii/Fg/AhTdq1fpK8wKt84eeXnfX0bcbckejSTIX9c2koH3koJ9wAqnwOkPOu2hwib7p9vY7rkEpNVu7bK4q3OS0hJz6YFHlwPnTziFgCi1WP4HqlI/GfkOClP096WbNkwnVP9Jaxks+EFHM6E83T80GMEgocFE66scDYOyENuqcSj70omStKN+pkchl7+TAmUmPcLQOr58pLLufqhi2HoVjRI3KUd5i2+hJSz3JfKmVnJUBk3mh501O0hnLsZHUGygjWMsPBYGvG4rzQiXsgiDNMzPF2QGsh2q2AZ5nookwxweON/Egu/Wf2BNR1FoprAym77uw5vrfzqhf2PDtXlAlBgCoWkXJpIt29g0EXbn2sJbOXcF4Ta2lPQpvp6h3g4kIV/30iAe4eadonrJfiYLKuyTll0xqvxeuIatTuW0YVu5GQuzP6dUmLLK4mZbgOgRUnnP5g/+sEgIGMGbMCDvh44iPSz/rEc5EB4k3eo7DJgggpqDtEMEwOensOtiGGgEGZIyEQ6b4V+DwthsCt7BZlJ6/crLoVEyX/uE7XTaevQD5h0C/wXRdb1JPXfFF3BG28Ye+vibB5DriY/lK9edWeHpGF0vlQpAMyrQFH24YT96p0Zun67kHJQet700ujLO79xrR3mr67roz8/O3cRyocjC0V7xqYRoCn29pKXOK0kMp2+NqcMQcSd/BNnfFzqBi1G+E23sA35BtGpdn+DeSm9Sx1XkhQBbtNTrHV/Tu0yha4/dtQOz+kA1j9I3ucY6su8oZqy5ieX6IgjzpgdKveEmE96tkrT3rv3wcpGUeo85k6MU3Eaqh7EfLYf/+y1RLUH3yXA9ffSbdbsrzDjf5UvZId5Tthy7KJMxbpPLKqeshiWiblUP5LdmjKlz20vc4aiLOFN/Ep6VELOicDZ4MrUcs0ogfj502+GfWcSBkKWI4Ehk4LzHL17JXO3rSddV1d8PCQcwZquMfu4cdxwt6plaO7avaxCSQj4NRPy5D0k/ixfNXGuIzt2je1ISH3e65yPT/q3ZL2uUX0hxXKzWmwzhIleMnnbeEgx+9I2gtp1KlpCysdBdne5zVwFZGu9gkYhcxk7/Jj59K2dd5jKBLkbxtFHRrSLmtifbBGseXLNVH0tXdpKLNt6yzX5j2gKvZYF X-Microsoft-Antispam-Message-Info: UfuFKYq9nkWz7whzRp18FXFEwZO49x6eXxW51VIx64ojM1AKP/SYedA4Xyz2ST0rWqDeSKkH+dnrhoK2quVmBIA51NluvI4MSktPcchKH9Bn3N+vUZI+F3hyF+f3ILLsHkyWB9i5tR/fNtXKDvTwEKHR/zI7VoEIcBEGwwnEDQzvlz47G6r9RL2Jm/oce7EahNG8+YY/9uNFTvAEZBk4GsiCb1X2JDgur/65Gh0CGxAMJm0bLrSwNagPoORDRkAZXQ6SSxvDjtIkG88biFHq0olJPbUKHzaWexGnab+zeT5NVYDrEdvhF3ZnUBap+X+r0cR3ATvFCwv3V5Yg9iz5FA== X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 6:/77VtohuAjqq+UyLDOP1npUC9K0KiRIuIugqt+JufOdxogwP5G1YlmUJyfvEXffYo3xozZrYLTGXQ3DNGgGpMwnbSjVZ5UiH0+CKUe41NPT7xXWH2guTCvE5ez4V6VFN3qq1P9BNpiouXtOJ21DEmtjV++17A4K6gqsSv3iPGFCl1JgqqRyK5dgvIUgJx2nhN+1Jnz75mDRiAv7yw0ADK4yvhphLYMeiWcQL3OyDNdQbg0E64QJWxNCpaoeZaCPQDDaW3I9SGoFtkAXxsGscwXulMSPEyzGi7PwJb/qumNaRR9d62LgIwUdwqnlOtPobeBlPeg0BtH2q8vkbITM02vZJkzJ96y8daW5louzHIju4NCmjawcQSLIv1/PRxYp2HDX7wLfhuZfAuNDV5FUI6j3u2CWi51DraNk7Qq4uyvTRqJ8DlbrYx5f+6NlqLiT9aA6nav3ecudVoOGejbw2TQ==; 5:VULUKqyWmlT86/x/SgsNJ7EgUoOsEdLG6FCbLSHatYLMQUs6ZQ1GeycIiicn6Qq/Q/rSwb/bJcMGUL9e3rT1ktxnUg6Yfatq0cTwkkq8Wj68zgT02rfyMwLPq4jpTuk7M0qoUSNBJfSsarjZu96uRtJ41pB1KEITCY0DL4D3pVI=; 24:Vyol+05OEfRycxOC6EuJQAXghSMSanMEG8+i040WR4z0AkKh6pSaVDbElpcqjujJrVLQdjangeqm8Z+xV1AoN9c5zeAuq1sFTP4wP2Wu7yw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0755; 7:w0FpGpXdweb7xO7DbrnNLFNa/VYg7u6D06umhNCqUCX0bLxUeqppZLyBHSoohd1DXw2vFNAzLti4F0g8eQ7qTApvTjZ3YF4O+wNoyIROsV/iJYhzTSgXm/X3qWuzX7ug7v1oQw7zkqgu469FbSVx4XjnDlMrv00vA9Thg1CN8VLNYGkTVSbEoCc2LdvFpnPYNLdokWZGZGXpg2/2DSLBtCradQ2HVXqv3uKB2jPMm1Wq0k5+NKp8megfsmr83TLh X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2018 09:45:51.7197 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 88ff4e91-fa94-4907-c484-08d5d75bc724 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM2PR04MB0755 Subject: [dpdk-dev] [PATCH 10/10] bus/fslmc: cleanup unnecessary global variables 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" Changes originally in the patch "drivers: cleanup unnecessary global variables" by Pavan. Signed-off-by: Pavan Nikhilesh Signed-off-by: Hemant Agrawal --- drivers/bus/fslmc/qbman/qbman_portal.c | 3 +-- drivers/bus/fslmc/qbman/qbman_portal.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/bus/fslmc/qbman/qbman_portal.c b/drivers/bus/fslmc/qbman/qbman_portal.c index 713ec96..0714500 100644 --- a/drivers/bus/fslmc/qbman/qbman_portal.c +++ b/drivers/bus/fslmc/qbman/qbman_portal.c @@ -122,8 +122,7 @@ struct qbman_swp *qbman_swp_init(const struct qbman_swp_desc *d) p->vdq.valid_bit = QB_VALID_BIT; p->dqrr.next_idx = 0; p->dqrr.valid_bit = QB_VALID_BIT; - qman_version = p->desc.qman_version; - if ((qman_version & 0xFFFF0000) < QMAN_REV_4100) { + if ((p->desc.qman_version & 0xFFFF0000) < QMAN_REV_4100) { p->dqrr.dqrr_size = 4; p->dqrr.reset_bug = 1; } else { diff --git a/drivers/bus/fslmc/qbman/qbman_portal.h b/drivers/bus/fslmc/qbman/qbman_portal.h index 8bff0b4..dbea22a 100644 --- a/drivers/bus/fslmc/qbman/qbman_portal.h +++ b/drivers/bus/fslmc/qbman/qbman_portal.h @@ -7,7 +7,6 @@ #include "qbman_sys.h" #include -uint32_t qman_version; #define QMAN_REV_4000 0x04000000 #define QMAN_REV_4100 0x04010000 #define QMAN_REV_4101 0x04010001