From patchwork Wed Jul 4 09:43:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 42205 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 9E0C71B5A8; Wed, 4 Jul 2018 11:45:34 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0060.outbound.protection.outlook.com [104.47.2.60]) by dpdk.org (Postfix) with ESMTP id 110391B4CB; Wed, 4 Jul 2018 11:45:29 +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=jcXkYNlAF67csdk+MJwt/CNv5quYM5MzVAD92xcBcU/Bl3ACyN82gXGiHy+Wck3mZklLpZAiOzo3oABuLpXYqXgNHN6Ox9+LUb5ZEO+n2IaDVOBWBdu9RL75ujGvtsTw4QMoEqxvGPOZGwBVXnl1lRrL2Ur5D/rZvBdcb6wvOLs= 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 DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.25; Wed, 4 Jul 2018 09:45:24 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: Alok Makhariya , Shreyansh Jain , stable@dpdk.org Date: Wed, 4 Jul 2018 15:13:36 +0530 Message-Id: <1530697431-1244-1-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: BM1PR0101CA0008.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::18) To DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: adefa930-3488-43ac-fc1f-08d5e192de54 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:DB4PR04MB0765; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 3:BZGDdgZZaSVIlGpjB3FNimMMBjE4BNaEwz1H21MChdldNIaFvsxnBbh/UIvB6AHqmZXOnoaEQTbZa0iG0RAxQVANuHszzZ1+yfcfZN4HngDb/10zpxJ6Pu92JuqSXKSjnE1dC9Bvk/8fmEoHv6P0FG8hj6RrGf8n4FQTptFZJHgKfs71duE37A76rwxJKt7YjpIzmj22KeAvNXfzuu96hBeC+WQmCXN0Hq04BYRrKeD1HdlBtJz5phqm+g8lE4t5; 25:eTIED8iX3kY6HJnbRGfh5W1jnE4QbyduSfRYMeBNYFfqqJ7BdyLBgmfs2pNWDAYiZc8s3Eb4hIE47S5vHspANkgDmKWmHCIjxLasV6uv9KkWvs8i8t91SxmsqwluqnQ3+Yc0olsFjlylR294bcMKea8Z39IKhHTxNB3ISwpgwC0+wPM3pBxrWBELKOFGWTlUL0y3/CGfjwzubnr7kzyW06wxL2iRmVXgvlgviu79T5bBdaYsvsmCBtmGZ2gicDPVD0hbmh1TOtJ8d5asgJ8ZqM1Bf0uaSCnwW0Z5myJl0SG0/BsYtFQzjHHeW7Bg/zKxDaCQkmfVJOCN5k3kMQvMhg==; 31:oizrCAxGXr2oxyyQTIhtsEJr/WZHswkBI8+EuutpKnvXPJdSv1hiVldPZF3YwcvpxzSizvMoSU+lg0IDbpLNXIX2zwVy0gg6naj0Yx4TAc46ZABXzNAt9MQTm5mInIA+LNaZSTKc2XGdlB3ixXU1b3Zc/buOTMoLm1E6dW31CDvKIlGYN/OSac+Mr5g3awaw0eb+/4+pY4QD/1j8TR2cmMuRoUEEYqsOXAg1c3gF9FY= X-MS-TrafficTypeDiagnostic: DB4PR04MB0765: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 20:3KdM3rHwK80hkYegX4ihavrOv6S2jZwZS83XBIzEbJCtmE9FvfxWY/912gzFSYJv0GdoZQAb++cA9Q2QGU9YgQ95ksFoVTv/O2d2BJUxf76WytHSciZ9DDAUdTM8Ig2AZeiWRSpYDcZ1lZh44Lkp9Ma4avc9oHARxBzAkMk3lhJvhxR6RdklJ8iljbiCxdG2VKxZ/igEB6eiIO2YYE8GURyDcXQ9+NTlk7AhMJe9NPIB3LtBZi4qDfM+qvok1yZSDywVOKN8EoU9iZ8HnswvjNaW4AS97Fywfp62UqQbLu9URIeK3nrm9tEJCBKrTf2547odhBs50BfcktcV1XAfdBoHospJ2uVELP7wwi7ROjdCuotZm33gcuxw6K5cE/e3xSHTlrsF+yfcyss48nnZawxJRnn2td0YyESOMsj2ZeX7hpQ9cuG2INOXBUtH3lbi7IgNPurgewesVcWW/Ui4LKujrrrHwDqrQuCt49tCl/08eRGVqIarx/g01/N4gS5c; 4:RafSVOHhJF1M19OujfMjo86KBD3UoTTLHcYT054AUmVi+ZVFDnk8VG1CUabj+7XBg5L04t7eOixhzubC3hBTi+K85cX3iC5+/I5wjccjMdfy8IfTqRV7XU++rQeibQbhEYWsQLk3V3KmqpGepY92MUtS2NaU2ukFUrcAXAGrhqsG85RqsLuCvJu7Us7BrXdTuzxBifUsmiG7GADSi7liweObPwqT+JkPjYRY43vc1dH8f2S4imXre31iRW/eXf3yCVFf4y2TCteVpPwsz2fUpRB2r6pQz39stmXC3q/j2rU1VK9ve/FgVcNdDWN7HPnR 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)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:DB4PR04MB0765; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0765; X-Forefront-PRVS: 0723A02764 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(39860400002)(376002)(136003)(346002)(366004)(199004)(189003)(6512007)(11346002)(476003)(386003)(6506007)(4326008)(55236004)(956004)(2616005)(5660300001)(54906003)(44832011)(105586002)(68736007)(16526019)(53936002)(446003)(50226002)(316002)(6666003)(5009440100003)(36756003)(16586007)(2351001)(6916009)(106356001)(186003)(86362001)(450100002)(26005)(6486002)(97736004)(305945005)(81166006)(7736002)(8936002)(66066001)(8676002)(478600001)(25786009)(51416003)(486006)(76176011)(3846002)(6116002)(81156014)(48376002)(50466002)(52116002)(2906002)(47776003)(2361001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0765; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:3; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB4PR04MB0765; 23:aiLZFzn58nuWAhd6rqprgppl6BjdHfKbwZYRmw1pd?= tshF978/Dzdcieo/OTimFbKEvqEM0akUsx2fLqGJywuSEWm4ANpihJ+mEXjOYWLfi9lXUOrRkrMdgPOER6MHUGhf0HSKj3Rj+c70eTkSeGpmMw+2WhLMLjLvuvXvjPP0bLOmXgM5WDDy7NbtSC/OMIgVDxg+jN+Q6iZhH+uphaGlSD9X6OhO1NhTGq76pu59WZZCnufCPIOJT4M3KQ3Q1V36BOUuHp/l0IZVQL8TgYseHrQ18k64Z/Z7KsICRmfaR3sqm2oHbHL57BXWNOJhhqPVo0g4+54qsLUwESL3lCj5jMGme808dKw0kSvFn8Ei/8WuWkUTk4A8qEWqVdrQWA0O6u3lhs2CPrEweqrcaNV2O5dA7SmA19OC/KRXjUVBw7lafNaB3UFYNF0MR8xO0/UXvHcSKCRx03u5YtuY0oRu71GLRhPPUuwH1ot9y1lR2+uGFN82T+oQKbNUtJr/t8mKc90okVMVCEIb4AZrk00ohb7+ztuEEagBddgtLDvbgMdr/2WnnWiWVzWz/g7AVSts/kvGPvaA5RD2zGEF3Tzx7to+61wiHos4jnzL6NLSQi+/qvukNm3+2QU1lHMvpLjF4B1QAALfToXwjdg/MIJK+NLkUgQB9kPvgsi5HITk1MCU5lq6MJgMuKn1ZW3xbl0lDdjUfg34yFCsoDPfkdn0nJGe7JFnaTdW3k9/ZcQ0FNwXvO8Sik2GpYRC8pZgZ/ygSRPeDrXwjzKSNXIFDiKgBBYM05wTZBMfShiWcknrfBHdSygujFZ6VpCIIWk+RXqAVjJ35UkAgTvAqwaksPoaJT7DjPUdxlTgY37WqFoqAkfK7SwnCzTh6iEYKIntX5bbUylf/xbfcBVbkC5AtsHUI5Uw9QPMMppQE52WUGdGUepjBWIhKP0QCRQlYICbO6p2jjhrafGO3W5rupQ4DI9EAb66EIHxiRlsbPWQxMKMZkwazD7GUv6EXK9IF03Zh///cXmHBZyIOUtfRTs+jo0G0xX2OOjqqs/e6+9ebZU/EpUQLzHxYnhu4Er1MPXQ+dF3o+JEeFT8VbJ+QnUoafqfRjSTjY05nzeeK4/4MRkGesITdZ/ovrBjWlRjNOj7S9VnAF/6lreE74T10Xu6mcpzSb79or2CTYTCbc6wbJ66PeXk2z1Vo5Ctas3w3j9Re7wPr4jkK2IFw+VzcVAV96mU0lvDxOl0VzxCojIxFVDYeZb/raTlqceif06uHUBJB539Wb08xomrrQNfgRDstsaRcaSkw2FY261Oq5vT1L/G5JLc/v2AjVSY4I+NFbthbp4aFLtM9FWKuCF2iHLQmwkBw== X-Microsoft-Antispam-Message-Info: CcxHIsouV7WZ8JTZr+bihBM52066VFoYgVg+T0ELM6Ckv1WysbMiyP/l+xh7TAACt0OreBGySKVcvpRVFVf91rbxYIywFQ6b7ZKCnS0GqxxXp6ZYH64yuLscC8fZl3ZSfQhsG3RfEIHYsCEcyxpTEoaYWgQepwFli4J9Us2cPI/V0RsWDDn/OpI0cmUugAQGmIwJwdPBSrawVNQsFJCISJTndtPs2s3pqJp5sqmfpcS7PHG4DRk8lLRASRTHHjToln8aBqXvRHJZtagtV3jGRocyZ7H3rHz/YdfBvkcnAc5NEP9f/XF4shy8My3G4QPO3X/E8mjJvjdTO5upB1Vf/TMgb/+vQ8b4+vFq6LColLQ= X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 6:wbeVqyIVqe05a+iV9VmudryW4iL30+n7EqZlO4kDOqGufzDRIWuj7SD+n26MKwX1i7QxUbUHafAR0ZCwFlgztXH3LGofINrkRQJPNNmD/6c6Iou8DKla3x5WnMkQl3EBBkgj83/Jbo3LQg0mPncVeSm/H0wNoxRQc2Ne4DS0wJ/Ius1ORe1sQogbL7mOiVmUFqoVpuUwU45RO9Ukw/Jnk034BPgvv0Buh2grHgux7W6iTV2siADDUuLKd7aReWKPyk4VBdkwgzf78B6hsSbZ7P36thjdZlMYmH3PrBI4zUligssNsPtumellRgDJSNimywXj4RsQf1gOV7ymHFttKpljjYcnfsT87tBKW4Y+WijhJqjlGqE6cfKYv7MuWw9YevuUDNFvV0BmOSCpw9SpyYu8iWYcr8Jk63KTmheFF3yk9zCz7yDdygXvq9XRrTolLPhVgs9YOgTPrLN3wnz20A==; 5:oJs749eAR2zGScrfv/hUDMLWsC2kLIdRP/6UfJMnKD1LE9kSQxA2D4uqKfsIPw3AfFKn2NkoEchPrrolValBDnOZJZ+BRzPjjmkuslg3qFM1PVwxioKzm+a/f+yIUcR6XbIqO8ZAgGIsXn7bW3aP0rV3qRNcqGQU4lQb2jsbEN8=; 24:K28ilvM2PDbITZk0EW8DKZnu23MCs+Pd2NqZO2+Zgxcny6gyWB/JP/jVMcFDYfACsEN+ecFfrjxCyv0NJ3w1kU2REsqHbb/gx6nRrumCTdE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 7:HAoA/nDa4qoLO4ScGxLyvon5G7JlzJRGYuiaW7d2j26Ms1LsVfBUjCwr6vB2ZByQrz7zoDWYdwKtdE44rgGfpcau8XyZEBDhtiOoziX0Pe4/0RFKD1TabaE32oP6+SI+Ca1ZbS28egfvZi+RJHIx618xsum9f7pmz/r/sqpHHIPaDCC+I8saIE/K6bYelEhi1u+Ig949J1D5xj0tHwEHyDA+/DWXAsnVvTmINvx69Vcp8YEVtb9JwoewCnJMqnyL X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2018 09:45:24.5052 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: adefa930-3488-43ac-fc1f-08d5e192de54 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0765 Subject: [dpdk-dev] [PATCH v2 01/16] 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 Acked-by: Shreyansh Jain --- 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 Wed Jul 4 09:43:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 42203 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 218021B51E; Wed, 4 Jul 2018 11:45:29 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0041.outbound.protection.outlook.com [104.47.2.41]) by dpdk.org (Postfix) with ESMTP id 5C0E958C3; Wed, 4 Jul 2018 11:45:28 +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=nSrWsCKd/4KDaCcEUJXYVRUOEZLNK2OaOnPIlzBRYlL+t+5+P0tWHEMwvGyP01JWr0jdBTB+JhLI8cpdfxpfYqgCT1ksDKC3Agj/dkeWsSqxuAPAT/+h7EpfqekTs7+dzrzikjTjgzWsWuHeWt7ZQ+W50nBb4yATgPxLjBXHHGg= 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 DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.25; Wed, 4 Jul 2018 09:45:26 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: stable@dpdk.org Date: Wed, 4 Jul 2018 15:13:37 +0530 Message-Id: <1530697431-1244-2-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> References: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0008.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::18) To DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5ec69da2-5809-4e8d-73e3-08d5e192df2c X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:DB4PR04MB0765; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 3:BmXx4bohpQHsc6Ma3laJhBZCTFjLGNSpVEbbyrJABryoZJ+skf3fODX9K3X6w9AKWcl+Tzt+IpLVmAmfUx120RYZfLVoTGW8gC9+v9L78f+emneUuJS8QWOPXP8t0AxJSRB2/Zg5sfteLYpK/RoOGaFbC08J3EHexgJ/a3zIXP3UJ43sAr/faOA82lztcbR4wPgfLpNa86KXayBm4R9NX332YzDztOhWDTlP10I3s6/lGmu7gSr2ZjS6bdhXGwCR; 25:Edv8MbR2gWvAQ/df5KywC3TH5f6Zyg8wS1V3fsL8O67X1M2zB3fCT2m7fgQJ3RMQw32yXK2PdERJkOdSPoRFr812Xc5SBGw1TuluYHhNAPqEVaOYGQUkJ0Dva8IxfuOZVbZ7uNVOAvuwrKZJEw+JNC1xHPNc+M750qM9Op6wturBNrDWSKYgxpb2gEQTn8e/nUqLBkWVgP4kIhigD8lUVTFKX9Pmg1H6YOQX+uvQbALQNOevVsJAJgyK4JEjQUGCxxP8OWuZRCPBEPKsjWRNZfD4PlJn1kTi9XSFdCqrQOwXWfqwDogcNy6tMIHT+aadKjiwNKQJ4D+Mnp5dxWK3xw==; 31:L6milBR18KZvzCr1MmNZ2ngFxpMUMLCaNrm9H0AB0IOLFT0cDpvuVJpfCCA6Vsmmpa4TWo4pMD8itdQ/R2Lju7/pMSqnLg2BvINN/KTTvdD3VoXfpJ6MQRxRZrjF2AclI+ji/6qGOKYiga3mOP5jRG2h4esRQ6m4VHbGpht+7+Y6Iw6lrUGCzb41ebxnKlndp1/edc73MzonwXqT/2/oCP5dzdcMwuAvPQgwhHADtbc= X-MS-TrafficTypeDiagnostic: DB4PR04MB0765: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 20:Bg5e2F0O4cHRspEzsb9jg4b3IEFEC0HsAIzr1st1DHQgnTwddzFQByq8Up6WaGRwq4QzJrs9jYlJLM8o3ytrLQHl3seQTzHZcwVwIXB15tHQ/hCxaZxHB3hZwsG5ztO822giRj8YAdn5wpCSTEy3XC5sfu99hFf6zmvBAFvYcgsf3PwxuB/B5G2AsMJPqo+z64QOHpH3KpnGiXoliMgRvpJdpWyKU0CLAsKTKY92RBMdE2AO0BMx8ilrwsjhB4q3fbcftxxTCyUmC+OXp3E5AKjQHbNZYfeKk65R1jtzsudSlsRc+zikQMU33anCSTjM/Tk7eWZkvmfJF0kdjlXh4BQSKZOubkM+zHK1bkF2jXfG1XPMgYC/YmuBHOb6AOaII+LxUgbhwx0htxiEcuqBhf8Qadh8dKFxLC9A+KrpxQiT2QHE4t5c0loMRbgiWN+Y1mOLbnc1WOOjW6TperlitGNpIQSTfYX5/M9v0PXGAMhqZ3dgLOnuFcX7m/Z6r2qm; 4:ffjNtXP791K+H9mpbXGaV6ja0+6dbAg+LCQOMPVS3DoRVNCLDdxqv6pMPk3wGguLafRtu4oRnvDXXlHEq0oyZUWjG5g0WAv5l0QwNmHP1as1vLxom1tEw1x/T3xnoi2lIrRtgo1dlnDRLnzwYhaLANNm8ngVS90V3wA8L4a3e5FXCIgJqXH41AADvwRGC0KpNEdh3XtFE/uwqRptp6rYuAflKDiJ5I7OA+Byi1Tvd1faIEiKNVhLTYn2NDwH7zgepoEJrF1Kvy8MGnGv8bo+fhQtC+8parMx/r0X42B4X1XvHXBdoTYBKY2OvWk/8W4H 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)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:DB4PR04MB0765; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0765; X-Forefront-PRVS: 0723A02764 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(39860400002)(376002)(136003)(346002)(366004)(199004)(189003)(6512007)(11346002)(476003)(386003)(6506007)(4326008)(55236004)(956004)(2616005)(5660300001)(44832011)(105586002)(68736007)(16526019)(53936002)(446003)(50226002)(316002)(6666003)(5009440100003)(36756003)(16586007)(2351001)(6916009)(106356001)(14444005)(186003)(86362001)(450100002)(26005)(6486002)(97736004)(305945005)(81166006)(7736002)(8936002)(66066001)(8676002)(478600001)(25786009)(51416003)(486006)(76176011)(3846002)(6116002)(81156014)(48376002)(50466002)(52116002)(2906002)(47776003)(2361001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0765; 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; DB4PR04MB0765; 23://Y7wmZM6NXc3apViz/vjM6k/UvKC55GNL9o928ep?= V29mTWYwxoEzypOxUQ53uXbSEH7860YkuIwN3q2CpErt5v9kG976sKr7nkW9YCVTvU9lF3+hrXTS4waV+tk9VeSmU7bERR2uYI/0imT5uAlJBZBDymJqqt5udLdL5BiiTSWIU06E2bQIL0BQPNJ1QZ6/NYlDM7wncJis08FKFVTq+a0V7TmuOiaGwRR5sU2Rch6okwqJ7vhvFr6A+lF8Zd2cY72x6BZ1CLVNIAKnOUHrmGZaw0RiqSArQmMAgLt+ts99ycKJdHeO6Ix3Kti/bdKgW00r9xjx8du6DCTe/hVdP1IseFPsOWwrIe1HkmpJ6fqOHdcYsKpI9bhPs1MfQW0b1ACJNgGHvjqhgrLOqMISa4z2EO47PvubU0SozWD61wRZO8tDgVDDgTIETOFEo2oAXR6kjjqGEki/FZHKwuhJW+iX+BBsRVMc30F4IKgngv9kaF88HtK5MlLxGqY2akhHv3N8YS8jNR5TZ46g27+FOdM9QHBhzp6mmKGcs+mX4HUqKSFEortyhp77OTh89A/iQ3wXqQGC79yePfXlnwdWoDqVeu86zmh/hLZNkHmkbAOK5ReUYKUwS3S9iAIb8pKe13o9iEB1ILx9Xkq8SSTLT5IqXeLajNzWXALGdLIAU4BfTzF2h811HzBqEhym2cLUBamNrE/waREf3iV40ap32j6spci8aIuYUdokeb0a1/2+uDVCJYCKzCa0qwqRPfk2RlF/0qJghEFUrAmQq6K9MPnvUGf/nSUiWkq55PcRcH1TNhgUYQlAsG9nh1+RZCvVJ0sCrb+d5oCBRPvmo2neDRxb8/I+ykvad6U2rbLL87gwh1WA1T2lYFzgIliMDP6Ucjqa1k7Icc3SGEwuSx2pI8LhViIqUACmjbz5Anpm1fD8D3OyTElfplIMbpJ8vXcVmENaurBbEmBhcSXh8SYSrO5S60oFl/2XhdmUDjUvkkamMGk+Vr2Yqo/HHuxBYik1kNn4erQXzzhNBMIHg1LBasxLHC6UzVtjWTSffQEOlgB2M01cRxFNx5Q5YB1Mn8Fh++7BLc3Z7hzgekn7oV98AbC0yc+CoAUxsmJKpVmao6eGQECK+3TBxY3j4KnnZtoJn2YtdkGw+dsWS8EoEoDPipaagfohilKTT7IDdQ0JyQ+TGTIyo/L1gigiEgEKynEV9DMjRpRErtKFpqPZOE7eeywq+0SVobOx7j4hUiT2pP5HXooDDmXv48xdiHf81xJFaBnW8vKONXNLt4yiEauXfjhM34BQlHTM+Xvy8Vol6Og6m/bumiFIki+qCpgrjMOq7kP6q4WJvJ/skjMBNQ3pg== X-Microsoft-Antispam-Message-Info: HFB2cz6M1xs27crZGaMuUlPuAxMvu9Wi0m+/aljgGkbJc+LGoHedtq0+s59B1KgDi5fCN17N6zW4MwMYoke8P89DOs1C++7xUNS4QCqb4IzQw5Iy0PhZxfPDDifc2grPq0F8cKUafmgfYeDnnfDLDm3yspkeZAPkg4I6V3MYiVxObjzIQ1dGYE/4hfDQxd0WO7f31QKazZU74WyJc8CuG4v7Kt+877rQZybipbfEE4Hlj4F0rFEvieSb/UaJGWd/rytcz1z/axI5kNeCaMOTMTvfg+w/QQToTyh7sbnk2iFCkI3NmZNl7PwYHZhGV95BlfriSl+NSg+o51G5680kNA4EpbrI/WSKxegmRjm9Ya4= X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 6:T6B4FH48Rtx1Zb8t5XHwFTWMiaiClBYCHoCfPcZz5qXEwxSFway8AGA+dv5hdLEZXnwRxYCGqTdAioWBjbNRcVoClira4Bh57cf+V5ogJye2f7Mi65CNybgdH9QVwkaoXN/g+m5gsuumP4oWE0DHiwJc1BLinDFpPQ8/MaldcHdun/4v4sOKa5dLp0ZEPGq4YcMMz1TZoUVAtegHCrmvA/E7gs4N4hxiEpKYZsZ0iPdIn8Q/0oZWT4yPGYX/lXMd8PJBPXwMsnjiyEs4+R75KZ7/mrIlCDD0ATZUxb567Pk1pBGG2g4laW0Opg4HmnKFNeUVkugvIMzz+WLhvW+O9SUo46iStU4z0eaqRdnnv0zIC4Zt5WIT/IsnHDWUlPEtIZQoAGnyiy3SNUUoZRHdC158xNIL/kYdEvUfF1w4+OS5mQwgJvhR1x/zmnWbt7VCASTWN/9GAmf3os2jUXqMXg==; 5:yleGA5wl9f4a9tt+NspfyLcXwDIQmFZ5PIcq9GD3dXFT6XWQj937Q7wwNa9KH+AHNtu6HGYqanHd+diEgYXC/XIe7R+ZzuwaAXou1pH7oPp6PCxDwfNNAy/3eB4RcYHg2plAent78fh2n7Ocd6fHg8FGJTyxyc83GjXwOGCdIQk=; 24:cFGfSqDzRl5cp1a2ZJ3TZWU3m5YcaIqC5sJnt8rI6yTfQUmfNd66inVDt4HyGDLqYjq4IGqYrKxaoXGF2ZawY/FTwpoZreY/zPspvAgG4fg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 7:x1gjuwY328o4HrPXL3oHsQUEh0EEkAhduPjsBIwxjhocBlRLx8Fpl5YmaTFORm3WBmjAgjqgszdvjQ71AQpgJob1EiOWB8ua0hyFuRfZ3PIMmbD4hwPo8H9nM4ZeefQbqwLnavgerMwxLbv++oDumUNuMwLgEn8CYnw47ZjZ1rX5mgCJ/JepMNFmU+Ray2CY6dzpSeCoWlyf9orCtGJEdMA5iOHx8AFnaWX6mbASPj+96stoLOPmL+BDoT8Cuqfk X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2018 09:45:26.2405 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5ec69da2-5809-4e8d-73e3-08d5e192df2c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0765 Subject: [dpdk-dev] [PATCH v2 02/16] 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 Acked-by: Shreyansh Jain --- 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 Wed Jul 4 09:43:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 42204 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 827411B56F; Wed, 4 Jul 2018 11:45:32 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0060.outbound.protection.outlook.com [104.47.2.60]) by dpdk.org (Postfix) with ESMTP id ED31C58C3; Wed, 4 Jul 2018 11:45:28 +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=EISB5PGDWfeiuYZX2AudSn7MbeOKxT5/3ozuIetq9x4=; b=SiMuzH/uATmZgJgXi08Nk7Gs1Wh+uHvpyTPaqK7S21fobwrKFGASXJ7nl3UkijVOPRmhX6NacG1/ajQjWDQz2ApNuyeX8v6OGBvUXDE7p65SD14o1afkHDcs76hiKyzjNYWWI4WDOXFCeSEpMT0/Tai9U3Ka6Kw1Na68KYkiHrY= 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 DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.25; Wed, 4 Jul 2018 09:45:27 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: stable@dpdk.org Date: Wed, 4 Jul 2018 15:13:38 +0530 Message-Id: <1530697431-1244-3-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> References: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0008.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::18) To DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b7a15fa8-cca1-4c66-7e17-08d5e192dfe0 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:DB4PR04MB0765; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 3:wvqMOCrmCGUSXXyxctZO8KJPkEh6eH54J6Jk9Ru4cTZzdmr1jVr/dbf8vtAV53c4k462scHktYIPXpFUFFvzxC5Uw4+kn1ACZYeVmhN0TMX8DR42NCNV9aeEyZT4KsPUDsiduSalKdGNDRNpo0CpsbXYF5Lg+Hl10TciA/r+IOCX88gPRBuOD1yhK6iK1qcR8ebOSd9PfKc2rtJrdEkzS1dVQYeMdRKbedW8hitaC8FVj7Lg52r0txYyYXqqhsoQ; 25:8k2k5tqH59MTG9lS9xdL0M1rWIZ7Te9NalMhuuMANbl5kTAcMQK44fs1EoHzKA4VbZnxtwJf6R2B0/VWheovn/8Hk84dgzG6mTXESAdcBwcW9RlH8FeEpYqyxCcCGdfuFY1CLA3IgRf/9/JCTsuo7DiMU0GJVdsCE4Jmk4f5MapuorioOnl3rR2ocnVThMiAkKI5D6qthFp4N5/8eXAp5oSRgS87NHH8uRGXLUFC88QknyIRbKj8fPtZdGn1RPL3bAk0p9uxfmcASEBqA507jTOj/8UYvHTukyTznWWHZtCOfB/bqYohqJFCTVh7jvfhHPjcUbYmv+oG2HvAPNg15Q==; 31:EZZg0K3jI8UZICTVHZNj+oK3mjGk9q/m53gyqSHUxSY90c9MjYxiGWF/RSaTTKbNqZwz5VupcLclNW0QhPhnPS+gKduz6TLllTQGOd4bLx8Hfn6RpwbG4+4T0A6iNNQxxjZRDnk2h1/YjSoDT738LJz/TJEyna4NltG8gyCf9d42d8bFaJqcltnPTyuMuOQjKC3FqYfXu0GLjCG9gS+4K5nKqwKLgxp7ON7GFUJWv5Q= X-MS-TrafficTypeDiagnostic: DB4PR04MB0765: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 20:AhOkYMny5qpT16Tyw+wFajuMHBi+adnJTgQ5p/KNdPuTv+vwKdT1pHVUaCBrbNAN/WfwuS2JPH4DfaJAIegvGc+iVKr4rl8DdAw5NJy2vij0FcMVkK08LOtOMPecptvcBDiZeEqLTOVE8WG48IUE4P94llVIzRvAEenjLotVaPsUjxnGQG/IbpZ5sZXbVWKC1EGavUP8Mq+HaUgrQ6FbZMoPCvtBrGLx8nQOSc5XThO4McdNDCP79XpQwCVou+5C+sJN8YMy97bcInEmOdo1B5jlxPOXBcz57G/tKHpw7tujvZb2px8KSriEM7zhx7v0aoD7vYLzU92kBCssSCUnTWiTXY4aKpvYSq46dqKO4KjIKShJRuMHvp5tqebbCHxLjYgYupqkfBK+vq2otXPVG0mHtae9ykIHAEnmYqwUPM3wfNrd6aqF/CuEb1yuq7rVV7XyaseUWborN4PXnr6utF8ShX7a/R8dp2iR94Ynw+YZoD6abvupQpO+U7p2rEhA; 4:D43KybYb4Avc4DHQTBBCRqxuEohzPv0UoitCzgdAulr4Hk32AbgDjDjbuuFrJWp27+wT/Cwb74orpvfZXd/NxT8l6rAfnHbf0M0SQGxOa+VvtRk8Kd5Ua9o4YtN4LW8RR0udcKYnHjkupQZMnMwE+zw6g0x7rwUoP8IzYj4dnyj2/puQNrDTbdRXJYJTYOMqv1+xYIHqbP6E99U32AOAWtWC1KM79vV9VFjAjqbyoMP5B0GA2gY65PimLx2V87zgiaa1zOo09ve082qYsmcGkXVL8ayWEQMkf0gDTBezfPfKsEV5TQ0U23RSDaFEr7GH 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)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:DB4PR04MB0765; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0765; X-Forefront-PRVS: 0723A02764 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(39860400002)(376002)(136003)(346002)(366004)(199004)(189003)(6512007)(11346002)(476003)(386003)(6506007)(4326008)(55236004)(956004)(2616005)(5660300001)(44832011)(105586002)(68736007)(16526019)(53936002)(446003)(50226002)(316002)(6666003)(5009440100003)(36756003)(16586007)(2351001)(6916009)(106356001)(186003)(86362001)(450100002)(26005)(6486002)(97736004)(305945005)(81166006)(7736002)(8936002)(66066001)(8676002)(478600001)(25786009)(51416003)(486006)(76176011)(3846002)(6116002)(81156014)(48376002)(50466002)(52116002)(2906002)(47776003)(2361001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0765; 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; DB4PR04MB0765; 23:ayXrWhyWXNaPh8jf2iN4XaWdENCaoDWQCiAMRxMb3?= ucDiLSVgzX2FtPGPx0Y4arSKVohloZWrZ0KQepIkbUu3NezJxw9Pb714ddz/KpTqg4WUJHjRfBTLze/EvbWn2U0mvxHwbpVSIIE6gPGYx4fFUvIU9iodpwnw/ikvC+dUPKZ0QViJjo42QJ1NVow39rJpGX7swu/MzLA+Avchn9QgjIIVK0mrQKNb2HLyhn8PuDdgIfLD7VBwgGNHpzAG60D1/XhQYFwvQznGoT27jkPz+i7IXUXoUsyBiCS/GWb2W3Rdudjcpra23VM7zosA0lnpndIJ/Zn2iFwLEwjyQwKaOQrkLPkfDHse947kLYS4qYXWTWqszccqLeX//Ylzfk1Dfj5yDrtg3ft8CRJD9FijiVWPZCwgRa/J8F9XcxGPH4ihEaDEWiAGPyspoUE/bW+9TAcNigz7hfKc/PRimU3qpqi7kD9yk1397sT5TkxHSQYGWr08auHnnFvpEp0svTVRWmXPHV1BOeIYDF3TXllLeClP8svmF90yqfTf/xF0oWY+Q1jizgXYGf0048X9Zw4KetIP+Qz7FYLhd38YPSK3ARjRryYq7P9oRVvcZy3SochUNz0vOexKllQluhhQJbiz7taxgGXcY+4M0AqJJwHCpp/KgogiQ6Ny84me3cRr4cEkJUopoS35uiMdrEkM6Tv6gsXCYYT9zepOXHqOOW5gLl6X+nxwEkM5NhB/lKUdSeUzHRc2jEvdTNiF253AVxWUjGQNBquk4nRsInXLGRWyk6RHCDMeEatTd5MeK38qVMiz5HiO2eJ+J8PbcGbJTzja+v4YHgIXO6tdjuyaOp0HuDOIZIBZ2NaPDkwyl/waigW81SoSU5b2XBV1r/KFn4WUdAN0tX9r59voDchrXB+DuADTjcDo3VUStU4TwA7WNNmCaos2w/459upFKPgBNPnfTGPPK0fv6nQVfg2f+XSOF5XinctvSl+THUEoshtlx7z9TQETJGzCOt5WJLqyTm3kj9BD6r+APhoyQOW1D6RzsA5PuJyKNPkizjeuRiSu78uIZDBQKDBfULc6GulWtNRjy56Cu2BkJ4MJosqheZGK91ARu4EvcHkdAKG7kuQ4oI3tlxxxuI7cmAQIPlf1jYfDpNL54J4Jdz2LgZMas6TQ2VqRxv5HCbYWlBbZD9aa7sa5ZyoM1gdNC+yv0JWZ3VqDAMeSjh/4+y8uc4OL8h9u2IV9UgDzuUUJd3J7JVkq2tjwF3MP0vIw5PsyagFUDBiSxktR6jc8jkORV0r0m7XFJ9RPpvjkiulLSGF3REMpUek532AkmneOmnb/o59CCtB X-Microsoft-Antispam-Message-Info: YeaCs+lIFdQN4QEbZ81S59Ac2XPyV3c8ZCN+q/e1m2TRUrrq9YHdbN/ykG8s43BDcqjdJdrZCfABEKTafT5KFB1+cNNdlq3KPh9T47ZncaGI6mAM5pq65IUZ9oesx86Go4hNVKH0ar/bvhc1kgiiK2MISZ3CUnG0TIw0ko+Vo5co5rP0E1aiB/D06XOvQgGXKGA8Bun+Uk5tJpkCd/iZMt4LOknNzlwTbEjFx3F8oSxLsJNky4aW9Khp/pmy9TEQIBdf9gIOrzjptK0u1LmUmDY2RCOJ4yOk1XbQku61WePsdk9RJrSQtpDhQez9e3THWCHqBKuo1bAkFi5pnAajxoZxdTNSEMWgXvPgxw0acMk= X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 6:KRv+anW3YZUwRd2A+a8990Q3/fni3iBsyqUokz8rk9pTKsDCErJYe9Xix6YIlWJ4tIzENOBVVfJpb8j8pcf6Lm5PUTRIp8CtHAJjOPC2Vvn4Q+mqU5MdN5EyF0dlPlErELX2yd5GiUixx7W4jqh+cgzHXRi1pAcJfJCVDlrF3mtICMs6ZrNVq6T/dWUZqaNU4BJEhZMOCbTfhEMYKVn/NVPC4ftsEHijfjfFcAKgoCi9yYf3ntcxRj8/UWUEEowTdhyhrHoa+o4EYM5qwzG0Fe7lSFMt4FlXyU8W2njShUoXwl/9rjwUHFxv59W6K5givAuD1hhUjqvMcS8LSLhmeKeL/KT/jGRt5gT+OHakhmIArucLfyOT2o2CDSqS6CKC+9LPeZx2ceMTNRYxKsCd2zoJk3aj7AiuCX1ns9OFjqJUzVx6mOrF/O4RdalYCSY9ZjyJRkNNd5BpS1LfN1by9Q==; 5:kFVqhIFe93TN6mQC4FptK8LfmIChZ2/BbgW7nGY+hpzmNmpmsXJdRACNQuYPW2mqG430mqJ1bmf1IgU4q/TY3Y1TMv6eUj+CQ/Nu4Jtl7ccmRxFzQ7CNO0Hv6sdlQDgXaIMKasS7aNBL8vhKHqEfuQ8fLk1rH091N58PyjCAymA=; 24:PYB0Sl/oiEeOocX01fuu9hoi3o7cwlJa7F4xmgM1GFR6edvN07+mQNI3COMgPEB84TL372AIGmMQZ3eo+Qk88yP32JiU5DP17oF3yLZ8y6A= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 7:77Yt4aM8BY9g/PCVFSOQBMQ6NtKUUdZ59gijsvdlY3hIgEq4CziHcE9ngV5Wh9PElOg+sL/cls2rWgTrnNukcIE9o7ICYosYSEA9+BwarilnDnH/M2BbijoeHPFNum0ary/9VVXVN2qNWYaJOzshuzaK20cVcie597V5eOxd30KSHP3FbjLeMArlcHUnjxZZFABd3N4YNrx/Bm+F7gIYpu4KsjIDOMZ25WxvW7cLCjbox/UgQRsV6XEaJVvV3Z50 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2018 09:45:27.4284 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b7a15fa8-cca1-4c66-7e17-08d5e192dfe0 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0765 Subject: [dpdk-dev] [PATCH v2 03/16] bus/dpaa: fix the buffer offset setting in FMAN 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" The buffer offset was incorrectly being set at 64, thus not honoring the packet headroom. Fixes: 6d6b4f49a155 (bus/dpaa: add FMAN hardware operations") Cc: stable@dpdk.org Signed-off-by: Hemant Agrawal --- drivers/bus/dpaa/base/fman/fman_hw.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/bus/dpaa/base/fman/fman_hw.c b/drivers/bus/dpaa/base/fman/fman_hw.c index 0148b98..7ada7fa 100644 --- a/drivers/bus/dpaa/base/fman/fman_hw.c +++ b/drivers/bus/dpaa/base/fman/fman_hw.c @@ -16,6 +16,8 @@ #include #include +#define FMAN_SP_EXT_BUF_MARG_START_SHIFT 16 + /* Instantiate the global variable that the inline CRC64 implementation (in * ) depends on. */ @@ -422,20 +424,16 @@ fman_if_set_fc_quanta(struct fman_if *fm_if, u16 pause_quanta) int fman_if_get_fdoff(struct fman_if *fm_if) { - u32 fmbm_ricp; + u32 fmbm_rebm; int fdoff; - int iceof_mask = 0x001f0000; - int icsz_mask = 0x0000001f; struct __fman_if *__if = container_of(fm_if, struct __fman_if, __if); assert(fman_ccsr_map_fd != -1); - fmbm_ricp = - in_be32(&((struct rx_bmi_regs *)__if->bmi_map)->fmbm_ricp); - /*iceof + icsz*/ - fdoff = ((fmbm_ricp & iceof_mask) >> 16) * 16 + - (fmbm_ricp & icsz_mask) * 16; + fmbm_rebm = in_be32(&((struct rx_bmi_regs *)__if->bmi_map)->fmbm_rebm); + + fdoff = (fmbm_rebm >> FMAN_SP_EXT_BUF_MARG_START_SHIFT) & 0x1ff; return fdoff; } @@ -502,12 +500,16 @@ fman_if_set_fdoff(struct fman_if *fm_if, uint32_t fd_offset) { struct __fman_if *__if = container_of(fm_if, struct __fman_if, __if); unsigned int *fmbm_rebm; + int val = 0; + int fmbm_mask = 0x01ff0000; + + val = fd_offset << FMAN_SP_EXT_BUF_MARG_START_SHIFT; assert(fman_ccsr_map_fd != -1); fmbm_rebm = &((struct rx_bmi_regs *)__if->bmi_map)->fmbm_rebm; - out_be32(fmbm_rebm, in_be32(fmbm_rebm) | (fd_offset << 16)); + out_be32(fmbm_rebm, (in_be32(fmbm_rebm) & ~fmbm_mask) | val); } void From patchwork Wed Jul 4 09:43:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 42206 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 04B9C1B8BD; Wed, 4 Jul 2018 11:45:36 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0084.outbound.protection.outlook.com [104.47.2.84]) by dpdk.org (Postfix) with ESMTP id 4BE5B1B4DE; Wed, 4 Jul 2018 11:45:30 +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=OjpTc0BROQCFJMfxEwnbV2jbMVbND/Vo1cuH8J7ZE90=; b=VhX8dJVcbaAWmDlRFmRzQK8NLV+Kz6OQS+cbFyxX8+nth3h66BsNK//ce+7fTLOI/h50SU9/uWGLLGnFEwKrV0gjJvD+MfXRHZWyiUn335T6NGE1giwPqZF9uO6T+hajXa0gcFw8MepLESfz40pHf+O9oaTrmUWXUGzldz2wj7k= 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 DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.25; Wed, 4 Jul 2018 09:45:28 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: stable@dpdk.org Date: Wed, 4 Jul 2018 15:13:39 +0530 Message-Id: <1530697431-1244-4-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> References: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0008.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::18) To DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bb636076-55e2-4c9f-a075-08d5e192e07d X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:DB4PR04MB0765; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 3:l834s8V0XFmc2grSIRZMkr955ZqFi7X6jtwj7A5Q0reqFZlzXCZx9TMgOnebOBtrQYvoEmsquM+YEYCOqJXtjLOPaL4hHFfmlVyJjjEmsUGnNDQT2rFk8eR/FXlXsPlVZyb7RwcUnFxZibuHqTqKve6RRZt6UZ42nct3M7l1Y9XWya9C0QlfUB3phelNmWg8QetYJWyBKZ3t44EylWnJOyii+RfCMfwFhDJsjZskF5oTlwy9gscYlQNxVVU9r2lD; 25:UDspwetOluqkZnfrZn6O6iLo5f/1ncTgctrAyjdufHBmVSyd+HTD65ijP2fbptPgZZhLnpB8KyJH2HIptkqfZoX0ywLfYV8hVueW6LMxddEMst/0Bu9zi0k7Q2Uiq4GRGfDSQ4N+xHjo05KT3wJm2OrBzczdy9q11ZrP1RkLRYYBQ3d/hZnTp7Bmi6NDFsycFQGO/XYdzfG5eU6ySSMDqxpfYyuB3lYmmjN2vw2A8tAANEorAQBEXa14PNSLdVyT3b0fbYFUYRqiTCwe4HD2nK1DzwkL6WRuEQyw4RAv9RlvIZKWayQhpWX3cvD3tFGBPQ+OuwmuS72/EEG0TE8ORg==; 31:sSihc+bKmShrrMnvfbuu5NBmnHqF8b+Wy5qV8oFh0u/qytbiO9PXqYV8P5f2f3Gb33ZWu4PlRXVBZNq4PsUCYbzEiY7FwED4jUZAKvfVef1RHkKX2icIu9UUs6/AEz2HhClaCUOoL7Y6TD7DySKyqZRXX5rx57ZSoQKCQOAvgsjWKXYwkPYwM3o+ec1EKPRPb6Abp41lj9opeq8qqYIwfHzjW0Ewuwf975/YiVDgXrs= X-MS-TrafficTypeDiagnostic: DB4PR04MB0765: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 20:8qm+84TQOOCednnbWG5Hvy/hg53DxusEwF72knzPWEK7RrH4wyLyEAn308NVZr9daMgWZJ9ZvHvjbecyCAianO6Ym4bQrZZhqjkPcS4vzZaqzuVp3E0aaJHKLXEZFq0tEgTGo2300eXRRm/2fd842VzpefUfjkJopQcTPEJcHQ0T8FsUM6Lf0QuKlJmMwOxkgqA0T6L+J6AyiiCmsKBS/1V1/oso6x/zHI5gc1K9p+ST7kTuljEmaynJa/aCVZnrKuz3aOsQzVb9noR0kOF4LkFbA2Omj7TKe7iHYGD3gBYwcm4vnj2QfmXeuSF/nWwY6tZyeIgEhgGGu9mrLhHUTijLJKGtN/A+LJHK/dzw6hjBG+sRVj4aAH4JGWvlVc4XxxYF6ilE5+Vs0PocZBl29cCwqB+f2boFxgy7ZbZ+dfb7xHKf5ctjC0tEct6ibR6QBEcPJhwOiwsr+fFXR1wzLmYHfgOGDv9k6OYJ2xFfPaup5b87WomLC2ZhqItj61gZ; 4:iCw3aIm9/JIUtvmUDE+tSY/R2sCah1txMNL+5xFgFgzOQoW+CYe4DZL9a3x4N1o/KWQB4JM+CstqJAwMEstvBovb6tlF2omy7a+ZTlKlXDxGoIcnR7U7cgEXp9zXoFRtrshIUxwnUwCdsXrQQnUBUZCJeu5O7obmL2a4QpRItUISENZOWuR1aIGZ5UK6O1Fffi9uD6YwnPlU/axTrS36YnbQb0qUFLZz8phmM/K3pPXezg0m85AwyhxzdQgeXkELQjo0sW7O4nmmL5c2R1vRPer21mlMfb0qzfH8GkL4t+j16lh2RVTCgy/ZBEXPZpl+ 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)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:DB4PR04MB0765; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0765; X-Forefront-PRVS: 0723A02764 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(39860400002)(376002)(136003)(346002)(366004)(199004)(189003)(6512007)(11346002)(476003)(386003)(6506007)(4326008)(55236004)(956004)(2616005)(5660300001)(44832011)(105586002)(68736007)(16526019)(53936002)(446003)(50226002)(316002)(6666003)(5009440100003)(36756003)(16586007)(2351001)(6916009)(106356001)(186003)(86362001)(450100002)(26005)(6486002)(97736004)(305945005)(81166006)(7736002)(8936002)(66066001)(5024004)(8676002)(478600001)(25786009)(51416003)(486006)(76176011)(3846002)(6116002)(81156014)(48376002)(50466002)(52116002)(2906002)(47776003)(2361001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0765; 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; DB4PR04MB0765; 23:GivHEGBuphZc9CMWPYJ7F8oCXtaAECecKym04xOS0?= 58fMGKHIBQwMhAES18Zlms1uf5eIazROQV4VAKqZwi0nK4CBP1KDif4PUQ2plCUI0AetTo/EMyaqqznBrP7t6469pSf1djDxB5BQQCFbaLGauxM2uDVsiQJpylojO1g1JHAGJnmqc14K6ORtKPgjpoPZ+pzgkof80yyAw3SeGpm+apNwmgNcR6Dh1AuQgAiy0RcLWWfrVfhhJt3G5UQSF7uVslQGz5rMXiMRmNerLmskiGQatogTRAyvzsTEaSqe5fZfLgpsBr36vv977MFXJg919XbU6YFzij/sD/MA4IcxQI34Jn+MhNniSQcx869HPbhQnpFmDE+jnRSC67GqaxjvU5PrVkrwlWR8m28TaBKrsxWENw0PcMRHRkbNo3okr7A7oA3Y0KJzmSQtU3gUbifYkX/tQ0WbCujQ/27BbbdwZgu65Rbr+u5v/C6KFiR1/GOcWuMYDEWVQ44P7jOzesHcJrwKzKlIuGOwOW6nLHjfPqhWQgs0g4sCrvETTxlCh6jjlhlOizOgx9yI0057L1+U7eEthOPhrHM4f2X3RdBW9hDk9Kwi5devLCv/7yfkVIhLJbzhMs7Bhg7a8Zyhj/IZd5qNyt32XIs1gHuAyNPeFXoX7dAMWM0TDt38x0g8gr2oimmIFibhGU2w9l3/W94eXNNBxqMJuuwq+2LQLSGQ+gywLTdMQ0JVdBo8vLwvTNMJmI/VQyl92hZoT4oZ3JZesUp6ss5VftzAbsw7MoWpPDJOa+8Tao4JToIVHCCNPjm0DG3jHUJ/R1CQ2L/jrV60jAn75xXSulrEUTNXu5c7z4w1BIWhN6n4Om2sp3FwruezEI4+pu3lR8yq3trotN1Z3cCBlgZFAz528bbnoI6fK60diAyiqQQgXVkaJDWvtSpTs40DFPc3wEtxuHdARWxkHFb//4dGP9D7pEtX5wtV022AXIBpy21xkWf/PLyVXIFubNRMo0hSAexRupYsG50xVe1PICIkOO/2bdBfEJokYTKtfNlAjTges5aLc8M4FHRuPSE/HIO74qtMefiRb0TS08/top2Gtf2f2Ci0C4bbI4npdim3sGzb8J19OQd0dENLHi3NI/czgkukhGphqi8IKyUxnWwxw+ZlO4xPh8eftLyW/t5/jSrXV6+QW7SwOtdQeP0OjUDbOOA1Gm/0EH45gY/rdSjk5R9a0CLxXGGvpKupY+N562HxEskZJtRFTJHAyGYddpsFzuHlusx9dhu/XCuWdiWt0u8WNGw/ogART3+UDJbvZMk/szD/X4ta8ATjVXgJpR7LgMXo/lActWcLpZgRCfzyyUhA05ThUIbbg== X-Microsoft-Antispam-Message-Info: hmj7AHISpr792+WUkGSFAMhwX2NYIvaG4PapAOk1yFNGYsA3QG+g6KDIeC6M+8yjAYG4zlx+RhwVLZD/YwqYBGoBLqNg/eOFLWakT3eD1L4CKNhL8hEsQfSG22PQeoaxB6SYPoMec4Yrlldqm5RiiFo6xcaySOMK3sHQ+qZfkCz3duClnUawa5gag0aQ71De7ho5u+MknwBsxlsZ4tfCIypEJGd+clbxb3fBPkOVHIZY3QeK2NBxRScYUPxAuwtoAcsp9OQDnjh71TyZTE27mJY1O62a2R0l9ystl1x1CMM4pjbhxARSU90kx7qJPx0WFnk+KGcjvyaSu9Gkxm/Jsd9X7U9huLMJMhb5EU9V+mM= X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 6:fHlWic6IjiNkkksgWWYzKqPCckU/inlkneVMJr7gBylhTvgvQOPUcMIfPaqnjxjDhilfTWDjhRRAflqhpwpAVrYtyiIJ9+KEZKfDglIQuxWxsZ0B6Lc/23Hc4KC8cDtq3W8Y5DPOBBNKcw9vo1bFndxrLukJECX/+duogq99ZD9i297WcR+llHa+bXGVf3HvVafyknRLrzloHIweAaLl5eeYnylxU8FJ+FVJ2I44L4ZE26gKvHNurfUkWLC1KJGTlBGr2Pc0m70Nxo4XuEL9yfmM9ydYFAw5z5+OunsSuKxHgJWb6aARXGZ/IGy+KUg5gm/rYlkBP9qa/1rV1I39mWwFxhf2D2U+t1d0mECf53OyDpDx/FOdS6TxqQXNvo01KJSz7V6CcpzlKWk5aFZcCbzt9cG4cdw41FnYDpy8u/LlXaBfKa0XmjdKjO7odxxDvSbmv7jS8mm2Sfgg8UeL+A==; 5:0hfBARUK0JCZ5s6rRdXfjKZwn9igMFNAZVlkWUsMnG3F+VlMxnJS1UkP9trqnJJQZw/yT1iftp0vvBVg3hFSkx+gF3xASnNWXLoSsPPo/Cn8l/b8iVVyJud3oxm2ZVbDDiCnetaDcNBfWTQunaB5s+NY+CNeUk+2hzsFpZcG2RY=; 24:HMSiYQaiBwx2ZkL+ySaLSeldK+zgxuQPQY3OiYj0CNJfEcBCfd4mpCyrICiQ0bZH4xgcXID8kEGG9HUp0bPy2W9nDlqkollW0n2gWRMk7+8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 7:WdhoeQUfedunqkPjk/DNE1gg5fb02kUaumxAK2TBX7gGcUlRdbo9AGrRB1gtMh/K65++fRAEv/nYWiPREBamtx+EwrugiYrbQm0qf1PUjkygDzAD344akmyyPIpsUUzr0nYjMX37+rjqEmMIaMn6BSTgZ+s2s63oKDJL4XSvW141IThA7CHLJ3yQ3UZYmlg9NnQWxOHeBfae0DLfXgD30UmAFkimeyTR6ZsfTmIKVFCXZDuP+6zcfe690j1ywdob X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2018 09:45:28.4572 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bb636076-55e2-4c9f-a075-08d5e192e07d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0765 Subject: [dpdk-dev] [PATCH v2 04/16] net/dpaa: fix the queue err handling and logs X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Fixes: 5e7455931442 ("net/dpaa: support Rx queue configurations with eventdev") Cc: stable@dpdk.org Signed-off-by: Hemant Agrawal Acked-by: Shreyansh Jain --- drivers/net/dpaa/dpaa_ethdev.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index d014a11..79ba6bd 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -516,7 +516,15 @@ 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); + if (queue_idx >= dev->data->nb_rx_queues) { + rte_errno = EOVERFLOW; + DPAA_PMD_ERR("%p: queue index out of range (%u >= %u)", + (void *)dev, queue_idx, dev->data->nb_rx_queues); + return -rte_errno; + } + + 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; @@ -580,9 +588,11 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, opts.fqd.fq_ctrl |= QM_FQCTRL_CGE; } ret = qman_init_fq(rxq, flags, &opts); - if (ret) - DPAA_PMD_ERR("Channel/Queue association failed. fqid %d" - " ret: %d", rxq->fqid, ret); + if (ret) { + DPAA_PMD_ERR("Channel/Q association failed. fqid 0x%x " + "ret:%d(%s)", rxq->fqid, ret, strerror(ret)); + return ret; + } rxq->cb.dqrr_dpdk_pull_cb = dpaa_rx_cb; rxq->cb.dqrr_prepare = dpaa_rx_cb_prepare; rxq->is_static = true; @@ -657,8 +667,8 @@ dpaa_eth_eventq_attach(const struct rte_eth_dev *dev, ret = qman_init_fq(rxq, flags, &opts); if (ret) { - DPAA_PMD_ERR("Channel/Queue association failed. fqid %d ret:%d", - rxq->fqid, ret); + DPAA_PMD_ERR("Ev-Channel/Q association failed. fqid 0x%x " + "ret:%d(%s)", rxq->fqid, ret, strerror(ret)); return ret; } @@ -715,7 +725,15 @@ 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); + if (queue_idx >= dev->data->nb_tx_queues) { + rte_errno = EOVERFLOW; + DPAA_PMD_ERR("%p: queue index out of range (%u >= %u)", + (void *)dev, queue_idx, dev->data->nb_tx_queues); + return -rte_errno; + } + + 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; } @@ -1016,7 +1034,7 @@ static int dpaa_rx_queue_init(struct qman_fq *fq, struct qman_cgr *cgr_rx, DPAA_PMD_DEBUG("creating rx fq %p, fqid %d", 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", + DPAA_PMD_ERR("create rx fqid 0x%x failed with ret: %d", fqid, ret); return ret; } From patchwork Wed Jul 4 09:43:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 42207 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 C7BD51BE63; Wed, 4 Jul 2018 11:45:37 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0067.outbound.protection.outlook.com [104.47.2.67]) by dpdk.org (Postfix) with ESMTP id 043791B571; Wed, 4 Jul 2018 11:45:31 +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=S4NIEOWoosDmu9krWrkCJn+KnqklvUvD5k3oIgIZxLxDD7LEKSP3Jez7EoE8rh5fEAcZqDo0drZrtqn7O2+CsgPNyK02yFF95UBN1RW1tVQFi/PY0dR337VVBsoaueYMed2DAnR9DQ1F3V0IUxaqjSAKZTGvWCRBhSV43J4vTxg= 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 DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.25; Wed, 4 Jul 2018 09:45:29 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: stable@dpdk.org Date: Wed, 4 Jul 2018 15:13:40 +0530 Message-Id: <1530697431-1244-5-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> References: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0008.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::18) To DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e3d58c76-3066-472a-d480-08d5e192e11b X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:DB4PR04MB0765; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 3:2zBUdRuR+cpa1CGlz7R+HQBuY1G/YPWp8QmHU6WGC4QyRm3f9CTSpp4raLu5iEHxLVaqxzFSGtheh7GQ+DmNla70jsSKy77rG2x21+Dm0rHUvZxscdR/5QrbTqVASFf54mPNyZQB1ldKbGsViPTzqkN2l5o+U49Tmxy6XmsfwqO2Ljoec4XsiRJMGlljxmDS20xQOeoxCR1QElpXDfk+bh+a9af+zfGRDj5aZwPbCL+qrea2MFjQZGGVH/akHIo4; 25:+5BXidEdxRnJbd3TKU45zY+VDFAFKb2YOY995av9pTrAa1k9ehNfbya6XHHMVbDF+b0uvQLdEkp5I6oZNaAFF2DGV9YYrmlDDM6gebp/2HPdJivnVj55J9zYKmG2iqOIzxYNtDPC78IdPV7tDXPZIfQFTqHWTYM+LGUMlg7CXglVL9dRQqHnk+0Scpcsku8WiSxe0Pgafgx2377pNMIIfGrlWuMoZsqcN5V7cgb84/sc2DbElT7YgBJoweNfUKU4g3rSq7QVu4pbfh1KWZZ46MOVhIm8kmWno5XabJ8bQGXCd6EXpqFOB2TnDkeKc/6XQphOhGLmoYMOFDMIA5tanw==; 31:PJYd8wtUEwF9T8ZJva9VBPyPGnKJNAMJkcfPPXbIRv/OtvjdE+JxT9THM2pc5nROdvvtKEm+f5raZarms7pcDEnjbpnUJmYznF1SL+e9LWCQYaXNXVOM58czG7RxLg4KXhdk/yuUt/r6YzKov3XfmD0DLdDrelzAZY8TsNdhIp36elWuZVwqMSzyyWCF2Sc6Gks4sigst5QeCF6MM+qjyCUgQnA1ZiWTscEyDFXP1sQ= X-MS-TrafficTypeDiagnostic: DB4PR04MB0765: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 20:rXGzeRCrI+wtCf/FHgPrfpwXZmYhv2mK0vHBBQ/ecauBLRO/S3G2jMJkEQPaVjtk7uhp8d8FH27ZQBDWcnu8cgDn9TgUL/sUI6Ped3nS8QhBddFtEcomJ8IeOfwf1ZrSH3QeVmsjQTMiVWHhvGb90pULWJUUKrJBr518Dc+Ot+e+Iyp8HA6cqX+CuCyhGSU+r5lgR14eF/hzC9+4h9OOGl+t5uTJgWmaBTOwY7AWDQ1faAhDvJUvdRto29HlBNmcVLMcoGQNsUgAiyfsr8uPl/QtuAm/971/4YDA5uJv+f8NIxee0fvGhLpUg1PUTWnmupEtAUhjD4NJnonxYDg/xb5RBwRqRFXxT20D+gR5qcknLH53/6ckV0Rpip5sOqcSGJ7YGNbDsa1CtpSEqiTuPOaKJXXo1qEvtT4Al3hKPN/2gANxKY9/j7KFwb70zjJtwjGoMp6hrwDj1FZjRuG8NgBYDlm/zBBHaMUtEINHf8Q/Vt2eNg2HoAFVG1dN6QMX; 4:pvuki0N9s1LVzd7Td3ceqAgZu49iJGyIttS7TVAD/O+D7By9k7dVPuyzdgBIhQzPrTYQihmV5fgSeAvEV/Q8M9mWcktW3Ol5+4+fngHUvkDwh2FkRYboGcsjYydfYHXCwtoqQFkoWPkyHHdKZVMns7/HGhab73pFNJp5pLII3HDZ9dH7ErBENA2N07obzrjEegYqCi+muNLwzTpkAfv8YNbCzugSzyTwp4Wf0yFL/nlP8ZB7WXlreVPe5XV7kbnKIGQeWKXHOF7LO/XmsKm/Qs8bqypBOFDvC/1TYQZ9ngyx9G85BNqp5aX7ktfsfvni 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)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:DB4PR04MB0765; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0765; X-Forefront-PRVS: 0723A02764 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(39860400002)(376002)(136003)(346002)(366004)(199004)(189003)(6512007)(11346002)(476003)(386003)(6506007)(4326008)(55236004)(956004)(2616005)(5660300001)(44832011)(105586002)(68736007)(16526019)(53936002)(446003)(50226002)(316002)(6666003)(5009440100003)(36756003)(16586007)(2351001)(6916009)(106356001)(14444005)(186003)(86362001)(450100002)(26005)(6486002)(97736004)(305945005)(81166006)(7736002)(8936002)(66066001)(8676002)(478600001)(25786009)(51416003)(486006)(76176011)(3846002)(6116002)(81156014)(48376002)(50466002)(52116002)(2906002)(47776003)(2361001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0765; 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; DB4PR04MB0765; 23:HB7Ew34c0s8w29g4h+Q9LMorKvTYxuDVyQoSnwhh6?= oPZC7ywZdEtzAtRyhFhWTX2hXh66ZIH/wqQJNnGFS14zRqMViWKBmDvkzgYKtrJ7PG+yFRfeJvI1OMSxXY6C7Qhg7On/X061ZiK+FQYfm8M0LvCg81ONI+rCxk+QHrNUCztWHioxwrN9NP/tUARQ8FLYzq59mecTIjvqjg27+3Ml5/RL25jhgvQb6fP0W2CKPkAxVf7Aav2+qxzl6kdjBgGqwTbdGko2ZpSX0Qjkld4YzUip6GxpRboXgopbjWvOsQUIOPRY12JNc7zQuktIvYAM3EXLHsRUnOKRQb+TpF35COtBE1sjKWCmqIkQVG5f1oY8Jk5Fwfn8oIyVFw3n+EDK5uI3fZrCwKCq0s9QG2Wba5HzCb9vGvXsz7GwlndzL6mIJgbzCya8TQ989AMvE5vyrmXhdGJzuTe1pGtlNyB8gIaWdksPuQgAtqJsdlo5eOs/iXSqPQIkcKLDmFkVL1tRBxn6zw8M7Md5VVICz65ZtMP1ZAz2fw9ASgto8pgRR4VGKAB/AGK1D9tGNZaQcAYl626f5PI+2LhhFOo7b5AxgEUCWkQ8DmblbJOg/mNmtVAQD+iUidbWFMhjcQ6C1U2IgWUia8lUvscrDBoh2aAYQ40qTLYkm4X3haBySWHemeQ13wuCeljPSJK3KIq9E0VcVmVHxyYwId+F22hX1l+09XbrAsQ2KRRBcX2OAF9+RUt+Ntp7xRt3p6bC4bkT46EFiUSy8dMK7rc9o0chZ+4MuMMzkPRiy7cla3LWbTxG5QSsUuj1mP4g9U65oDXlJKrhlnkuDd9B9bsZmzUwL9W2bF1vdziJAYv3Wu4KHR5UrKvsggceS/J4Db5LeE1AhyBwAl4JNHAN62C5Yoo84xiUlo0bTILwIBLkLR/yWrv/LTXDEHmpjKwJOqvNzFjH9lEdTth9urhxwjjVxzXLBpJpJTRU4cyhzSUr+4aEf/xYKrYoU10AST7Lk3WfkpcfavOeMZ1/a5FLuUTNMzRd3O/6T2sz26W4PSbssZV1nh3mCc8APFS3BzE6OenUx19LwxqkfhuUQhgyEzhuvPonle8p7w7PDPi+3PsQHhzAA6pGhR51S+ca8NTkbqYAdtwVZY1ABaxvfP6O8ziPPX7VZu6V4bAyxnUcqchMtT+t2c/awsONPOOtSK8z31t+dWS9X7bkcTHr4q9kZwPkukcXq6xeeY1SbbTh8AI06VYRDdBK3antvT3AZEG4Oh00FlEj4i4WWyQuq43b14F1pMPJZXCyV4R1ZojoWt1ROaIXa+833vMAwqjJm2djm0R97HUW+ATM+yy+KlVqlpdxOv1VTdc6g== X-Microsoft-Antispam-Message-Info: h7ZB+BhcE6FMB1+l46wZjvO0YloJewN3i/029zAtP8CwRT7gVYYSzb27EVSpde6aDXD18uD25DXOn2wT68V5jv9D2CY5/dupNscmgOK5xyCbvcZaoWtRbUlppJyoF/hs0AhEV5vO4fig5ajtiXsfqDhpVbBH63OQq9GwogZ45G80jQ2dMN+nC32U/askGk50vE8QPlB6aPEXP9y3M56/BLzAcYfs/Oo96JIkb27kfCfRb8vuFEENdhSQc3hBBFFSj/vjJi6GL8zAa2hY8Opix4a3Receiz8MI/fySO6lssRO0VFcMumD1zaleTlXSNqPUoMkQ7x8mRMGYsZolR+M5NUBZ/Glp93vCcDn1Za1S9Q= X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 6:HxKCkUxXa9T/1q+Q6xzvIDDC4PkxqgnGr+qTBCz9miZh9EnWGe5vx7mj7G8h0mxU7RZfE7AFlE+Q1ZGbDWzmUQ88o7Z+tn/Z1l9eHjbjf9aLcCZyOXiHoej3lhBC99QsFl/ng+KtVZAxu0bNb2r9Cal7IV8jFL0kP5d982Vy0Asz4veS7jeuZBDH4BJhrDlcBysjDciNzRyXdXbZgQOBBACJ9HCW1zkXvz1HL62mjSsTGgpiK0vxQQVA28tDip1COV36CZw5hXBGFmPyYyWGK8lJlEHDC/r5+jX8aPbgmBM6159wcGMY66wgeUURTtMkz7i3yGo4tFN23FGfGPy7PRlaq0RRcT8mCATOE+6fGS8d1fofS/QhqU1eCaHkRebRBxftaeGi/D40LzA11DeWaElZP9J1xWgaH8xVYO6xh+4OXn9cUULjOitHST0Y0Gm6SKutpF7kxjqUTLsPomUt7w==; 5:3E0vffkJKdwEsRPw1KTgbYV+Z5Su/zou6ia2CmGOoMtAxyKXmF8aIBN1AJ3MdMnYednEnc1QvpjkgCu4562e4gq0M90FmBFffsuypK61uWLi4+l7siNh3DLvDkWDe1JwhEpH6g9gjZz/UMP0TZd1Te+va0aKhrkCAPk4yzIsu2Y=; 24:yEXGhfUEHQu0Y/V6NXZsCXSoyF2uJwemj3iYW7XnLTiu63TGS4pHsI3x2HGpTgfpzlhL/i1DV6+En483hEypND7fafIVA+eklw0MpZQ1yTY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 7:xfm0yECtPA/7sDMHsh94E9PFRswAtL5i2gK7SS6AvcWSR3ZhdPYbsBLobEZzoIUPvdZXfSCXs9WOMzPuV/XwkNKKrsMwM72aOxA0QBgE3LapVk6ImWlPIGTjnwh9uRipgkW+kHWzKSnCTKW98Pny9p5112ThIKQM9ALKhHqF7xhYmDve/wfRZycCYsifsgwnTtAKhIbOFLVXzZTGDxny1IlYU/tCais+tzGRGz0REvbNj+pDJWxEvUpj2BmVqpi6 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2018 09:45:29.4770 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e3d58c76-3066-472a-d480-08d5e192e11b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0765 Subject: [dpdk-dev] [PATCH v2 05/16] 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 Acked-by: Shreyansh Jain --- 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 Wed Jul 4 09:43:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 42208 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 63A971BE78; Wed, 4 Jul 2018 11:45:39 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0067.outbound.protection.outlook.com [104.47.2.67]) by dpdk.org (Postfix) with ESMTP id 3187C1B574 for ; Wed, 4 Jul 2018 11:45:32 +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=mOyke96XtAmXZY7kzQkZ7FvG6WXHqb2nM8CWq2xjuoEGsl13mZjyOazel5Gf+zi8159fjyG0vMak9WAvr+ls0Uvo8dGu/+fHmGNAWqDtgcdG+DkhbjawFy9BSYRyXvYLrOk8YOi3QbRBaZLKtrIRyKmoSfdMW0s6QFl/HapdhdY= 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 DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.25; Wed, 4 Jul 2018 09:45:30 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: Sunil Kumar Kori Date: Wed, 4 Jul 2018 15:13:41 +0530 Message-Id: <1530697431-1244-6-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> References: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0008.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::18) To DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e8f21f1f-7ac6-4251-8ce9-08d5e192e1b2 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:DB4PR04MB0765; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 3:1njREMHGyZcwieHJOgBaakZaHjRabfF3DQ0swnmPXlCEDTlq3o/wDsAtnacgiXwyBFDwsU8U2KmCir0W9wOcE+WcfyUaPO4TRFtj36T7Dz/m/cQyOhGQzg9Ho5KRKwqIAAPDz7VLziA495rbe9c3bKyXsPdVjt1OT8TrNMvUuENSIQbSbosygbp6Yju+3uu7NMxYpvN52gPp763/l1MhF7fEmGl/Kkv0jTFitIGwmViLDFkNKheRLmolDuj1ugLg; 25:+njpJpD0lTdSUj5GDdxhyISC4zjtgcyQRk9gQhr8rfpmERd34hC6HuRc0bPFDPvoLQ+X+YtxJ3anbitu6ID44CiU5aank4mqZDpkjPArr9Y17ZRQG1UoN6r2sUb6c90nYNTITZ2c7y0jC80SgPj0oOeKlzNly9Emd/vAq9IasiLqaPt5X2oNATyIMZ2QL7LYeY8c5sUbezEzadQHFMSZB3T5WDTJU1DyFT50N5IFnk0BGSE551xtf+TpXmxUxUWvhrl1rbP0YcdfN8heI4G+hWGnLUTFegADNinUA2/ZbDDjFG/T/5PDD3b98Mbnf1fw4E7V288kN3YRRl69gSFynA==; 31:G67VtX9U3CwW1qWYQHomNaWkeIyFjrGznPe9SLdc5u/QDG8NBhZM5Vj+wamOLZ8Njix9wGQPuOWAg/+2uIQbkUyUSVQCyt2Z/Oe5dWcPOBDpMbx6Z7OU4EHDu6NCu36SzXVmn/pARfoymM70hFBJkW/ZKjzMGzmw3eYZPEEMHbu1Pa0XMFb0rW30bZV8ps74WXZJ2y1CCmiH0q925jlYb/g7q6p63bM4/AvCWkhOuME= X-MS-TrafficTypeDiagnostic: DB4PR04MB0765: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 20:SVHzyXjHOIFzHXpUFVz8wNtEougC3rZEOovRgDByo9b0Y7URDDoeSzcfRflzgIR0HD/EjjBvaTjTfqvoCr320sKzPSLlbgp9Bb0dH9kjXXgzbDd0Dlh9RS2IVeSZCI2XP1OUzv5FOFMHiBrPXaSNWYoZm58F7nqYXYg6clSTLdCZVi5PdaRoIMJcrngRVjhxvIGI5B+cx7L7PtDPUYwORV7skggHIsSiV9qCjQbAd03TxoTmOqYkjuEJs1bSZk6h34c/oLtFATgkS2fka1qz1yqiBYhAtKgStf4Q/jnyirSP935LlJJE+j6tcl9oTwkkBpLXf4sdEQtpWpcnH6Nmzz/5XZDf6YvUbk+Ch9ogIQe+qS5KFPtu4SBceqVw9sQD/GMRCHnciKCc1Kgrz3v8FPdj/UqpWRfYZXVrKaqypciS6d8dbR4f+14C0nbYNhIzI4jZkPC43fOOr7ocjdyuGKsA92FrDdf+MghTucv6271RwGBVgyieB9C1oNVYTF7M; 4:7vazNcV+C+j5GL5ee8HAkJzbiC2gZFF1VGo823MRzw6348loLQ2gUGbLF2lLUkGh3/Ojr7N17h2Wn/akFgFJ2jH4nJJaFnkn+71DGWoMDD6qp4a/yfWBQRMsEBrr+PPSVcTwwA7nhdd0SpHMCv1iwhR2YomxwrMy90gNHnIcgbAogTF/gcVQnqYOpRBLxsJLSs0INQ9C2gqdKpa8TmV3BKbaCNGiYDN3PE4RuQ1atekjgNxY9vfMKZl4DTxQMJPSqzYWMj1TuGIOQ68lW2iHMS/DZe57Jw2ZYuIyuc+PokyAKQTSi98us/SKTkp0GEyE 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)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:DB4PR04MB0765; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0765; X-Forefront-PRVS: 0723A02764 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(39860400002)(376002)(136003)(346002)(366004)(199004)(189003)(6512007)(11346002)(476003)(386003)(6506007)(4326008)(55236004)(956004)(2616005)(5660300001)(44832011)(105586002)(68736007)(16526019)(53936002)(446003)(50226002)(316002)(6666003)(5009440100003)(36756003)(16586007)(2351001)(6916009)(106356001)(14444005)(186003)(86362001)(26005)(6486002)(97736004)(305945005)(81166006)(7736002)(8936002)(66066001)(8676002)(478600001)(25786009)(51416003)(486006)(76176011)(3846002)(6116002)(81156014)(48376002)(50466002)(52116002)(2906002)(47776003)(2361001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0765; 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; DB4PR04MB0765; 23:wa0w91XwQZLN10azsg+beuC7/iEKK/OYrhsFtIySa?= lUSAySed6edLFxXjhGaReficYvWD1yjTrWaj5jLOEnN3YrOtzxi3wP8QGC1eM3xiWK/oK0UFfEGKR0Jxag/3jm1WZTGp3eevBk0381anKHfPEt3juos8yxDo1Q+2dRkUkSCGAVNtH9FK+NPjQhpoSzB1KHJK7W9nC/+ZWHvLixT0Zqb3G5dnZeMcX1p381tQ0Fm4eAc61nh3iFb2QH1j9n2CATUYnWTI4rVPQ00F1lnTwibOEXMu94dj2M/bn+V6aZmXkNERjIsnKQxFAhzZyakZYn4orSUNPC6Wh6Z/5U9Ipyng15EL7JySz7QcJ3mJrCvHkTf1ViBLt2Obxylxv1J0KBJnh0d/Bp57EwkkEJx0LGjFBqPrbz4hvlK9jmt6tg/lAkfVQ3ADubgoAlg8KrhGXVq0km8cGIEdbRiyrSh6ib8eXWbMNdoTJt8pX9YrAPquKvNlp+vCRG93pZM/D/mWotqxfz2MjUz4231XiOB4NWHnuFNpy7Fq67poxNnlJBdLXm9CKPOvnZnQZyZR+r3f9e1dJfN5LRKH5mo5KRvRMobg+ibEyNPvJe+vbbCAVPZzU5IfX/4bpNlzd1Ng1VPHX9Jt36Cu6azVpu4ZaelhQHldr4UQfAH87iZ8fp9I9/Kf2JUBfbWV+JJtX7JgE73nQYq7mkJgVpvd/KHUpy8We8Al0r7DfkLrOYHBeIY87VxhtZ+NRilGC+Atrfkq2qnW7thdoT63oYW9q8zADSO6/Z9Af9MgNrIXQAOFKDTWd+W4j3mS1NihXx6oyIzx1vsJvNscGQehyAGg9XkucBZN7h6gmHoPW5tLvx2qLDhnEHo3vtxWH2FaBVt+Nb9k+6IOlxZ8uTTwosw/yvbZBM3ysQ08Ag6aWWcOmnzeujq2HCtIkK/6W8XTaHCgS+w2mlfaTirw/iXGRmx53iIljs0E5zS6XPMMAeGmBb1ubodsVuY5vdPELA4Fnc3KuZhk9INv2L1I+zmVptaPvvyP7s8ysT5YzG03Pe2DDzcxF9uWFb+5YzzTH871esMSOBEwt0gSg8igk3oaBw9gWFfWBVbmd3blJU86aeryb0vNucD4LSOcxQJkiREgBjwLbKf3gKA4WsmfC6Q8gj9yoVuVnOaHRFp3jKIxAjQr/NSjncbwjhc14SUjQtl7bhN8OQslFYOl43LiASRzOR0uJSRwdYEJJ3/VdhpqQ8DS80BvTI1xZU2rTbjvKtDXktvFVPxQHv+AU5TMlQosoPloyt3mzvcLwv5LXrBklfCgZINri9z15o= X-Microsoft-Antispam-Message-Info: QFV2pxe3sj4YxA+RR3YgP06zXdwb946T5LHV9WB5l31+ltwT0VfZXLgf2kDswgTx/qwAbIgeLK7DfCJkjwE7jyIvAGwxZWEt5kmPBOZwb8yeyyj/w19NdlEZZuo83HZ0lshFYuFyuG5qMGOfT67yJZS6mUKH9/slolmpMFrh58RVddqN2XOO2HOZP8nT+detvvKZhyB4r63woxFqMHzlD7jIIsJm4En9+ssc+29Ms7WGb7I7Oe+zrvidwKZEL06ogw8COm/Izm1T4R+JG3lIaA7XUxmpjEr4yXvqS8o+8eA6+x/uwYljCCb6RbYfKIuL4lTWkhR09SNL0jnQ2IUr95ykXIPgGirrMhAXC5Zcuf0= X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 6:QOsnsmk4flp0vfPT3Hlen/yKyp9vGyYNE7A69jhUnoK5Ea0SuoxBzAV9K1uF9cenHacKIfOmmI+PBLeABY3YRZLlo9gOzNVhWHePZrJ6sazFKvd4sdfF7jBkp5Cm7DoKoFuMcU0fBVydDT1okHX0e4D8Fad1KroN47lADET86nyTBR+kUVDZHfTYMRJhXDqBMYKJypgaUkVrdplM8cbD7PErAW3RN51FzCsv+2BvqDBz/hLIVpgrZcWiDhB+vVP7aOSQvkjDJCooOmO8iAtnZvTUfidhoE2ngHO0msM0Q7QgL41EbG+tTSHO5Y7WeXIAYCaDNWGT7aQChwg/G9HV9nSnzUV1EUbmXORURkcJ/kwOb5lTKmsRW3F7W3uCYeFfh47wqJMCvlVIfc+LzjTMz4XIhbSuLA4etlEvWehxkocRXAzP6GzqH3vCMm8rbc4TaxiGLX+E7GvOm2tvRSS7cQ==; 5:UdROYKaf84zHM4Lfo+YFSY6VjJIZkOZ8VGlGTZPXH+maLYNZ5NuyOw4HOY80I/KDPBk3Id7qEvvfkYHgHD2Ft2NsePM/vUKCp9UiZCjir0QdRcYxSsB73ywmeUq9YASM5KW7Tdfz+YqhdfI4BTFt1OHxwBXbPCItUOVjOTEnY1w=; 24:T8CL1ToK9cSrwt9d/wqPQ4SS63oZRO3vETC0lzkEo8b5HH2hX0S/EHEDneRNfQC4gySpJ9BHV3HHSMtEb2cxD6MhOh0NI5fTp3ICHs9tfDE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 7:Rj+QCwzemhPShp5w74mRWq0t+vdHJOliqQtc19uYR1xsJ1dpqOi+JvSixae21TvO79Me+7rMToAO7VjxxH/R7zIZX/uYUi6LTB73rWo4iQTb4jer2Kin+hXqSVH1/IIuolb5Z3Li583r+xFkx7kzgloX2LdNWi/mtn78uD2gVezHuCHjypI1hRtnGpilzpBHUh+d1cr3M5fA5fMbrPB3cJ8SGTeK58qR73RKHVHj2M77YD4mJR7M9VVqKNBDuGFa X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2018 09:45:30.4778 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e8f21f1f-7ac6-4251-8ce9-08d5e192e1b2 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0765 Subject: [dpdk-dev] [PATCH v2 06/16] 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 Acked-by: Shreyansh Jain --- 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 Wed Jul 4 09:43:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 42209 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 A4DF51BE8B; Wed, 4 Jul 2018 11:45:42 +0200 (CEST) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30062.outbound.protection.outlook.com [40.107.3.62]) by dpdk.org (Postfix) with ESMTP id 2152F1B564 for ; Wed, 4 Jul 2018 11:45:35 +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=KxEFS9CyvsyGNKBs6HWHjJuZ2BDWtUM/IPy7pHjYib7mTh4yAGWsizJ2RBLix6dAv4TrLohmy7jT8JuolqWGI2jvWLI1DeTmlmQ/vjjWanf4IOa5cYjegrpXGz7FJ30YOGWjSV6z8/KIfaqQ6d3DE0f6JJFckFbWudY0d06nqTg= 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 DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.25; Wed, 4 Jul 2018 09:45:31 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: Akhil Goyal Date: Wed, 4 Jul 2018 15:13:42 +0530 Message-Id: <1530697431-1244-7-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> References: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0008.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::18) To DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 68270924-2d64-4eee-a168-08d5e192e24c X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:DB4PR04MB0765; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 3:AZ/R1LvN8Bb0Eb1uPwLpzvwZFWpPAf1oEKK3wJOFMPcG6XsTwAZ6xsMSWlRnACusE60XpSQQEVfKzMfaFb5NTEIuAPvDkGA8sJbzBPe/QgVAjAsE4KSe6B0zlt+qJcGK8tXhdjbn041LwJo0SLTi5wR4LN5o5NZG7VD5hgy0Kmy8gYgj1BqPlN6c0+HOw6j+5s5X96QSz8ybLTWj53Ljf9F0WF7Q47kss6+G3ABoSd0WyDFHgo2akqOOF9rFxbzd; 25:4APUCaGBaL+whC0AhwwGlUIFWHatd6Ik3xlFWJbxQfsJtsMEN9Ao+xDP9VygK41cK0j4uWFfbC7mvINFnzVmjwTya6pkPBFrHYZAcQ2M2X69OndpNQjR2VSz2yMnvG7uEBKhSlK895rOAs/gJd8Ncts27ISvnc4elwdJ1xssFwTdUQZQ9huhSNm9shn75bkyOulkTgiO/zrcSA0Xz88WBR6XnAdv5CnHi5etEavQH7rbdgizgvAqPkmFFUDP8AJXq5qzHWzux/vYlk5eANswpkfD21oshBtkefYZolWxdCGn+wYeyPBZDmYc3uHj4jLtWgEuX1AGYH145Uha0QfM1w==; 31:dUlklZUVyNguS9KSNJOMmlPN1nXeUjt9j/wm34KS2aNmK7rSMpTlyO40HlKcWFAjxM046lYWc72FaR3n+xcEmuj8duDJtQlXkItWcENfFZ8e6bLMJEyx6WAYP3hmcFaSRZuaVSbFt9G+fn7rA1Erlra20cdYJ85ecLwQzZu7SYhKzN578Nomj109Ewj3eA6Y/AooqtPG5jLVWyU7YKNIiSxDYw2NeCGfbMNaLZNeVrU= X-MS-TrafficTypeDiagnostic: DB4PR04MB0765: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 20:PXVTvNM44KqlqYz4tqMFjfsZYGGjLqJOHXFDe6CU5CiBgfqstgoCm7USHxdB9hzyQcez4gY4W0USJbWGHjQH+iIzqqLYoJVMFMo86Tv7BHZb3iOonydBao5zaEm70zf/BjDd07NtHIrOP358HLp1zzIEE8SGtrxAf7B2ygD5OeNKgawTMoQ6l4/xVUoLCIRR4pGZsURxkMvqq8pry7wNFdOkI1qLGTFD9D+VwHypethsZKw/FR/WdWyKEoZVySBd7QE3zTqzGqaqJrQpOcRk/8V48Fg/Oq+lr5SAEHMBqcXOWmpRnejGuzceHaSb+RI0kIiNrqI6elOjCl1zPzqONpbAnaWbXjIPxDhusH95b1YMcGDL6RDICr/3Oc381Z8NdJRCW2ypE69xS88zZRoD/w7WkqXOaEVXCUbid+tGQt+JUo/PtYcDGUG0p10tqvLtVcIRhqFRL/DEP4/p49e93p4p+h9oQo8Ud3LTGl0Nl9MFqMwhk+bGmlATO7nn7veP; 4:2mVzoV4cK1Zc6fhlFP0tb461iB+rRXO4f+hQYLtISFk11vBoh5AVrCgyvhkPyggZks6QkeIo+hYf4PcnZR1oyx79B0XsLbijT6uNHlHUaiZIDLNXE+FF95S70abLwdr7kN/bPnGPygegaG8Z5SewpPzecxS6dYLrjLmJKHLGLvZW/XYvYGvEtKn1NKXNdM9RUfywpC8I8sIG19ukhShUFPbCJtfd6va7E75xQLxjJcDEoJ0onO8L/vcLOQIzFRfuf+dQZzhXKsbSyuqSlhHp52qUYgqWM6KMQfIqh+ol4dKFpgoWxTKIqYX03sBDTdr0 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)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:DB4PR04MB0765; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0765; X-Forefront-PRVS: 0723A02764 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(39860400002)(376002)(136003)(346002)(366004)(199004)(189003)(6512007)(11346002)(476003)(386003)(6506007)(4326008)(55236004)(956004)(2616005)(5660300001)(44832011)(105586002)(68736007)(16526019)(53936002)(446003)(50226002)(316002)(6666003)(5009440100003)(36756003)(16586007)(2351001)(6916009)(106356001)(186003)(86362001)(26005)(6486002)(97736004)(305945005)(81166006)(7736002)(8936002)(66066001)(8676002)(478600001)(25786009)(51416003)(486006)(76176011)(3846002)(6116002)(81156014)(48376002)(50466002)(52116002)(2906002)(47776003)(2361001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0765; 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; DB4PR04MB0765; 23:l8kYjsGaLCko7lhA5TUDwKOTCYAUvbPAk8bp0WO7H?= v6PYiGxEsCeaD3jxZHLLrBTFM94+6lePYdHPnKl1kP61gvO49GMTRG7D40D4mOPuIcAFH9tUnov4L+8um8jngbPtbIe5/trunDofJP2vu7XNlUcBy2obUrV2irYTGHqpPHnwuE5eiwXX8x+XlcYuj8xxRj0BTAxS281L29ggIHuE+QQUkqKHNVoAKLIC2+MKcAeZP5Z6oPKj41kObzEz3wcLObG8rkTZsVBSevd1V3hrhKgzb8aT637O/mOCEK/XURzHxE8qSIx3ckEUfM5rElm+oqAh9/+Ae3JXtF5nzt0Vtz+x7javxmOvTAkdk7wzpoh0qPngv1nHTggLFOFqdWJL+rLqwP2bPBBiDnmRe2hzkQ66Towg6DQHAgvV3DaWe3hzxAgepMHQyIsAV68EqaLHVY+7EOuXimk10Sz60Ztf4IPeHNNC3RGhfyecc5uutrU3LmqyVaP58qIi3QO8ioCsrF4gxqmgKTouKFpMoh/abINOrfZOaaIa+m8j7iSLVMSLvHoz9FdxiymLZWmwjwYVyaTu/isavR82uduB18Y0f8nIRi4SNG8oKgi+l5+Y2WkMXm+hB6wxZrTtwFZy13f5Cvpq5BAPCNh2l0n35mTfUz5nOpGCl8FxtBqDXzvSpStR2JZYrT/iGgYCYrWgp2Uxjk1x140+TVkOKJ5qi5pBf8cOp4zBkKHpbE/O2qCVDX8EXb4V+2ELkGEZxtDAItUkCWI6UvIJZXgZgWuiK9DVHWi2iWkN6PPY979G6l5yjGidrReCor5H5gMB6Eltd+QHxsJhyKKXovsbxxC4o+JkdoIY2YLc6PBzaSReGki7wMaJH5+8ozkAKMgYFsVCHc+YQRsL28dZqPbzkUWTuPhDD4xe0EBLUI+mtd/lAiAUcii/5pi0NCjF9f+s63CVJBtXhWukUzEPmVxBnsJdO711490yFDOtahjFZTpS/GlWcgEtmvQRh9HtmU+bEpfA85BHFlm/NWObaXoE53G7qa3LAyhrghjieHr+Dt1AwW+UoEz6zvUM2jAR6MS86dIAFFWmqHKlxB3wT+kXqPLZcbOAbFpMdnxK3Y/EQ/QTK9PuTih0Rc7V5yDrEfOYGoJufthgYiNSj5FFHTlHq0/4uxupMAEUS28tSDKXcA1sDX1Qi2VG/WQVTHOJ5SZEztfJG2s/8vEkzdmgw6UrjVkH1xpcZ0lySQyQoyySiXlaO9+gfSln3c1XoVMbwU6eIijVCCMAq0JrCC/15AGSmakaOxXva9tgyukQQBH1CeqwbFHK2c= X-Microsoft-Antispam-Message-Info: p8sHlOGTrFccGinBS8UrMY+gIT6FJLD86Q1NnRZXoL2l9crZQESVbsM5NOsoHtAJliT3TGNulWHaNoH2xYr5YWTJcXNLoZgWIbl0BewAr8NhsncuLbx6un/SqoR8J5D1SlHyO03Swuy64DLtDr+NtVqD2lRMyeOargn2DS3jcgHjGzuYkjgkKD1AIWRIvjZCrDVqrBbsXh8+ZtIe6+ss0w2tsiS6u7dAmGoJEJ48TS1M2aEVyrOPOcrEFiqrJnoniap5zhReeIZzCfae2xULUc11Lq85h1OJuCGuNjeZnZVcWEv4Hbzf6KLr1Me/B/rc73bx5GTt4GX0Olp1OMXoVawlGv88h6Ag9y88c7geobQ= X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 6:b2JIcL+GTDr+eaCBU19GcTOSCmZfrz8RBxZkwqob3Q1z7dRJfPyzM3i4NwU76QC39lMi39MgA7ExOFAOayzu7ZU71epfJM1We6JsPyKl1gb1y0gX6o3IvRpuXlzoG3VchfMWBxFc8HiH1PEEXTH2GDw+uaUXYmq1yCE4VeVLRepSkmhe2US7JzLWIXP4TBN4qLxmkci2egdcRwPZ7+GQxCn8CpgHckcBPPkYpaeQyN0oZ04XxNqY/8gsZm5M63reh6c59rNpEDhLSHRx04oGbtEOCgDWiY8osn9aw4pkqkGMti8jIv2jr+1XaAErAXuW4DPYXkfx+yI6wJyoMxV3Uw6ZP+KRLgPNI/U0DCWVy5CLgrqQzObIUV8rQ9UwZf0UXQHGzoYldU2Lm3JQ0mJzyMYqcP6THFY9IRD+zPp3qFqnc5iSfDw82H2Mlf2XGIE8YRNV7mOY0WQSN13aF6SFqw==; 5:2pu1J8Uz/DMoSqr02jZNbVu5Wv+s2YiAi8aCSCa5Gl2WmmVQQTN/uo35zrWE8ZYLImmiW1pC0TIzZalxzLA+XgoNcIHDl9DhvE6GbfW/bTqTyLuiao0qi6K8TG4/ndxMtN6LtCZIJDzPHGGU8tWUHhPXyEwsH8ksC6QDkHddIdQ=; 24:dEU0nzAln3VvT3vzql5fqFcpQPD14FciSVIFbhQ6cgQDNJQVbrbZnVRCF27rTUqmmKRo3EUvLveO9NgK5+GKzcDBFnstlkFatTKvgejjujE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 7:pR+1+T+uzFQPz1IvtyRrGqsqNcwtIL9zLmkLZy7vmRtImAriehl5JabWC3FwTBqqO0gHIuh0dfdyE/app/TItPqNH8T/qEIO9hK99V2S6bSH33T6gf/rj7B9UJAnMD8LeI6O86rUDoREFr5Ddf619UPJBqY7OpKI4mMCATYycfzSo1Z/TKbkv6zDJMNjxD4YnBE71Uo2eFq8QDomemZxOnPWIeO+SBNgInDKqtHs9YeLlV+QtIgdAXpwj0HswFwJ X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2018 09:45:31.4716 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 68270924-2d64-4eee-a168-08d5e192e24c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0765 Subject: [dpdk-dev] [PATCH v2 07/16] 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 Acked-by: Shreyansh Jain --- 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 Wed Jul 4 09:43:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 42210 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 914291BE96; Wed, 4 Jul 2018 11:45:44 +0200 (CEST) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30066.outbound.protection.outlook.com [40.107.3.66]) by dpdk.org (Postfix) with ESMTP id 516741BA42 for ; Wed, 4 Jul 2018 11:45:36 +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=mKwOt5lEiS72Ye4AAKBbgoTNb0g86+e97vZ8hXLW9R80sfAm6lX90q6gKO72iDAvWfheg9YJrsLj0v8Hui3VdJ0D1dKqTHml992GsN1kM3TbazU1mkly1NFoFMrRCIO7nU6pQIACfPRvtg9Slxor6splVv2ExIvUblpuZF+V3Mg= 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 DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.25; Wed, 4 Jul 2018 09:45:32 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: Nipun Gupta Date: Wed, 4 Jul 2018 15:13:43 +0530 Message-Id: <1530697431-1244-8-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> References: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0008.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::18) To DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 789ee3dc-e1eb-4b60-57fc-08d5e192e419 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:DB4PR04MB0765; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 3:eG9l45Z+YGVf+kFYTvqPOVXXu3xX6XH1mRH9eFqh72U8EgMKe9yIvoqAnmdQWgqqrC35C5RFpAdDgypvvKTl3GrXZwzHZirwF4NkLgsVJU2cz68N8E2uoydFIGGIEittRbQAprSr/9khukmW0gRR+wOtcexSlQQWmCUQJauR4ZvSCQEHdfnKZfBs0yGyeXWEP0RnZmv8kIUyVFmjXtx1GZt+p/RCEqC2jkX4HSiGqqqUSMKmeiX+tLnAh+puj5jB; 25:7oVxKnjK7oEPjdpqYhTA/AkSK0KW5DaBvJspbMEalQCF9fL91ypx9rwJFIPvt8uZazolslwwH1YDWFXKPXM/shjd4JPrQs9naHEZiOQZmxAE5afErtavSqC0yYxkCK+z2FNOwIvCGvEmbRKC5ntVA4EkFWdbutKE7aCvljnAfQJD8xLkUUdgAoPp30IqRftyCtKOVxqktq7GooX2H1FWYxOCz1ZxjM0oxEj/LChaDXeI0xWsGqorhgXZLgusFspSLCL87d0sPsu3eNUrEir0tHNijkXPy22Ej4o2DK52QhDdekXCqBZe2tfEfcsoQ1IOiPY6xw8xmbQkXFpWLwF93g==; 31:TOdToQ5G8hIaf4L0ncgEG46nODiukWB+i+/1IGMPqUkQEjsjOc29pI41j3dPWQqaTAB7ycZ2dP/mGi+KXgEVc2bV3DXE5++Koh6d5jNLJ6SpHDqWdiyWMkJZHS+DD8DglJhi66uWmkpDo80+hukmYUEXHdEcE++fVIRHFQ/tTa/urhAA29bj06QmyvjKnsTvX0dse3LNGw1Qgqrkp2SnrlxliYJlruHRWGM5HCDd1CQ= X-MS-TrafficTypeDiagnostic: DB4PR04MB0765: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 20:IADc9Ss67vh72mU0rjMw9EkrUfGj9e6FmZwWfGTRawAvkfl4Zwr6pdyT0yziQYYU5QJYb+2EkG9HL8to0Co0nXXsW5n0VLWvvfZJlTBu6mNFuVuQFlUVC9Dsq/Y/hfWGGjOfNi3R6VGf9GEwBDAeH39bODVmXdO31f6KjjdqzUr4lUO7tcdK+as6i70/YFSWm31V/anb6tXc8t77gPS+Fw88xGV7Ji6ED4N2BadOAy/qAQM7+cQY/4wyRpXOQplUAg6WbPEgxUh4zl7iCtkaLEN+dyXz96Z9+KLh+rI09cWMvCTkireNVu8OQSL3Kq9+qD19gkAjCZoCO+MnMZ6aWqVk7QHY5KvHpfy6dIbLYAtm/e3itXD/E5qNTANLuY1ATUB+1GebfmT35CtkMQCoQP9EVzowYBWxcgRmcJnU7L3DVDwM6KlDRPtgJHsOAkoYCFqBK3SZuNLL0I2gIfhGZcXAIv1t6gNBoiy6xj91bIA/G7HxmU8yrziMCwPFZ1bv; 4:/77fBHayj2kiyxl+GI3jEYDbeNpRS9b4RJNH0j9tG+ncWjyNKHGvCoB97KhLkDTrZGz4I3gXAU5KSrnvCkaxIDedBD5ATma+0RmGDhuKCyA2u17Dge0SAx78di3s5SyFgLchdoA4Ps0cm/UAa/O4jwHTW9gBtqpT3lvG4vmgq2pDBI8NkVuYbwEfE8XrMV6Hub/yBhKbiUcR+FENWtlcUQRvIKloHiBRNoimKIw+M5rx1KrI07IPfBfJ0pTOks+QyqFREHSvb/vBY2WOUDRpbhUqHC6ML/sEwwwSEHAwWglKP/csTHdyq5NUD51rKP6B 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)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:DB4PR04MB0765; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0765; X-Forefront-PRVS: 0723A02764 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(39860400002)(376002)(136003)(346002)(366004)(199004)(189003)(6512007)(11346002)(476003)(386003)(6506007)(4326008)(55236004)(956004)(2616005)(5660300001)(44832011)(105586002)(68736007)(16526019)(53936002)(446003)(50226002)(316002)(6666003)(5009440100003)(36756003)(16586007)(2351001)(6916009)(106356001)(14444005)(186003)(86362001)(26005)(6486002)(97736004)(305945005)(81166006)(7736002)(8936002)(66066001)(8676002)(478600001)(25786009)(51416003)(486006)(76176011)(3846002)(6116002)(81156014)(48376002)(50466002)(52116002)(2906002)(47776003)(2361001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0765; 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; DB4PR04MB0765; 23:JOT/UcrgJhn2s/8EOYlBN6eHv+YZNQSGtbAjfwGvp?= mEeaCJcLvcAdkrICDEG3RA/jhf0uHfdBgCPxJoSoykEkCF2ABcr9gLj++zhh/edfKqOitnI56hPcaLl9o31jpsL7bwkAla+ld7VOnTJ5tuRLHHC4lquK+lnByS36WTvFfwqbD6Gd781D+RMkReDcZFJFD6K6KLpIXmST7A4I79BUj7BsLX65han0F6L/9ElDHukyfuUhoMF+vp9WX7SVVLoXBrQGOZbSl7h9qaQjfHLXylEZxhN9tn8hqqTfH7Ngj8N2g9Wo2+aElEfLFXKvy6S07QbaGe3xRFrIQ1gdqST9x4VXZ60OW3RDGBUxANxguXoPCO7TCUp4NaJUckgiVvuFo97VVxg6E62aBfAjv1aB0Ir7OJ7J1ghRq4etYVNFAD7YLyvizIxvZN9tPN4tt2JP17nfF6iWfMjoFah61j+58BodNFNt+E+KZROzgDjRDV/4DAXNK7lrQQG2XIKeh6fAq2MgtEApvP6SBZukgYth5bAzzx+h/8p5Pcd2vh+C75p0CpqgzuAizXL3UanM+s4QyyOcSYY5y5ENxmq5Q8j8Abu6KbafI56deWw0WgwqBhxNhviXa3o7a8QTxUKhjFhZMsTlb3UhGcYHpwsimrudKhe8hjlwzQ9Mvlrx3Amcmq9liyukBCS1Jcm30bfGPVUMtZCq3n1IOzjx6bhY3mvvxNWGy0tkXMLMisqBXNCPfcFKmwEWNIIv8KhsDdfAn9SJuRcqUgbZrKiDx9QD0PpbWC1ZsIzoM61KPiCRR6NR5MyoD/V4+jeU3stcU2LStIbqxqHeWzl0FGtbLOXVsb6f12P3kgKuWYL1w3vWd6LBS/3qu6OoQ9A5jzxqqknmvAaO/KJCynnLzrQXUmNEP8emNzF4s2Sgq2nNS69pg6tPQgEgCf+ZIrhQNv+fEuWp+Cbhd2p2pzf5o75WiS/vJ/d3mPAlfi7GO3odsxtZDHG5dmsMdJBq/mxnmtoZFL7s2JZlNqV2UAM4Cs3ZHBzS0jjPp6Pb2bQDKyHhdMtvjYXP0sBL/XCqsRewCExruLqGdn4KJbVYO+TChVDonRuF+RDvTwvHk0pW6EnrU1vM4ProWXLCh7Yl2fDStjTvhwlzcvSiBIlQBFIpAKR6gjI7Cxk49ndtakWpynUuzufgGo+KjlBRkp1IrEuxFBwGCK+/ZpZDKn9hX4f+/GfLUuzBTycc17462AL1QTp0iGOQh71p6nM/KYhk+MQqCcfp5xotY8j6PVwX9XZSNCZ+hDbZHpQa7Vx+IRzK76ESGDnE6NN+IA= X-Microsoft-Antispam-Message-Info: bmX+lb/F/xB9wpKrXjhx7gFiIXbQUGz1Nm2iR97iBEfQVW/YKUBW5Pt5YdRmvxEOggGhU7CjnidgnSf9an/WtUX5FzDHJKPJMiMe+ZHT7oI6HE1m6h88OeMT90w6nc8yKTnrE97Rj5jMyHaTGk8oz+kM3ua6NxFlAqAtIB/znyQeIdpXVDlqnoXw8e57Jj2vQzz3YbPzTk6ezky+TsynCWSm8bVm3/Ue32RtlQ44I+KU+v6v35jjnADAwbgL43K6k4tZHJQ4I2Np6cAsucceZWrPtowBnBqCSmC4ZcO5/+v2ZJ0WVN/B3BjVKI2zgzaR+Xpgx3poKKNQ68ytlS39JUHg1doVs52mgEgTTAVFYdk= X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 6:4nHbkLiOCL1+2dfmqlegkqzLt1kmb0mzLfrZGWGQPaV0FvrgFytLg3i3l1/X7xXtk8Mtiic8LdJDoaC4M/c52xklhvghCUfc+Y2u3aPB2FaSkk2af6OPT/wKhd5E3LgT+VqAc0smLxdjkWR6nN0/7DNTqNi6lHtQ7Z3iU4TQFY2b5xvC0ww0T+qTy5x8+MXg06JSd3jlq7o4YuCblQA6fPIV4SlCy/YxPgugQiwGX7tbgB12zvRMQlPqC0FxyCJ1WELt0t0uUapftmemnyt5QOJ2NH1VnIjvSHwbLQMl8syMajWnjqUi+4InM66RVcW1tzWFJsoAXz92OGSnKldbOU7sUbRsU3y+iAwxiH917FKLbpjLpLiea08PNZ8B+C9SKgNRztcwi6yKMOEvX5GQ5zETMH8EphQFuc/jb+i6iurOyl28SB2h4y2ESmVIn00bMwZ9HZtSQcs9jboxY+mO9A==; 5:kpIec8fKVQqA7MvF6ubXEyoOMugebaCanXzkr0Q+//17IXcz6PfejtfjIi0/af4LjH0ecxcp6PlLAhqRyYvDey4NNCETDTL8+R4TNw2/zPkpEHVIvXQ+IVIsSCMP49se6SfCqYytzwtn01+6PFL5JO7RwEGxOjzdwiOjeIrFCPE=; 24:KszUMsn0KOfXNZUHpr/rpY7RcfoUo7JZQpFcUuQSSAEVbPkR9ZJch+M/nNRQKwaOSAdQEBHc89wQF2UujN/kDcxPBkffV0alodu9OFDbja8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 7:A/Y+5gRd7d2Gv7HjeHsYFGg+VqOrdbY/uraiOpwtuV3gSsSbOzNLx91wfOA/YJ9RT/NSn4tXCKTsc98Br/TSkZsrE5Tpmfa9QrV3cI8LH299lnHrRrvH00g1EvBmUPo908wl8bew8wlWvl6sP8GqaSJgl37jupZJo/l3DGB9lmqEDac1NyOQ0QQD+Xv7vbktfjo32vKrg77FMlfWyzU4SiDWYYos5jO1vhbGDL58WUbg7ikS1lguypTQkuBHmER1 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2018 09:45:32.4853 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 789ee3dc-e1eb-4b60-57fc-08d5e192e419 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0765 Subject: [dpdk-dev] [PATCH v2 08/16] 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 Acked-by: Shreyansh Jain --- 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 Wed Jul 4 09:43:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 42211 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 D4A671BEA2; Wed, 4 Jul 2018 11:45:45 +0200 (CEST) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30058.outbound.protection.outlook.com [40.107.3.58]) by dpdk.org (Postfix) with ESMTP id 56FE61BDD7 for ; Wed, 4 Jul 2018 11:45:37 +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=zMq647567BOstz1c7ZxNVZCrBPoyob+QhdpuSnTD66M=; b=Tr5DsToqEf3iN5yR1ctDyh19pJnaoAJZf9CtC3M5jh0uUMow/isPO6/i7owR81cuFVSQoFJDBJfhViyjnDyZIxI75e6iPwcFvm9jcFrlh6SyqXx+geuolfEApkkGJAu0ZTRmOZU0DFYNIz5nnKrLW3GpfTRzOpz3qdx52Jhn6AM= 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 DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.25; Wed, 4 Jul 2018 09:45:35 +0000 From: Hemant Agrawal To: dev@dpdk.org Date: Wed, 4 Jul 2018 15:13:44 +0530 Message-Id: <1530697431-1244-9-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> References: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0008.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::18) To DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 38542f6d-8b12-4350-9115-08d5e192e4aa X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:DB4PR04MB0765; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 3:M3o8DdmMJQmclh6Hvlfb4ZM33LKrqrktX1lyyCaMXoRp0TjWYxPBSbfU74p2+YUxgeMbzAbTYSNu4fN1tcr64jVbbNzrBy34+JvFBPFKmsSWxuz/cT7xzDJDKZ+7ErEHhukfn/GZLBFxA78atCmzk2jEBoDBF2XU/2fuggWtwtXDRptFH0rr+ALLyOVf0OdyxG/rkWS0sIWuXEZ0NSg5KA7ct/tWr+VyHPwMGJ/8Mduvu0dQkw/yYeh2kn+yngfj; 25:YjYWdPVphdFpRa7vosWXRr3E5GmLQEIXUG7t9M/c/Fo1LxmMfnCY5yUbISkSilIx8KS4zBl/qYd134W1CWWsBEiTxoAyIiW8CHtqzqNanKaE3EO3cydd6avxoG2sJWcA5RVWUwfYp6RwKfjsQGqql1xGEWBsO01XkrQspupF+Y6fCTxCDxAZhnO8x8ATEiRrzgn9Wffl7H/s8T8kNinqJazXKDjmFzpmgxPy/0iRl4MS+VQklGKtG42gjbVJvIoz46yykbaiDeu+SF7Zl2x6gfz/rs94/JCMcvOhxsPNPGEJcmEWyeMT5FeOJK3vf1EqGI0V1AEXCHIcenoXilxvbw==; 31:Bx14vjFSx87p/1hSWapGPcnW8KaQia04fsv6Le7iIdxRieZIj9ZQGceRR4GqAuWPTAe6eraOuFWLN4bjm7rYBjAnz9vzpNoANWI+mZX5mln6Bxa2gLNUfJlTpKNaiHOfNIqVdw7md3SBz+U966o5sr7ySz+AEQLX4yhAPhhOs6br1YcDChg9103LOa0VLiUAad9d/M71cwRBe8JeQJ+QefBkFdxTaTu42RtXrG+Apkg= X-MS-TrafficTypeDiagnostic: DB4PR04MB0765: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 20:o0V90ZP45W+lEkq4j60F/ybk65hVLRifsL7zLif4vf6KumC/cU3iB6vNPF1Wuvb+634F0EMmNMM+7DOpVPA71NdVz3EEXCzpekL5HRknBHSmfjumMbYS6qmFb1gCLCTEv2PI82ygixicTPlKodWTSjtyECj/nSpjEnwxJ6iRKYaVPy6MWn4au9b0VoFCckVG4tssS70mi/s3Ux3VjVKsKqf3acUSWsQEldGs8q+6adBHyWJMapStJSagOWSbjH5+UFFbsuI+4X4mlzkZYnwApcUlKkAXmQA+7/diYjZwriBzE9hiXvYZB1P5lw5bAEoW9rmCUHCqJAb8H+1B2sYhh0XM+9qryg7mZJ63Yg8gfqbI8CMvMnXwJ4m16PBBBlfry3jW91wb4lds8ohZp9m4FG1pj+Y0UWszT376VWFjvh+ntX6MpkDz17jbhXgIBntfgp7RN5MMxTFLXcGRuZxO1uU3Upcrb4yK19ksGYVLDBK3usrKCDbyuc7e8f494mVG; 4:fGBZTqfL8oC3cv5nzf3bFxZ+DUCweh9jspDKWoL+4FAyRSPl5edZ8dLhJ2akj8vSMFMHreLyrrygXD7Y4jsN+w8dJoVKSvoRFLDDgdZXNl9IVfwxdIhR5o9eIr1fBIeiTvlm/0NoY1zUZTIhDtfMyz3TZr+GfmkgnlIJObOrofWmRqs8Ru5eh2vobR/ktBRu3dFT4g3jUylWgYSG8YdSqIunkgD1x9V1QeJEAg6JRUJdOJqXwMJVXMk8k/KYRZLGD7l0w6alz+Wf/wpGSQZrf8l2lWncBxkfcw9YvT27uenyDUzzBOAC1dNCFAXKVTuWu84rohWY6NvUt7vmvkWVHKWOgIjdVr5PpMCOYLAnPYQ= 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)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:DB4PR04MB0765; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0765; X-Forefront-PRVS: 0723A02764 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(39860400002)(376002)(136003)(346002)(366004)(199004)(189003)(6512007)(11346002)(476003)(386003)(6506007)(55236004)(956004)(2616005)(5660300001)(44832011)(105586002)(68736007)(16526019)(53936002)(446003)(50226002)(316002)(6666003)(5009440100003)(36756003)(16586007)(2351001)(6916009)(106356001)(14444005)(186003)(86362001)(26005)(6486002)(97736004)(305945005)(81166006)(7736002)(8936002)(66066001)(8676002)(478600001)(25786009)(51416003)(486006)(76176011)(3846002)(6116002)(81156014)(48376002)(50466002)(52116002)(2906002)(47776003)(2361001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0765; 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; DB4PR04MB0765; 23:3EfkW8gKdcq7SKThImVQLkv2tCkAzJb8dnGmVu4Ax?= g477H0loA6+Zv/an/bpPnlfWxwZstKBGV5hLHBV/3K3KWuN3iE4pLJDmmRsiwiInwLFGkc/BZ+imcWJzitos8/6r/Fov9e2B0w7bC+kZhO2kogRLRKlKxT1R23jrIYEd/lefOraPeWAlhTjivm/kJK1n0PyvWZD5LpSJkcSlth5CTHUovDhjOuChwn6Rc48apPkm5FctK+Q+kWwLKjYY5FBs96tF/rVRu/jJOQGTw09YzexXD9xJ+sS9yL1MXAQMVy2HEyzwcVjf6AVXoJ1YqHhELzMaIhXxVGbZ92iivStcNmYKMiQ5X2KSS7Mng5RbimU4ckVYLML7BI7V9u/q47OJFS824SL2Zz2UMRSaPd0BMefyhjgIB75rWcmxZDTidMlBANh2zMfUODCDqLPMBSK2TDubqh7u0B19ruJPA8Kk+lHtq2jrbQlas//3JRRtwqBc79cUMj39I2P/egpk/DB9Ip39T17QGxg+NqGyTUq/U092G1lrR1oYGWqty8dHZ0BygKyi4zQjq8/YWi8o3jm8AUqETx3dQJ3pEGEpj60W7ruKfu19JLHM08ilFcnYR4xHELkmQmlPqRCr3ka3wYdJP6N9r9LeelRQkVVuMv3fpU2Pk5SKbBA9xZd0uhdw9ud0QRDygFsvtTcwYGWSsejjLrdXbM5Cuh0R9Z25Q16qVIhM/PHzCxr1Z0GUvNajZst2xnBc5t58eKlnx33F8WrpBXKkwdUKsNTPmw/lsoJBimbUoGnm5pHdirXUJKE6nlf10f8tqnCHGLq2oFiZbrIzVHnuVcjGwb/wNmWDD7tyEe5ynnRLu0MhPqRl52N8m9dDRsZTjn3RvcWdQgcsXoR1s5uK3isfzawJJ9mUvDO35Yi4HrR95LsMPdYyq+BXYcrXtDMFNFRB+xGd+Ovqq09RarpWvg9jW3nAL4Lx3YoyApzjRiUnZDQxAFGMNcAe2IGWqWzc97CKK/hY3UqWeImyTLEr6KSjXfWlDYykGSceFPedIRjek8rp05tqvEKST7+CtfZKrmrxAxVckmZhqE+bzHy8pYCQBsk4qJhufI7ek+4+no1HpthTtP/gVKvE/XwVedAG8abuFiXbMib5ClgtpoyLoikdgZtwBZNogbMwN/6c9vyicZwCKouoW9WdWNc3MphGBHN6MCF7PU3cwAh7hRjUekGzMIf72lTA3mtfSx0UoCjiOD3sH84LLxDYDly5yAeQcpRJto9Q8BQootjYluA6Jc/bylMQDIQhRozb0tJLADN8f+1rFSwhBPZ+kI= X-Microsoft-Antispam-Message-Info: eQeu87xbEnJzW1xsoqYQyCgYKsObbew39Pq/vCsPcDOL8mS53G1UTm0oWZu8qtTZJGLv/5YRicte7G76AG7OfGOZIRfx7gaJsOiV6hFJ8PnWyg6DnP896TGEtbeKpftndUtSMo906NsXBv5OCnM0l5ykxZe/UfT3N3AcOf6yq1ZXEFM+5cQTJZxGqGh6dMuqHzssAltlMzP8Tz/n6QltaIIgsnJkza+FWyVv26UE0hwzDzAL7OnuY4aRE6xXKhQwjoHw1vBezj4B6oWCCH+OXTChtlipwbrEoj7qVkLVG2Gji1bXSk1HFQURxJ9/bkxBGxl8t1TeaxIZiJxbdr+SYU2mHYiKSKF8cmVKC0MI3Tw= X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 6:YX3imTF2acaHXFknxs5uAk8AiFt3VfuvCC8D28izujqbyG0p4LWb78halfms8lSXSHTh9pYGS8mhoBg9RPsQzyqT748ICnP8GEpDaw+TXnkiqEv46C3uE6XxUnmH/QdMS+dv2x+9JrAw4hLAPdv+TUJw+W2aUJhmauZzPx20ePLTS7fBJdqaV8wNuOOPIgDz8NYjrRsgZvp3fhyL4Mt3Ushxc1RSZWssCn3e13k31yT8OrYnfXJc6MoJBVyRZmU8sObqYOPAn1pM6lq9Ghdzzd1x7B7o3finYrWeTwTdu8YvyM6KU0YkTV+Aw9vHPYwacmYMpcgsAqyZWDVFYzy9g/9R81VjTa8sqJNmicJM20p3M0SIyZYYey8+IDQC70h1MBlUj+OV76hruTEmGECiAG5bXadwjfGrCh6wb4jaNSdxjnwq2+kP2dmv/73jCaqYah1CJbsCPuvvcRWDZfCKSQ==; 5:SCZGgg0Wg+colvsjR+5GOWkQPfE9gk2IqYZdEaUEk07cB3naGuFTp1mmtOu06iFf8t2MjILzq13VquSyj8FY+z/6bcdP+aN7rGZ9XmlJtzYlwGgc6y1WZysOuOhj7kUyrqsLyyJKwGmhHccrN/qjYvXaEs/RfbGc03apPmdHD+U=; 24:fxVb255BJBaK0Za5tx83rut+74yyEoujNbDR0vOhvm9/rD5df/336tLPXDl7FXyg60PTxNNl+aJ5p6pe/vnLX5ilN7sdnZ/3N5TNxSNb5Z4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 7:dRHF5GaUXO+Ze1OoPIESZgBXk0yZ0He16ik9LAEx83L+uIKm0GVqx5sOfx2ctO65iSxWT4dNZmZFCHRRNDTS8dZ/fx72VmMeAl5hyL5RUPCdXddgVmApFH4tOuzBqSQHVMMIWExekJ/tqsJkzCGXoNT7ksm002Tf1Cw43MRmPVRKh42LpecoxDgXiR1wZJKG65gaVZQKXeO5ZarE12uUSEFAor4TpY+4urp4ABDlyWWvs1LyiEpO45tNeCs7YTun X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2018 09:45:35.6138 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 38542f6d-8b12-4350-9115-08d5e192e4aa X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0765 Subject: [dpdk-dev] [PATCH v2 09/16] 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 | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index 79ba6bd..def9483 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. */ @@ -1026,12 +1027,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 0x%x failed with ret: %d", @@ -1050,7 +1051,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; } @@ -1061,7 +1062,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; } @@ -1089,10 +1090,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; } @@ -1163,10 +1164,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. @@ -1214,8 +1220,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]; @@ -1409,6 +1418,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 Wed Jul 4 09:43:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 42212 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 827D91BEBC; Wed, 4 Jul 2018 11:45:47 +0200 (CEST) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30057.outbound.protection.outlook.com [40.107.3.57]) by dpdk.org (Postfix) with ESMTP id E57751BE72 for ; Wed, 4 Jul 2018 11:45:37 +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=JmmDCgwxKVgcW2SO2IHyE/HfSGeOKmfxJCSfUSyZTho=; b=YxsnAVhXfEVgpa2MWBXKXZ2dBc+QrIH9AIWeg1Qo5czIAXm3smdNsORRwFGK6+N6g4g8Rn/zpiTDeIft5mFSCzDi7YxAXLVcZDRdEtFP08f/eY+xuFU+/NSesVIXR3Vrxqd4px3Yc4TgVhyKTC6IbHVa2sjixHtec7UJGr5NC5k= 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 DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.25; Wed, 4 Jul 2018 09:45:36 +0000 From: Hemant Agrawal To: dev@dpdk.org Date: Wed, 4 Jul 2018 15:13:45 +0530 Message-Id: <1530697431-1244-10-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> References: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0008.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::18) To DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9dd4aad6-1aaf-4374-ac0d-08d5e192e52c X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:DB4PR04MB0765; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 3:CcIDEcHzd90/uQnU+78ZGA8DnNtfUeWnt5oRThQO8TSzxvKAqjYA4u5HlpdHcqIh4QkJytPCV6ZXv6QAg9LvJk2xXRj0fG7qY8XYaJBbzhr8Z1VQHqDjILnSH5s3X8nApAS6iIHoSamkI6eNUeqDW0JPmodBSy2x0EfLvxU2FglYkbBx0p+zi0/Ye8xl4VTiTcgDXOpH3qZO+qpFcyb/i/t6hSD4iNTz1zOP3Pj/ogokf4c+JmvfqxKXwSGC+m0F; 25:db3cpErZ3QdpKAlPnrTbq3BV940qj2lq2qGFNxRfnN9oOgxHpKdK6rDHmFMEgqFkOOJnIcF298tJv5BOh8MGE9+1xfSwf8gXo3BVi4dqunfosI6E8uAQJc1UaP/NaXissY5oomCxRZcLJh8LPUScki1c1Zpke5iy+vbs91C3kJKe8GErDk/udnplLly+zNTjtjxdOJFv2EgvBIzU9ZU7L1qaOeSvEs84tsHVUCPFF0Zxgr9bI+D9+vB4EOTtSgkUsAAeDyvvQ+PcvZxCPbCdUXZhO0uFFq7C7ekSkPKspJHQNIFrZ/0FaLNK5GE3+K+l6qzbQXIk2eITW7aF3Lhzgw==; 31:Bv4Ot4WJUh5Y0Lgc0go7q8tyQMiKwhsFnUjVlIjiUfDTcoLzt1yVvMP6OPYdcsXccL73xgU/C1uUQum8oiuU+wlYV44QjEo8MUj4O1+J+K/AjAa7QewTYPb5milUR/S+54w1QQGkmdTnQndz/UIhNRETH39JO+PUDm/xG/uu1TRIu8N2nIdyl4rNg8n3WcvGOEKlX0eHL3bRunIpuwsVaT2ZmGJm3haz+07CJB1NFAY= X-MS-TrafficTypeDiagnostic: DB4PR04MB0765: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 20:YvI7q3IjhTNjZE0bpCV2pR/ZvkT6eQpiITyniWX1xqgwyOt8F/qRT3wq4GbXC8vN+zAi6F0B3H4GcXtMVR+wb+1auqsDnYRdxHZJQkv9QHuL2j92Ox4VDydijlIcFHewJHo6AKlxWwN2DZvGhW0YepuEql0N4Hlz7HEJD+AB5qMxJnM6hyWuiNA+0V4qtYaUAnLvecgbyV8UPGHi44VVpYamKDR7QSrp0tQbJgNQM5Q5YKjvSytVNF2OB5414rjw3vtzNM+O7T6BqAd+EHBYfQwqYZoVv5ShFT9mGo3u1aR85VQpbG/of4tTzdljgsYTUheHiPu3oXeIDo8XUpolD5k3PwY8RFmuwKrCTxRy9oVc0jdkhGwQ2c+QAdbUraf1m2ubVC3c7bTBfBU95QLBUUx5c+Iw9W0gq9JKvMxRG740i4Zd0zUSwItXwC3j+rQ0GpycV3U47+73DL/rM3bRV1jLDoL/Z6pFZQk4hOAbp6moxJNJodopaEWF+r9gKNnY; 4:4RO6Zy9qmud+4QSfLLO5HZDJZTFR5qEDagROaroQa8LthxgHxx+R/tqebuwnA5M+cJPTXvc2c0wIzyEpYXjAxQBKXNYO21AzSBsNrvE8hUMlqaazpajYzkwGmtY7nPo3ZYYCgFLgo8YELX/jv/Fzzbt0IoRZByP4soOuNm30c9a7EowItLTMkwigVCM+Nv9tmqRc191SKp3Wpgu7M6BcC8lGCu/zU4DcC9BjLAGy4pXPJesdA/6BVtJOqFpduysIoHemoVsM8tr122YQtNs3dIPcjiYszcpZvfDygs3nA/dSpoTCrev2DfjlZrQf+1E5 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)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:DB4PR04MB0765; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0765; X-Forefront-PRVS: 0723A02764 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(39860400002)(376002)(136003)(346002)(366004)(199004)(189003)(6512007)(11346002)(476003)(386003)(6506007)(55236004)(956004)(2616005)(5660300001)(44832011)(105586002)(68736007)(16526019)(53936002)(446003)(50226002)(316002)(6666003)(5009440100003)(36756003)(16586007)(2351001)(6916009)(106356001)(14444005)(186003)(86362001)(26005)(6486002)(97736004)(305945005)(81166006)(7736002)(8936002)(66066001)(5024004)(8676002)(478600001)(25786009)(51416003)(486006)(76176011)(3846002)(6116002)(81156014)(48376002)(50466002)(52116002)(2906002)(47776003)(2361001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0765; 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; DB4PR04MB0765; 23:CgWbof9YdDEZtWpq/ShBANIFwuJqSoQfl2lDyV1DX?= p1AvfDn/o4hLW/DEKzgMwDGAqavxH7JB2gs/iBJHaYAclfR5FdGSvtPjLFSMdQHzdnUjCjjKX1oiTD3pxFraVTJCtZfcOT2xGIMAUqhAA95/3i4f0RFAjN3BKsulI38w9UFiCBmSMKJngSW8k2F0mYnmzpssvR5vv/kOq4WUPxMtOtC6JAK4dV2o+/eOV5+a+2U73djF2lb1G1pVLGNEEr3M9N6LI+ud8JUt6u2TWWbsyc7eakswFXl9wsAFfKdm7UAZ8T9+9nmiGwNWztJ6sseY5NZvrs5hFPjlhJPUSzKVfn1bYeGR7EzSE0q9ukydOR56rRvqBr14+8f+KosIet7iWTQsHX8AwYT36JgxW/CS9O5QOWqsRtvVFW5RJbPXq0Pa5Y0u3oVxbNM6PGkDKveznh0fUd475lu9idPCBJ1FFs0T29hTdBxDziuAj/moJkh+q2eYvudJTmQZEAm+KgFx9hkOk2V41ag7PuWQHAuWoHCk1y59clpojedlqd+RpR0/TZMiQ/dJGhHm0ysqliRdqScgsZQYY6KO3A+NOIxNkq/EsD5Qte7jBLOa2Rp9Fvp9e/suNV6470ydfcNk/NyUyv849/ovzDE4Ql8ZR2+XscXLXTw3jBU2OIBKKl6o13MUIAoFUGUlOofunPu2e2J+IKELGtvzk6+DGKuzStg91+ddH954d4MAiWUcSEGsNmUmcY/MzqD9dQSx0bacMFDCIbIw87G0Mep1xdV03sIA7kX0Uo639AJ6GR1HRkHfJ/AyuylQxgdnKJMmTlxC41NNmzpiCqrICSQSfcaDBIDLKV2cIv1Uw09sf5YrWfkV9bD7ZcSa0AiImdNNguaMgAWeb8X49FHy2TqbpbK5iv8bhgIxhJmDAWQ5tIgb1mXT/Cqv7LLXcpjtdUbVvr2bfGFkr2+NjDj1WpiomLih3sRoTwbA7CWZHwLz7e5dp8CmdPLTTqmE2KgZb6y3XYv0aQmSFpYBIM5B58ozBUOlofDbTO6Kv4p+wNMotJlEYzX1+TdH3/Sn8+/0L6qUoeuN8oQp7UigjFlAPlZ3M6DxT7oZ26TWycqtkGW07aKPUbC7NZKEANfIBYmlXt471q36PbikGmroAHjm45JLmZtuvWg+QjhrrohNfOSBYZ0MWBCGpTOuUsc/BnJ0r38EBgng0XI3yrK8tsAeSmIOy/hhAmyg7NSyHYzYJ4COs2OQ8uoDCsL8Vv65qrjD/L/vKZykenVucLYphPHHqUPBYTjcPTInQ38r0lOvszSnBbQkvPNzRU= X-Microsoft-Antispam-Message-Info: XX7AwXKXEyf3CBLM1mnAO1kcMBWGIHiGzmzHtoOK/11zG76PrpAW01h+9osXyvNh73K/gpSJuAYBlHzBPj4SxcMJcKLDF0x+BnDiOBpTk8CgmU9r5vuxxrOvSYOaUwPkTqm8BArKy60n/G2xb1nbV1b5V+rZhkThJsN1v0KqzS+A3GQIpUoaDc2/r8XArW7nAsbFamOK1w21SzJpRI/qoVH7UkaVsitLlTF77UhyDiTlwF4JnknHN61Od2L51ZD7FEAiK7c6sOYVTGO3WTtag+7Z0l1faEVXAsUYrBc/g+iBR+KByGUulrhwbX6du3wT/6wVEjludFFWLy/7QUIvWo61vW3LDIB6w4fTcIx5neg= X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 6:0ykht9aHLcLPUXSaxLuULY3mTcA2xHApbkkyZbIffiGd36mUcoQGGrd4ALFTb/Pyb+sFR2nAoLcXtYdNVLY5lxnWqfzeFfX2gU3exkgR28RV+Kg6WJgZ3KT7he67RxS9/7vIPeaK8lSHQyi5r3ZnU7enDgBF/c6WtvoE1jXXYBaNij7dMMQsWzzNBH0DvnMQtMHVBMyPEhqBEU6nlGQFMJKuSg0HmjDgxbt/xTFH4r54GEhFb2d4IIASe7sWrv8rxjfTFc1C7bvw+Ep4pi0FjJR/MIodhXwftsZUC8ZIc8hVH3DRHk0nJGuqyu0urcIgQvilnsRey+G3JNp0LsIbs/fjIK+2I0MXFtthk8Y4ve9evwLAQyHGqdZeP/DR/uK3COAOTkD9IZoxxBS90pQuC6hlbO9fQV+t92X3uR+yIlpGJN0VrR3gFCs9/a3If0uQGZ+cvCBelmNQfHpUBAjT4Q==; 5:wfogC2kYM8Q/ZuV9FZYeLapRKuK4Vwld9TdjMYlKtI/DEBOug74sgak/gpRD8ihA0BnzLT4jr99msWaEXtEtEReCakG7tbfjjiRcV3IJPpF/b5+amVV9+ExdWqMN/51NCKpRx+/XIk0fTlc2OoXA8UodNRaOo5ccxc4oHnm0NKQ=; 24:VE1pycAArWheuJzoiyXCMU/lku4LG5c+bnx9OQ0V50zNAxYPrbGvmEQAkdJwOuaJOzLvZWp08HTjR0LxuxostTW6SdkiD5xMJG8JkXCJC1A= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 7:06HmWhBkfc5nZK+AJZIYt15lEves6snwfeLOI8pkzwHa2K5kXMRQHWdzqQizWeO9YQTRSwbOjtvU5IiWpPAjvXzDjsfoFo8y9OR6E7s1V0BmolvUs7pWqnuv2cavEnYDaQMJyBEeMdPShEjmV3TKUi6iiI0YYD8QTmMrPIgZ76cLvwn6MVqLfsbwNatMQyxU2L8d5kRyipHEznq4j+F2Khbjtw/0Bh3TXiNf/GTcLiudPzmMlef3R7ridHxfYNG6 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2018 09:45:36.4554 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9dd4aad6-1aaf-4374-ac0d-08d5e192e52c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0765 Subject: [dpdk-dev] [PATCH v2 10/16] 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 Acked-by: Shreyansh Jain --- 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 def9483..00611f8 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -617,7 +617,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, @@ -680,7 +680,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) { @@ -956,7 +956,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 Wed Jul 4 09:43:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 42213 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 EA1FA1BF31; Wed, 4 Jul 2018 11:45:48 +0200 (CEST) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30073.outbound.protection.outlook.com [40.107.3.73]) by dpdk.org (Postfix) with ESMTP id DC6461B5EF for ; Wed, 4 Jul 2018 11:45:38 +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=TUP4Wj65CL+RD96jlclqXrFXgk1n2Rhbwdc6UtOofa2qnLmHHahRgcworWRdigADc8ebpHZs4DAOWRkLCW5njQF1oZXz61LLW/ShKz1CWytGr0kyca3JdvFxSPOQ+8DtbkuLen1HX/Nmo3XJ9M7DMj0CuRTSTDi6ScqqXZTf/K0= 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 DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.25; Wed, 4 Jul 2018 09:45:37 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: Pavan Nikhilesh Date: Wed, 4 Jul 2018 15:13:46 +0530 Message-Id: <1530697431-1244-11-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> References: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0008.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::18) To DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e0b920e9-2a1e-4616-242d-08d5e192e5c6 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:DB4PR04MB0765; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 3:5Q3ZJNFvYX7A+9KnNRolD1/ukm/89gvuWJ00UQTBUzLq2yJ4yuhYfBLXU/DU6DV4oIGU9BFf72r7gy0q4ZrdvFqoKpTskBZtG0HgSKxpsoKUgrF+H7PgIfrH+Ea4XfLCdXK7hthiPesaLlAtNi4NKVFth05RaEcTwLHlTKNTZ1pKH+2+RqGdkMWKYgwVl77aIXdoKTIF/X0vazT7r1G6OTGJ0diUmoJ+OkaFxm/ZReuyZZhHPon1g5uFEl/IxsnL; 25:lAA3BZtnxT1DqDxDW6W/uuapsPLuesP2JSpyGczIQIC0Z50ymBzzt4ZvqNhqMd08xnjjtZVng/vUDx1zoz8kVuelDr3E/HOnjH/j3QhwD+MJXK7yh1P5/xJRT8c0g5MPlEkmIQLZVeZy5iBGlvxl7JvvcfKU84NUX3Gfzm4GUd/H05R0gEzAV5tdtzMa4EpuwvDl5ew6VPAZEo+xNEPDdMKZ03/3meWkXKlB5MqkDdEFo9BFyE4eHt7QFKGTVbldA3JIY7tvXs7WEqNRtFcrQTaYaGV8YzoiQxHGOLh3R2FlXqVUjc4nqrB7snATKgIZ4dj9mFVqGpQ9Fe+RbcR8XA==; 31:8zOrH5KfBe9GTsUVQnO6kXY9+Y9L/aTGB5TrWomfqDrE4KLTBnvdbdkIfZIQ9ytjX4gDLw3LOJ6ymW1jInCFyRCCnmpUe8gBXcPwr9vCgB2oWwjL6WkQ0rgGwJ3LIojVuGBgsGC2ywUGRrposHVUzFHucWneb8MM8DJ8/CQE/J+bAIsfC1AFDq+za0YZFOS2ofIxgCvJyflK2a1voljpCbgv6N7Ec63o8LSzGA4ZS80= X-MS-TrafficTypeDiagnostic: DB4PR04MB0765: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 20:Qsv7OJGIFURuvH+vgYj+Ed/0GhppPTTSgCmtNk4oT0iy3r74cT6oQm7rixy0Bpm9zwhBq75RSA95+LkVCiV9ZUgCrt5FonWXvIDPpysc7OKkwwGOpk0jI4vTbGdXqz7ZHJmjUEJRViJm8tnCq1Mc9gFcudNvVhUUvxwVpZi6VSAn225p+GGG1mIpY6wB70tfplQNyi2qaTM6Iqqi6R+b49tMALsbgjqnejFBaz0ZJEjV+c8IEhXdLr6pGNDBxfXpPur7e392LC3q48P54wygsaWarQgqVySfFp4BP49nGg24vj0TkWAJrMf1H51JdhlitHu8WEz12S8JA/6QR+5D+XJ8XVb/eiwV26D554ecaIHRK5/uksVZ6cfaQUAp2x2ZeUiXp+YGvGXq3EOh8i5J+1CvApFRZ7GBIkx+0zeFjoV3aWqm1lplGyZGjx2BAo+u9zm3GBj15YQMF6aQJj1SCLji+14h5UuWF3Qw9DTM6ZQsfapzUtYWRm3Bo516aCGw; 4:lKHghVVFoMBjhsYPnCFpZI7QBZBRJKYW1YRIbKHwHL8HUePMTHASN1Cu4oBVc2jRI41suVMr0/8WrJkFusJHmOBOjtIQ3K5fYSi3VvD/uHhpLul9HASSizd9MpBRzJuvNkPijIx/0votWIvz/76YCH6Qa733SvBSFHdIcLqBbbgJowSzTg8qZKk9Nlj2urTIjEEzd2X9WJkpvM0RDeNEEVmiGZsK+pPYY+30OBvuqlEX4droqppGpKJTIdAoGvja+DO7EJcztE05a1FSFuIa+DGUFcG9HDfLF3OsqssSh2aJYaVUZCnldy1NR4J+EkxovTW2QlnRXAa8QAquasQv2I9JSOzgIwcUPSkb3yx4KCE= 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)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:DB4PR04MB0765; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0765; X-Forefront-PRVS: 0723A02764 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(39860400002)(376002)(136003)(346002)(366004)(199004)(189003)(6512007)(11346002)(476003)(386003)(6506007)(4326008)(55236004)(956004)(2616005)(5660300001)(44832011)(105586002)(68736007)(16526019)(53936002)(446003)(50226002)(316002)(6666003)(5009440100003)(36756003)(16586007)(2351001)(6916009)(106356001)(14444005)(186003)(86362001)(26005)(6486002)(97736004)(305945005)(81166006)(7736002)(8936002)(66066001)(8676002)(478600001)(25786009)(51416003)(486006)(76176011)(3846002)(6116002)(81156014)(48376002)(50466002)(52116002)(2906002)(47776003)(2361001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0765; 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; DB4PR04MB0765; 23:VSNGP/2qGS7biWyIOzZn4Tw5sjhp6q1cXAUG9kv7r?= Rh/9zZLdLCFZaVD5ztceweQmmjal6g2HfTWbXfQ/qx7zKlUYlQkgTQTzzSUJBHO5ApUNqghp+qWGrzIPWTlD7EFZ4fdxz5xFjozWfsvZmuZI+IAF7RBWbP1OGggSjusjh5rAcWLs8YHfpWokvMvta9/kJIaTjNrMDZW43Bsva7tnIuP0wwX125OifC5y3p5LrcK1FmeKv90fpPjMf/qtJSOou+X3WTkF652SpJldHLSQRK06aA14LlFHp4pW7jjWJc5b2ZO4dv6Bb/Q2M9VLfpBMShuwE2O0k+NoSJZ4cs0joVziFyJh0doAkfvP5PGY3knJkK5yL9ys10NFsogb0pf1HiBtDd06ZNNzce26vLXjf0dL9UElS6h4TtEmQFGQQFo1fNivnvsz2KIN14wJYgYdAIdHl1frMPgPvyXmAXvFzcNIrhq7gSWlOIY1cg61V857r73VwqadgVZI/DZLPX+4NxKx6YceInCIOpKez0rHIaX0aZwHDs1mn1Y5V9vn4CPTsvv2d5ukcFVUQ744TQM6Y0t2Wvtl48N1J1ZOvw6Mhe0ZdT1i2oDsZhk1998ZShNMH/cwMDIWJdl3S8MfERmupFXN8rkLHG7cYjVS03lGaWoYB3IG0R3Y/6x+eyO1Jjd8kr5rkTo/syXs2F3FUZEHq80/F5uaFy0uDOLJ1V3TbrsnjQTa23fmEO7B5GPZdmRIJ4hFmlDBz78OED1Pc6Y2Ahy6Ri+0DRcvabGSuLEOmXmAAbPNJ71WSkzo0rdTSriemXWAWHkv96RGtGTWcCo0YtAr+IBpwmQPW/KjQl9ANZYcIUJrSE+W7f78iPu/9Yldsz2EdwWruKqsnvn4fhwVfr96RZnLCm4Fu9IcQIRSxUd/Eh2InR58IC4yHc710N1n6u6G/yqq5+i7X4CKUzX35WNb/OvPRia451Hx6+eUc+tXOvF3hHjFEoLKZnrjbzN5OtaGag3ahW4UpFObYitFoF58cDU9nIEnzaHIfUtWDOxS9AX+Je1q3lXPy+f9+BjSwCMaYIfJEenldS5K5/rWHw6GOPFbtwtZaU3Xwn5UJ9QsWgEk7zsXFHUvZ4ChH7tLnekhOuM8nbc+BO1d9HkYO12sNwo9tV6F77iv+sNufY0Q2zprKr37pyXPiHrLAdmztQCLWhr2o9ZGd5M4VHrRbdSYXkAo5MtlAp+wby5WUxbormhEcEaFoz/wxTRLa17Pm0cYUuQILkZEX/NGxdFB9hkShb/RQlVb/7i51t6uuoSAXlKlOY8m4W4i0/w83c= X-Microsoft-Antispam-Message-Info: Q8tOkI3pTuasXmxVmCTuWhGC/he76OlC+rgtl92EgFPxtJO1D2Jq3UohV7H7gj+LQmpk117BPTsSjFS5pXIz8z3lF1YYOPvz+aIp2eSWxwXJ1lHgpWOjU3ev/n9PkOzmKIh7AWbjFCNpvmhYsikzyvko3T0qEDnrsk6fV+Xej4xh1Bn/SimJAHDMtt6f6nJvVfFfnPiXrfdCiS5TdxLxzUfhCcIdRFiyX0+kUud22Ei43DpxJ+cJ3CtS8WDLGmwAITdld2wZqZkvFt6JZ65lhvw18hohbjBeBW9YP84MFvX1/iU6svFd+mj+lLAfgJeyb8sXtw9riIFWS2XE6lKVuqWN1lUEDwvoMjpp3bzMOa8= X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 6:91OY2w5X7jXzGeESAMM81fG2nq/oxoqgc8cgxeQrJdWYnwya47dXjJyJZfGr11+/U6be1X15OnPX7nzU7ZRcI5B4oXfF6T/oAQIZ1OXbr5WX9vUQQP/18fS4fKm4zd6l8TOQtInRWMMMJz07CpmJqfO0qqmH7gN/zBd5+cUwbUBRYUBqbKmSz7sAza+ajBpVQUtsG/ynuShYiMPCSxzVz1k51ojG32hEhmJdL+sA4DxH5r+b0f0oR1FH8ZJEM3jcBs+lyVMerz6SApfoeAypd3XJee4EvvuTDC25b83/cDXvVA5q/OLQmn0J6g4XFGA3rzk8XQ4I9453MYtmR0Rw0B4yDBOxb5ezbY0XowLhjaKbXu/MCDzhAbKNhfMFUMRLMALVNeOsCRRRsslua6I6cuXpyfCQir35TvLdzfkFDvUL2wBuRPgStPM0f+q8gobs5z8TqZrGvRPAZDmbfgWDIQ==; 5:BWRnl1fYRsmtfWjRjglWZGOwyO1lbkT5qJeGlJIebvUkgBnSp7ghzrpnSDJsYLQE7oHGDIZ5vx3wIWEEgBLEEQxQm94SFdDM/eGo5J5mMgrmAxKhoV+ejkOmNVTTCVqpmFtoxHbgrfmoc5Sd8r0v0AAzduSk+oD1AhnImPCTI2g=; 24:JQqpMsyh9riBjf208Eydo8A7Zn7YlCGVHgtY12XnxvFKY1cE1wKhbZo7uR4ZTFYFCMMlZT80t6PcZ75zy4RqmqHwJ9KY4tETmt+Aub2+qjY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 7:ILRQc5igGHjqxtkLnEY3N8fweIIfImSlL0Mleyt3sYoK0mEzeZliYHBmAXYEmBzh0X0PgqbzdZsQyYocTAvwFPB/VwUTt2l5xEN8f01sefuUdX0+SGMxQYEYXm1KMybpGY2gUy9cn4UKqDkvlYBoeoaOmcu623xEDPiDNHPdYQgLKnam3ScGtZeJGHDV1BS32BOyADSfnzBQAxpmjj5b7bjPKw4dawl4qPh7FjlEqoS2dPX68kti2UKDy/JQbKh4 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2018 09:45:37.3221 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e0b920e9-2a1e-4616-242d-08d5e192e5c6 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0765 Subject: [dpdk-dev] [PATCH v2 11/16] 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 Wed Jul 4 09:43:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 42214 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 67EB01BF35; Wed, 4 Jul 2018 11:45:50 +0200 (CEST) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30042.outbound.protection.outlook.com [40.107.3.42]) by dpdk.org (Postfix) with ESMTP id EF28E1BE7B for ; Wed, 4 Jul 2018 11:45:39 +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=aITHkCMW0FgcC3QOU4EHbKNltZZph58/EOSqxeILvlS0L+7qZgV1lBAmm/sTSOg2h79eeUCcdh9Fxr+/mHzedjiAagSXbhutDuYOxMlsilym3nDSbtwbDN3WJLEgJxWvT3DPD970HTL3xt8MwPswqJomsdSY7/BCwLZcNjOZdys= 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 DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.25; Wed, 4 Jul 2018 09:45:38 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: Pavan Nikhilesh Date: Wed, 4 Jul 2018 15:13:47 +0530 Message-Id: <1530697431-1244-12-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> References: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0008.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::18) To DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aa1faa38-3dda-48ec-2ac5-08d5e192e65d X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:DB4PR04MB0765; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 3:bSnc5BfCf0/hUQfU1uyhOswvAawr9Lx53jsF4a7O5Q82nSyHDovXdyFhwjnvG8uP5tJ3IBmNt021zyC/Mp/v7ZcO1qGJA3RwP2zd+lLSixbE4yWfuX/PuAOm4sJmV2sAnZdohHAeRaaUGa1Cr+A38knl4So0cKqx3VaF5seky+NmiNhYEOOYIIKN9nwK5qJQtS+yRMT9uBZH0XngnX+Op1Apm616kGSwMPR51zrzwIWOhSZ8cEtYuBpATzTGDYTG; 25:V7bRX6dhYd4AIBvH9kK0OytNPoYiGHGakrK3x6kptFoE/tsKMG3+OVWCZoRtOLpJvagIW67meXJ84YHYlGjbHNfkNcpeJuG31RHzB/MxxxEyaQVRGJU1skxxzYRfZskRhHTTT8QzE1f4eAcMWtXoxgWY47Z7nC+p+BcsFMegqo6dY5iR4zgYDEitst7tkBc8kJ+CUunN+0pV9i9qItg7fmCGvbUeH7jcyYXmz9EfX+nJP5t3MFSJIulcVho3PtYJ0HjxxE3NlYUXZtVu3o6a6gzdCb+aOuuCVqNFP5gCm+r5Rx5wH5WWAkGQvgpfddtAY4W/MwK4919GpSlehXCKag==; 31:rXX+u5iOQhZFJjC6g1YtKwcqUU/yJJgMMZuSuvrHaLHLQ88eWv9WBwT4S/SPYNMXVcaNh0NUfli43HFt8SXZMyoUpgFS4nuta5Wmr/vYRzPuf8+ZC1DcZXLi+i2/XIfAhLF9Kz1TOEcRWSQab0HDc+NwA8hpqXVRkrEBoJchNo9YKNOlsC02CySnEevjDd+q2D8xGwdWWtjd8mZkEvZouPbOOs5bK9OE2GT3HGWwJfo= X-MS-TrafficTypeDiagnostic: DB4PR04MB0765: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 20:9v5zlSQ7nRsZ/htgL8dZv5S4w/vqgLAZa16lw73ONbHVlNXggIEBib85CQrOO9omI3AdhfpKJyHoll3I966bt+o1pGigjQynsmSnjS595+ENUv1G6nxmBRuj4Te9Dg47Y8ljJgBjeV5/4bCKLK8o8JGex4KPn7OFc++ZjLaF0usbN3QmDlLoaQ92WZaos57w23X6IbI99om8qUDHhmi3YbcO5bVsWq7f1WZ4OnRk5+zwRyVg7VPmzzi1KhSjODd3ud5JgJuYOBFo6qJNTpoCyJvm2WwvQDDJu+gz3uf72ns74CcR6xhFEpgp/ZtEQb8ys2/pRZnwSIoVmIRRh34cw5ZXBbiD28xDXogYaSwa+0C1T2WeZkLTnp3thqh0qslN73nntYVovmoKCiOIdbW5X1NfWJlLFiqdGAeXDv2KthWn8neX018/0+qf5Hi5GrAq/D163zo18Y2YMF5NbCcG6MWcl6pbxu8uUHTg+Lte/7HC0QK47s10gGPMB3fjViZq; 4:rKj5t48TfGAzie0bJUbNmvcSedoIPGNYIrY8d61uNJz1i7PRJs8UaG6R4uZ59Ilp1k6oZ9jN+TGCQwL5QhrlJrkh1Be/ZEL6KAD0pbnibDjCpeMVqchrxJAnEcAx0VpMGunyuTWpLTmTMZs4EJZoPBaxteskDkT6gARwr1MX4KUPJiAbfliA+2Y8qBtwvqnmtiyT8xfWWs/22QXQsDkyGnmpLwkKbh7I1Te3NaypyTa9VFZ9YIqntD8+i62IlPCKwEZytjYZc2m2AOvLzyRD4I2Ex6rnI8Y7ut4DezeCprM+/G3dR955ooxvLCq82hEf 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)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:DB4PR04MB0765; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0765; X-Forefront-PRVS: 0723A02764 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(39860400002)(376002)(136003)(346002)(366004)(199004)(189003)(6512007)(11346002)(476003)(386003)(6506007)(4326008)(55236004)(956004)(2616005)(5660300001)(44832011)(105586002)(575784001)(68736007)(16526019)(53936002)(446003)(50226002)(316002)(6666003)(5009440100003)(36756003)(16586007)(2351001)(6916009)(106356001)(186003)(86362001)(26005)(6486002)(97736004)(305945005)(81166006)(7736002)(8936002)(66066001)(8676002)(478600001)(25786009)(51416003)(486006)(76176011)(3846002)(6116002)(81156014)(48376002)(50466002)(52116002)(2906002)(47776003)(2361001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0765; 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; DB4PR04MB0765; 23:yt8qynRXYamvLtGPkN4sPN1wHUVdubKG+IdN3GBvB?= 8KhcitZfuyFHD/fbHHieLWYdQbHGpiCwtZpJhPYn5E4zBY+SiVkXFOqKmIfdAii93B9bKCXLIYtRNZ33WQ6jhJN5ThuDQPPr8At8W1Zy9nOoziyJQqGfaCSSLyJqpDmy80dWvMYb6YLTIbg+ONr9PVa/N//T+UNwRqzCzYv0QDHZCL3IX/FEkQSYjX14BsK3TBKOhgFSexg10tlat0BgFLa/0KCmlAwpFBJJ+slFmui1o4Caxjwq2jLyZRgH7R4+otAGc6PlyFLWpGuiPA/K5NrBvuHgg/f97Hwp34+DcnjvmmhbFm71An6ikUBXIpToHUTnlq1njOPNVeQv/NqEFCtX2qwL5mJl2XPX5L2uWDzuygiB+QVhZ1YtA4PNqI2B1aHnXMNTi6TRRi7uYtpkAZCKQZJwpZTNA6cY/brmD361W4ivmishIHIDZFLTIIoeeRabmQiKrxBF6mYyGNg2rLbXv/ZHlyM3o+HB0cDjHMlBfKmE7ib1iJVBB9s7fWhkTe5Ql2vLaa8y2N8tp2UnpBYTCA3CFsbWTxzEExQSHDxK5BfXEmVWV69JksL6ow0E1fPGTlOM6vG6Nol3vA/syDuPSAM4krnUu6GILRlCg6JAuIWDrWrDp2vBEbzWXLkX98sIInJFMaP7MrtRo1YXVcllDNFCEQLYgXaz+3cPrghX7wvZu47sAE/19S1b5ZvFHr5qBWxdcCzDsCsuV76Trvd6m6dMDgxamW87JaiBKd+1fhD89xqkLuDJEfxvYAhy1oek50UdHtU62QO6KYR+YAuyYUvMhvie6T6AULeCeRgpOVoF4LDpy2i6HoQnBE30sTbMRWddXsLRNcUo2QgPMomjygcOTkJpgQhgMwFVaDGmjoIIjX0JF8+z2MX5wslmswZNk9wF0H/Sdq+0PRYZMf8XejqcE5nTti6gZCRbcAe4RssYRBjWDqy8zbM0ces9DC429wWQSDR7LmQJFUD7gSLeSo2ePB1terYjPna8Hrh6Nz2iCbqU/Y6QShbOcujabxVOE7UxhYWE/k3YQXfu+77puSBcMBrpjvYtvn4z1rvyUCy28mAYxGHe3FxF6ICYb0UrKKCb1JbnHTjJmUse9kBoRPiBX6tALQBELeLtR1uUM22m2ckWB/hwQjjWXbudgVns2XGHbyZH0THhPUg0vtJYxNSRf3dfQx+7wew5QC/qvaZwskjBfClJwutOY7JS/kvjMWb9P09H+c+ez/1cutFHnDY70LrY3Ec4xeeG86O7CGmEyxa1EnZnetZPirW5kvI37APT5SBbFOvWuZQDa/Q X-Microsoft-Antispam-Message-Info: 5opqAwCzLyaFc+/f9//WwQbVN0SRAR7JA3d3myECHP7pxCnIRr9YKM4DvIMUlhW7W9DwkaMVB4TPkPLXJfglggrnBWuPZibKg2DVamL0BUrzEwbmGS3xt9xBgKLOmWD1A5OH6o02kcAmk6IG+hcXauisH7AVgZTVWIoo9I/kmcH+FPPrj/GXba72Eg3ybvLkzUTW38vJK6AX8WTQnefFuqU1ibqve97BGzZ6cy3Q3T/Mx++5xvMCNryomvWnEZuuYtvWs4o2QriZkZL4Ye3E+Y1VcEoYvArLOMjOyLblkKcc2j1VWf/GRkBxceHzQim6WrCYLzkqOIrXQEfCcrmsygf7ThIroE5Sn0aUPoy22/8= X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 6:gqv3v0eDOBi74Yv/HZqb4qbDpoUVDV5nAqv3mYwZPxU50OyVLhCRq2kDbGA2KMUZTxLoVHjlVwJcE9cX25uS8koQ+dwjuxNimOb7aNBVHwCcPBxyD1UuX4qJX50lp7OqxTkP+oV0+qEDMc/jrLEu8tXNmkFsfmxI6ceMxvdIVzmkeKsBzY5RtswlL9YidIwMpV49KE07m965Y6WIOwYE3n5GKLFQgKJ5N+tDKi5wtA4rvioUNjj1WDqyIlfyypGjPZhUKWtVD+rkZsmkcze7jWPRWvpvBphW+LL7EpjanIjRJp+8w9LaXK+AFlZ3W2lp3yVHu9AYrQa8oAneeGq5N+X6C3tfO1o3X6iuijs9E+PGh9eNFUHLZnNA1sqnAJZVUnBZQGl7U9ky8f3fI4/bJ0jzxNQugnfsbCFr31xzEed3WfikqP6ouIfb8bL26z34IbzQYB3I/wQycrI+YMLFiQ==; 5:h2C7dd5FFJs3AUKtrTfdUDkeBDT+ZxHqH8ArW9qt49eZa2gcprhV8MKaP3c2TF1WDQtZgcOKsaDXbvAZa3kv3b4S2WuNRy2VvzDbrAUHAwfLNXAiHhNqTXUlWkhehXqWfh9Nz7ndE+HeXLxyowz55tlMlAorrDz8dL0OUOKeG6k=; 24:8hs69L5tXqEWVGLEg8vGko/vfqto51T2b8oIttWG+dsIP6urx+BqWePFK+xy/BG3d0LJaHSXLOPXeCM5eGmVWlaSRIwi7/tGf3PUdOOLNx8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 7:Qv02ghQkXLXCNFJVp0KgSQ2J9olkOtD2jw4HCbgzzOgRw1O09K8pDdO5xDtwCBwufC4UI7UJxp+UJNl6I5aCRVhcG0QY+kNFW9tVGMb565aXftnniCp55EOvq83SZUHhgSrFIP0z/xN71dHiTf/tXwp89oB21Ps1Ibe5we3Bn3lRgjSKjgMzqHS5z0WS+IYM4qSot+gIfFfpHm1b/Xh1ZlO7g+29iywCPVvcXvig1RVQJwgwSghxdpGJ31jYcY6c X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2018 09:45:38.3098 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aa1faa38-3dda-48ec-2ac5-08d5e192e65d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0765 Subject: [dpdk-dev] [PATCH v2 12/16] 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 From patchwork Wed Jul 4 09:43:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 42215 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 06E021BF3F; Wed, 4 Jul 2018 11:45:52 +0200 (CEST) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30065.outbound.protection.outlook.com [40.107.3.65]) by dpdk.org (Postfix) with ESMTP id AA8D41BE7B for ; Wed, 4 Jul 2018 11:45:40 +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=T0l2AwVpp1WBPQXs66nBr/cWzAH+4sLXkqH9Qe9+uMg=; b=K5CbB/xNefIIEnKziMESDyi8iHqw8T911HazbdUZETtxaQ95JSSjiHV5CJ6fGoHQCP3s3xEGmgkWdUJGIIvTLa5nyB1G2zZTtEE9T7vraZTZF8LXp0778kbNSx1FMvZfR9CyTT5rfoc7i+QTvp01ZdYF1ZeBvJqI+Qs4V51M/zk= 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 DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.25; Wed, 4 Jul 2018 09:45:39 +0000 From: Hemant Agrawal To: dev@dpdk.org Date: Wed, 4 Jul 2018 15:13:48 +0530 Message-Id: <1530697431-1244-13-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> References: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0008.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::18) To DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2236b62a-1736-420c-a1c7-08d5e192e6e2 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:DB4PR04MB0765; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 3:F/jvqXqyarekuSUEjamdHNh/70Far58ajZgaICqd+68cExuUHYYE8OWlNupO+rWOOvC/0hL+3a4cBaHN6V1zVff9FsQKQUlXaxNMKPCaMfYhn332ySPfyrYfjk0jg+QKJUV/r70xR1miNodYUhaBVKZ3+OmQdju76fP7X2iqMwSHju8D3hBARmXLmSZtUPavgEjlqVTUOv1g/lCfFhiB+lu4MGQ5RGYpVbxuJDe9eCIk34WAosbsgPud6N3OYiAv; 25:6Q2zLVWZzAoWn9n12LHUcyqpROuvdY8s8UjHg3xcWEJrdiwPTNOBaodVolU+Zv4UdZoZtbjBMCuIYP9KwoOImP1e57Fky4Dd9pv09uvyqKmVqgCvKSfEqNSx1AqbGLY07AcNFEC1LBdryI+r+pFvFfpr/hoyCokeQDy/DPHwIgPA60l4RKU3aAUwdShv+oDOcpSPbynOeO7gRY/jchcn/KZ9aCmJP6AKqH0Hq/B9Nr0JhYERFpzOGpVyTpfaFsbcz1dLDE8m+FCgLGoRnXU6Eq59ug3E8IJEjrtZJu9rWEaBH0zHfILg4AxLDwovvksPQfldRp9pO/XSl17CIljU9w==; 31:egMYLzovNMaCGi133Go9X/I7ap39IQHVgI6uk8e37DQDSmtuv2D8DWvL2DePxPLTbmcAFbydtcnxkI/0TUgvymOEZoaOjw/fMpAwfaoQZKQ/p1FI1vKNta0neafVeSR96Umjm0Q+2ZIsXLn74HYbK3a/dXDakVEw7gZS3ss348shMvDTNRz782dONT/TqDD6l7AcU0yh3i0dXpu57G70sx3hlgQswkUqc0PX6IJLpwo= X-MS-TrafficTypeDiagnostic: DB4PR04MB0765: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 20:5hhwypJmjer2UE0Fz06kUiWX6cXkF7PdVJGqWXRdlWxHPHFd4TwqpNp4b48SbOVn8ypwdd/kGMuqNl01hZPAcDGUXgU/Nfju02NmVlN8y/8yFhjX97yMBlvS5tvPY5IP2bZ2gv6YY/Oj2UZjYeQN7HqYdb2sOETKZ/6RYe8qD9+bfLijajhK1usunHR4fExXByfrOlOstEhtfVL1byjeHB8uO0DSR8w3jVjTsmahB2g3LfbfZyRsXQL6HTLjwPdhqV95xLG+Dv/UaU05t1V26sds48PsoO76AjQrDS/EDjiX+pNm7jC6gL/z8oiz/C++VjPwho301KS7IgAIqGg+owt0XjeJY3UD5xTL5P909drEDdLeutBa8HyeEnlRIVGAcMT64oacmdisjTIB5xoksCDzj8K6x4xfZfeweOzr6uSGNwl9q4lP1ByXSGwZ24Rjvsl9DlmJKX2BSdAfVAP/RUc4kJ/7TLBYQa2+J84ZEe/T7Q7ehYG97TN+3kDGbCuJ; 4:IggU7sc6zalN6rkfnqES4XdVzyrAG5OEg1WiU9sDLekInW4o6IypNW34J3IzD49wjbWmVQ+f+c7Un/DfJlgXCIopcdoSC0QNanJbKy8n8PNNVKv7o7qBqLF4DlVXBg59f4ryak+/5P+t8IKEVnVvhBfr4NNgtTQDILfgDEDpPG123yMokRKRaJuat8ZLqzByextTtKZ9054vfZu1lL/PjUC0UjJ1m87VUyYtTDp6+8s/unCVpyfnXntVH0L5f936ayt3s1iB8OGqe9B8QQzXLaX06KyaChPBGPd74wV83g0uwXZk9WYh54Ex6oycHpUL 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)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:DB4PR04MB0765; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0765; X-Forefront-PRVS: 0723A02764 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(396003)(39860400002)(376002)(136003)(346002)(366004)(199004)(189003)(6512007)(11346002)(476003)(386003)(6506007)(55236004)(956004)(2616005)(5660300001)(44832011)(105586002)(68736007)(16526019)(53936002)(446003)(50226002)(316002)(6666003)(5009440100003)(36756003)(16586007)(2351001)(6916009)(106356001)(186003)(86362001)(26005)(6486002)(97736004)(305945005)(81166006)(7736002)(8936002)(66066001)(8676002)(478600001)(25786009)(51416003)(486006)(76176011)(3846002)(6116002)(81156014)(48376002)(50466002)(52116002)(2906002)(47776003)(2361001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0765; 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; DB4PR04MB0765; 23:DDfeIcZ7TdXjjhHxWrqoiRQqXrdYDROaPmETVtabV?= kYTdR9w+EktnrUe/Nm6lOtNiAYSRPpW/Fb27G5LlSUCeAoUO96CHYo9KbFUAVzsWvBOG7eJdQT4QkYn+abf+vlQ7Z9GdBzi1fyDFAFIcYmqiBc1v7fN3dTgRrJ6/K/S822PUEtxxZSy7GkbuETKzQbFNVqrR+X/f3DlzDs0UOHCVsMA4BQNjjuknOioSQuYuttM3dpiUySdbkRKRq2R7BwRgod1cyGoYcq/vYrXWqtBFaw3I2e+FMYqvECdfJCxdDNz4/wXSLHsgNdhVklmGfywYXMURj5hgvQVn5YL+Bw22rs2xEnETIY22KtK5Uybtcvtadc+yRQaE7xpgYt+OtGMBKuoK3ajkCLqNlpRDTYzsEt8S7BSwywL3QVJ5RAcvaNGG7oQCgndxZH10WMaA8xYw+i2Cwj/QzJoorNSESvXUMoW+eCbVPT1vbXXQ35F6xkJ66IYGcCODw8RN8FmXve/a1e/r6lJmf01PrYfi4lsJPyo2XZFucY+o9CkC41GySWuIkuFjSTAkDokjTiqHePnydahSxVK91jdRt9rLPIS2WpzJtg+yTmLm3WQ2ZTz3Nig5TpU49etFqYnLib/PXi9fakHFjgvxrfjd3bTgp4gfYIkFZGfUJ0K0hSYJDwuIcqXgyTXR6e2/cRXZ5cg/5Wfy8DzDEWEOHNwMKbBJwS92GJwqBtEyJ596r2AxRNpiBPK/EV6BDDQO0IhEMvEeGoGehIADAYfoLDEXV1+5ORVCP3Uq1GhkRdJiuzeUpGLV3dkkhNltqpXBeXSrFGfrSBveTE7nT4mSmLz0JZXR/Sy4VrjzGVACGTo3aIkqiCmLUw1k+q6Bgpv76gPE4BXSMJM4KYh9s2Qt1lz/bRYy/grJdqwHToVchyjYsD8egS4Yyw1WAB4OsMhA5TFO2YSVIFRWSKGmlvkvxxanlEbKfpGlC+FiRiZg+XgJ3ydZ/79QB36mGkW9cE1wkZFCkMmvriOXREUjX0+F+W9lmXfnUb1TLp5/E0HKi1pGhzEPvx94RLQSamJA0Rh8q6BtLtIQVMPS92px3oi1ocHzdSr6i/kDRpi2vtbNaJEyiEJid/Z54MDatMOuegBnBAJmpeyY55AJ0MSDUxTtXfaBv3UlaQwphkJ2K4Mhp1PBb9imWXQgB3+Hiuimeg7wUVpPLHnJanMuIgmnLRdASr9Too32I6i09CaLw5k6Vy/IIniV4qMsWevN3xBCBOe+wo/NAQFody5nIpxVvlQjH3WEhIrpn4tqKK57PKeGPHdiYmHS7ggJN4= X-Microsoft-Antispam-Message-Info: 8Ynnq0NgNOIKQgb+pYDlYDi0ENO8C3GOKrnTuJEBlMVGIVG6O3X+LNMMoOhoWu6OJeRyuLZs2kLM+zvQw89A7pSE6+/43j1wKYURI92EDCCfoQSEXjm5vBWOZNCw4xpHUBhkPlxXsbEekAAlz5NGyD8iW0Kt48806apSqeKAROabdllmVLzJT+LyiZjMLMPEG6NQtAvBqHV+q8vaXmQzOelqCJfO0lfBy4GEJg0vr8v5cjlH+vPL4dVhAQ1NCtNMG/oYh70fD0SM/vXVu0FEEyk04UmbE5cYwwTOPz7M50B66BZAEbHkIbneNUPOGbXUVUvd4h4dJnXPFPljOorhbRCdCEx0gwDIEZD7q1RQVSY= X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 6:QOVL7dCzy9I6ZzIQNUiyh9jcYWtt4epLcR0QWZevbxKhAi4Sb3SbOBRlTRXyUYNt9mkZBmmwpxSWYbbfJEFO6TSWu5rsKdmxmsvh/BCllytMGxpDhYrSwGzDoW0JYWagZec/imUtobaEQqsS3SMAc9uCD/IyQf1oxS0UdKRzHM33PwxkTCjEMkhJJDX/nTi3LUUy54Fr4vN9myVjH05cEPdqPCQi6rhddY4Iwa+/09o/0XNCsoO38EC0WiWQ8KlyNJnNGNsu5zs8sUIy+EiCLfcWEhp9+AYoaChnZsS+/5LMojRMkzaH1j98OyzumZkgqauabTFEaYAC0fPs/389r5tZr44VMHXQ2s+EMuyUwTIDfgCWvq6nTcFzHcnnpBhQyDu9/W3d63r0oBzKICFZhdZ+zwZaF3qKUtXPzkZmjg4HJDmzoztCYpLdDHLoYY7A6f7OHAHwMxnLufTtibXNQA==; 5:tWu4oWtWEFZ+QhY7YKZ9n3NY04A1sclRikmme8mjqPld6VwjG35FNm/vthRO8Eq/fsd7WBiQ3dt48Liw/icuREtUkwv174SmysyraWRKGnlzazFDFNQ7Bp1GKshG6LQNcDsVtnhq2kAGaORZv4DcEZca8oY5asYVuQdamQVZBGM=; 24:fwy5grxndcApU8wT51jTxanVwTMcmKmip0zB9ZhFqNRfS/VP5kjCBSY2FcgCM0p9ecZnKdN2gnZKd7J/2PCTPVThqil8h76XBvXE8UlN4vA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 7:eLhLHYaUuolagCNUT4M8+RLjRuIwuNmM+XmiDkwDlqGnBw4jsNQxcGtt/krich7paRqOEFwq26yUy8hwIN8Hnyt09mZTL8fj/Sn5K7FGwXUMf0Y2sPtzIJZa6Q77wk22aK6Bs43qbXXQ7btH33z9C2ZZz0dKUZtVfNo1dqcAH2WW5pJMLyvLf/eLGlFVpO3DG7UCJqHMRYwfL0JUp8HmucmYDlgAqUx7JlxJnvovzxDLITOBrsf1G59aqLsKORCc X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2018 09:45:39.3356 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2236b62a-1736-420c-a1c7-08d5e192e6e2 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0765 Subject: [dpdk-dev] [PATCH v2 13/16] drivers: support function name in logs trace 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 Acked-by: Shreyansh Jain --- drivers/bus/fslmc/fslmc_logs.h | 2 +- drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h | 2 +- drivers/crypto/dpaa_sec/dpaa_sec_log.h | 2 +- drivers/event/dpaa2/dpaa2_eventdev_logs.h | 2 +- drivers/net/dpaa2/dpaa2_pmd_logs.h | 2 +- drivers/raw/dpaa2_cmdif/dpaa2_cmdif_logs.h | 2 +- drivers/raw/dpaa2_qdma/dpaa2_qdma_logs.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/bus/fslmc/fslmc_logs.h b/drivers/bus/fslmc/fslmc_logs.h index 9750b8c..dd74cb7 100644 --- a/drivers/bus/fslmc/fslmc_logs.h +++ b/drivers/bus/fslmc/fslmc_logs.h @@ -18,7 +18,7 @@ extern int dpaa2_logtype_bus; rte_log(RTE_LOG_DEBUG, dpaa2_logtype_bus, "fslmc: %s(): " fmt "\n", \ __func__, ##args) -#define BUS_INIT_FUNC_TRACE() DPAA2_BUS_LOG(DEBUG, " >>") +#define BUS_INIT_FUNC_TRACE() DPAA2_BUS_DEBUG(" >>") #define DPAA2_BUS_INFO(fmt, args...) \ DPAA2_BUS_LOG(INFO, fmt, ## args) diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h b/drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h index 7c1f5e7..8a99044 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h @@ -18,7 +18,7 @@ extern int dpaa2_logtype_sec; rte_log(RTE_LOG_DEBUG, dpaa2_logtype_sec, "dpaa2_sec: %s(): " \ fmt "\n", __func__, ##args) -#define PMD_INIT_FUNC_TRACE() DPAA2_SEC_LOG(DEBUG, " >>") +#define PMD_INIT_FUNC_TRACE() DPAA2_SEC_DEBUG(">>") #define DPAA2_SEC_INFO(fmt, args...) \ DPAA2_SEC_LOG(INFO, fmt, ## args) diff --git a/drivers/crypto/dpaa_sec/dpaa_sec_log.h b/drivers/crypto/dpaa_sec/dpaa_sec_log.h index 9784fcb..fb895a8 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec_log.h +++ b/drivers/crypto/dpaa_sec/dpaa_sec_log.h @@ -18,7 +18,7 @@ extern int dpaa_logtype_sec; rte_log(RTE_LOG_DEBUG, dpaa_logtype_sec, "dpaa_sec: %s(): " \ fmt "\n", __func__, ##args) -#define PMD_INIT_FUNC_TRACE() DPAA_SEC_LOG(DEBUG, " >>") +#define PMD_INIT_FUNC_TRACE() DPAA_SEC_DEBUG(" >>") #define DPAA_SEC_INFO(fmt, args...) \ DPAA_SEC_LOG(INFO, fmt, ## args) diff --git a/drivers/event/dpaa2/dpaa2_eventdev_logs.h b/drivers/event/dpaa2/dpaa2_eventdev_logs.h index 48f1abd..a2c2060 100644 --- a/drivers/event/dpaa2/dpaa2_eventdev_logs.h +++ b/drivers/event/dpaa2/dpaa2_eventdev_logs.h @@ -16,7 +16,7 @@ extern int dpaa2_logtype_event; rte_log(RTE_LOG_DEBUG, dpaa2_logtype_event, "dpaa2_event: %s(): " \ fmt "\n", __func__, ##args) -#define EVENTDEV_INIT_FUNC_TRACE() DPAA2_EVENTDEV_LOG(DEBUG, " >>") +#define EVENTDEV_INIT_FUNC_TRACE() DPAA2_EVENTDEV_DEBUG(" >>") #define DPAA2_EVENTDEV_INFO(fmt, args...) \ DPAA2_EVENTDEV_LOG(INFO, fmt, ## args) diff --git a/drivers/net/dpaa2/dpaa2_pmd_logs.h b/drivers/net/dpaa2/dpaa2_pmd_logs.h index 98a4896..c04babd 100644 --- a/drivers/net/dpaa2/dpaa2_pmd_logs.h +++ b/drivers/net/dpaa2/dpaa2_pmd_logs.h @@ -16,7 +16,7 @@ extern int dpaa2_logtype_pmd; rte_log(RTE_LOG_DEBUG, dpaa2_logtype_pmd, "dpaa2_net: %s(): "\ fmt "\n", __func__, ##args) -#define PMD_INIT_FUNC_TRACE() DPAA2_PMD_LOG(DEBUG, " >>") +#define PMD_INIT_FUNC_TRACE() DPAA2_PMD_DEBUG(">>") #define DPAA2_PMD_CRIT(fmt, args...) \ DPAA2_PMD_LOG(CRIT, fmt, ## args) diff --git a/drivers/raw/dpaa2_cmdif/dpaa2_cmdif_logs.h b/drivers/raw/dpaa2_cmdif/dpaa2_cmdif_logs.h index 598a621..8991e83 100644 --- a/drivers/raw/dpaa2_cmdif/dpaa2_cmdif_logs.h +++ b/drivers/raw/dpaa2_cmdif/dpaa2_cmdif_logs.h @@ -19,7 +19,7 @@ extern int dpaa2_cmdif_logtype; rte_log(RTE_LOG_DEBUG, dpaa2_cmdif_logtype, "dpaa2_cmdif: %s(): " \ fmt "\n", __func__, ## args) -#define DPAA2_CMDIF_FUNC_TRACE() DPAA2_CMDIF_LOG(DEBUG, ">>") +#define DPAA2_CMDIF_FUNC_TRACE() DPAA2_CMDIF_DEBUG(">>") #define DPAA2_CMDIF_INFO(fmt, args...) \ DPAA2_CMDIF_LOG(INFO, fmt, ## args) diff --git a/drivers/raw/dpaa2_qdma/dpaa2_qdma_logs.h b/drivers/raw/dpaa2_qdma/dpaa2_qdma_logs.h index fafe352..4779e4c 100644 --- a/drivers/raw/dpaa2_qdma/dpaa2_qdma_logs.h +++ b/drivers/raw/dpaa2_qdma/dpaa2_qdma_logs.h @@ -19,7 +19,7 @@ extern int dpaa2_qdma_logtype; rte_log(RTE_LOG_DEBUG, dpaa2_qdma_logtype, "dpaa2_qdma: %s(): " \ fmt "\n", __func__, ## args) -#define DPAA2_QDMA_FUNC_TRACE() DPAA2_QDMA_LOG(DEBUG, ">>") +#define DPAA2_QDMA_FUNC_TRACE() DPAA2_QDMA_DEBUG(">>") #define DPAA2_QDMA_INFO(fmt, args...) \ DPAA2_QDMA_LOG(INFO, fmt, ## args) From patchwork Wed Jul 4 09:43:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 42216 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 6F1801BF44; Wed, 4 Jul 2018 11:45:53 +0200 (CEST) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30057.outbound.protection.outlook.com [40.107.3.57]) by dpdk.org (Postfix) with ESMTP id 524461BE7B for ; Wed, 4 Jul 2018 11:45:41 +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=0nkk7qyqeIWAWODWOnGuWupRPzcPc48ViNY5csLwfuc=; b=CMzfu/uElwxuinGvz3Wn8IRUNTnCN3NPECnXSY79OnJQeFRx7UdXgFFRzC81bEFwKJhzYaROk1vlFXbUZHSHr3u6V2LVvmwK7n5EO/TBTMjQMFHVww/C1IJJOxZdMA31iwCwUuG3bxErdxqhjuKODCpClMrpqCX5t9bEilwTo0w= 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 DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.25; Wed, 4 Jul 2018 09:45:40 +0000 From: Hemant Agrawal To: dev@dpdk.org Date: Wed, 4 Jul 2018 15:13:49 +0530 Message-Id: <1530697431-1244-14-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> References: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0008.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::18) To DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e33e1c99-e43e-4489-9d39-08d5e192e760 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:DB4PR04MB0765; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 3:s2J+ZYcOVsxQmP/P+33Jh8UBXHmlB23y2eRBSJsMCac1Wwf1MpIS9WOsX/kKek2AyDRVqhQaRAdhtJWWFp4WWq3gkr3yEYmmdmx7jUlYU+WvRLPA19rC7EIJqA84MgjkYysT/7acngllTFV5/f1R0F5619mLGv/0Vv2+ROb7JsN5m5m7fX2w4v6cKwCk+qzI+5eIJ9lFilPa9u8AXDT5JEIa9Ib3KHQcPQiqK4zuaMep3h3KxReJNFvOkDr5nc6j; 25:nZthjffgqJG8Syxcp4DUrf9UD/yS6cTRUkws5+lrOX65l9cZppOl9ZDgy7y7kX/G6gfC5OcEHoR4GOAfprMr3QzXSNMzGxAPYlK+RB2OtofjHSENxUDsG6IbB4fNnSol2N9IBqngFlt/TASdEOztm4f7yJ/URWFDk+byCaXriLToXa9scNcNHg+2vG4bwXBU/Y+OKivUzEnu32AbM5HpmQSzZxQb8TS22M3y9b/JVqXudhDfRzRmNY/pEc8ToIjtwKmOXjspOrQiEX+Y4w9cEtz/4AYFoYJq8QZplyApxiCN9nhPr1P67VuiEG1nrpQknBrHel7XFE2IcsVwwOb4+g==; 31:FzZaNyF/qMosLFQnlJMdocwfTptrzyQ50lPBd+sRnO2KQxndrvR0jeR1+A5oL6X2991m01DJka85G9viwxkLZ/sAxk5JYPo65t7BzRTVP+KnRiLSTwx03yEgq3BRvatmwIRUBALCNX87Pk6Y114T2GxcAU3KgHfyYpXzj+bVYm7sK77NBlqkH6Q9H8dQ9Pbt01c23rjJaxawGffKkqMF1gxZRn2OziYfzvE+sHN15/8= X-MS-TrafficTypeDiagnostic: DB4PR04MB0765: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 20:qaOxlPR7I+6E5pjnhJmjeukB31wkaT7Mm/GRqEGrj9aIUvPkd8+P3SBZkn9iuLwHd5z3sbwACdBdRlefIBXf57iVR05HkDIIg/If6mSzrIIFyBCCYp81yRxF0Dc1AZDIqdB68RqMSVbpeTMwzPmWgZTCbPeIxH5v/xZu1ZfIYqZEG1xeu2sx2SEmJU02+mNhboLtk17c6q/rtivV3V6dD+gC6YY2OWesuhSS2rxORMSKkg2Oo33b+cZm9cJVGcbkqPn1vbqm0oibTR5azvToT42wA6SY1v4jXYKvCSWD5IcnCq0ax9DNTf+bvnBiNzYQ8fXwpVlIxZ6XNAPPmU/vEvY4pQ594uU9KPqZ+ODiHiTDR0tSm9kDW+x9oojHw8QGuJ3IOk2qKKXcA8Hh9vWzFfSAyM7YCdpwy7PaEJm4ts1RqaAOpLr8cj16gAGM6xRoLFUPBCS5RomuQfAQ8MRyvcIAhTXb5W3IQ58AjrRW5GpAdS9258ZP/OYxulPR+dNw; 4:8oAg3osVvAVn4EaZ7LceGLkOod1q7+vDMRYBnkFP+QuOS1BSqyCY/vuMa/8FD503K9xJJhulkdE/bMtxdgBjSyVAIh5uAcN8PqJfCGAOfK6M6zoMHwztC1NBLPHFnOMhUkhOQCbcpNjIVGPPol6SAjVyxnTi+t4H8gQA+sgfA7Lw228feLPSCQLlMCeyB1c2WtaAYmaL/UIkvvZB/o7qSMucJr+KDjCYA3vMw+rZEoTM1ya3VobL22MsBjgduWz3chQOdm8yv1Bcr1Inbz+Togthjtzq8IW8qRvl/g6D7zC2ZsojexJbPDFro3xe+n/t 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)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:DB4PR04MB0765; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0765; X-Forefront-PRVS: 0723A02764 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(396003)(39860400002)(376002)(136003)(346002)(366004)(199004)(189003)(6512007)(11346002)(476003)(386003)(6506007)(55236004)(956004)(2616005)(5660300001)(44832011)(105586002)(575784001)(68736007)(16526019)(53936002)(446003)(50226002)(316002)(5009440100003)(36756003)(16586007)(2351001)(6916009)(106356001)(186003)(86362001)(26005)(6486002)(97736004)(305945005)(81166006)(7736002)(8936002)(66066001)(8676002)(478600001)(25786009)(51416003)(486006)(76176011)(3846002)(6116002)(81156014)(48376002)(50466002)(52116002)(2906002)(47776003)(2361001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0765; 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; DB4PR04MB0765; 23:O3ybgwfEFRjCo22VGuCPDIT6Lj4TP1UgeYpDrWsHb?= F/xVq8LRCaroE/kSTo1I2+lwpGx2nFtVgFRa5+arGUNidjf0BMQUkQbwJkrAdn3z5Kso8whSi/F9B4xvi88U0v5rQ2wpHvV9gsUX60CZ25RBuYIQfhbYIWC140bvYqY3ensk5eVp2x7bKlnHplShmkdz1a2jG4BSsDX2DcRjfITWtxBANRnA0lrAJ23TfUjmBCoMbGZWyt3CWo61roJWDU8Vd/duERQm/KWv86T/DfkmcaSGa0paqQ5EJDTY3S947x/3+MF9DirBpLn0qeDDYWSSPJfk0c7xObIYDvQCeP4nDERmda9zMpi1r2NXDeI0NE2il6Etu0W9x1rQPX/u7K9TMIoDcRneGuEYklF7GF4ugZzPA5NcvoSBKry4pbG7JquJXVXUAgnsCYdkpj1Beg2BjrgySYK/w/cUdq/0MiCWD+B1le2AJlEkKt5IrFqCeEZ7S0bbZNusjnhnW1N3QaZZiTmbuBvFsKW49NFSFnbwQoFvRFneiK3hxicFfEctIoErhd8oNB9rlB96ASzrED36xYdnaleXWsnDm80aYtnRLGy2XOkMz91gbspSSi5zoqiGOl3vNRBUKvJrJBLUtcD7BUeIv8A0ghIfyUGAAdhtuJIJi1d5ushLx4uINCofTS2cQ/HtLXxUDZb/gsom3f6kx11TfhOsSflgzVqy5KSlnk0h+adEk19Bj/gthvcc51gci63YcqJQ2Gf4kg9sukl9lerpBT5Yq4u7Ort4fOeCmGM2+0N+lErVOuAsRwlPAgYjg0Pu4rHlWl1+QZQb0NUGBaZSW3g54O1t5pVlICJ5s8Lfqn+V8y/WLXhxvyP/8maUdrkz09DgSX9Iswb1Ztw/HPNPlpe/Wm1hQG4g1avPuPAbSvHvCEYtZ+fO72TZLW4cmBCUTYEWqhFxYARvrH0cA/JHcHf01Tp3jWL2/EGnH1jUrZv4GQgcRzXw60c4SdujKjHbFe8SXZ5JHtt1TOZ9+Hdic8Lp2nIiamlnD15JuO/QT7+ZnjhD7gs9PXtaxYK47enIvyHmnAHAXtJe/YNrNZ44+P3FyVYEYFvoRx17MBnZP8EGWB5lrrl/8zmILC97eIf75zfhbOAPXIJBZMVtR6heGwy8+K8cmZ2UDHm1vb5BY6gf5fQECEdV1RXsh41XiLSf6E6j0V+HJ3MHWbTd/hh9GqFFlTgp3fY1xS4aaEYt+++qp6N6JfE+Qt3kgri3jnHtCEuaOmB/zG+AMbyD+vK4SI76lKyN8qQY/ZVVRqkI7VtWhcXW5I4k7gRVnE= X-Microsoft-Antispam-Message-Info: Bp1Mffy9vLHYQr5P4UA0yojyeaczAEhQ+3sIV88W2adfSAgX8ZBJjutSqeWS0f+ftZ5s0lwm3dr18vsfZL1cqw4cKt4wVWZ2b/6XmFOQA4jlpNZHqvRlmkVZqoxwimJC4il7x/CxFTMVQb9V46xlHaL1NHyxO7P6yBCH/DUlT9z6h/j1WjqPKsP6rUr//7GpyqX/qs15ToHAfUWQgXchAc5ml/ypVek19WQZQ8UPJI+ZvInB8PeHvVrWgywa5va9EXPB7vISfakRbPVXg6kvNA6kENv21+J3PzUHYTKuQos2bxEV+h2f8Nxhw1cE+cSXM4Vd6JwyUvabiAQthAoKqZIZJApBuWle7ND0SzjNqlQ= X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 6:zN92wB8spX9ZY1YOf/g/fYPPvPAQk5Q0PF265Wyarq6AcjQSp8fAiINaPsMsGLsQ0RFvN8a1AtwBjN2XBEWbY3FVQEjj9dsdmy6Qt2yJ/ICaPWwFEkBJh7sTAqfTWbXP3BY3EHwkSDRfqxgsfVja99jgdV6mrv9z7yOjsb/St3TjPNSc0sQuuMDX5DPwH4TFB4wG1y5xgFVI4waQD4qmWXht+gbFiKjDO+x6+ZSfrAi8TQ5shAUkZ3QYN3UltAayba0VjN8fScZW2P05s8fGv2jwryZucIJ0UiP5HnlwqqbQGRyDYUvgcQtyUXJvhMvOl00Np/6b75TkLWsvwRmLxHABqZbEJ746d4j+IaRWKALN3ODfGCCDIiNyuuG8mAL/c+zN9ulW7EgFmP8CB7Walx5IumumT2XmGYbV5u1j6ftS0PI6Ne7JTA5jSWnvy7jQdMzprnCAfvfU0y4q/0AX/w==; 5:UE5IonTxtInfLPcv4YNRTia4NmFeiwgoYUap7jsQ/Bw5lYlmfIn+hY6mrYg0XoXze0Wd2eJjCs6A5fcLQcleDPZzJwLvDt1r/JqjXlRSbWfJVgUsegh8D3DSZjNT8+HeI7tCyqGqEuzJnu2NMg0fR9InMpFYaqF5j3xRHohx1BY=; 24:m/22vhzOwfVqp1PPOizx/WaFBQMpiIz2/PlzPPnwqjdSRXWSrkyfU086LSQNKyrMxjn6/xSwpQcHebqDDcvBfT80jElgNb2w5XFMalGpRlU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 7:jIDsbCYPNFQNVj1eOn+IE8fHA2n/PIkmG+KyFGpyM8i2EBUZvdZxtL96v7alQ2/BFMF34bxr9qWUYNQP6kWbEiB6rRA9g4A5WUseFPNBParmprBgXb8NDPzZ0VlaSvkfM/jZHSbC2ayOTyzkthLpgUy73OHBlaXxgomZn/mauZbohx7oCmVS6aOh8iBacWrh5bdeQ5rgtl9EI2C+nCeifHkbo9TOL9ewPsa7TgIMSjkIP5itEef+xKKb7Z3awQ5+ X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2018 09:45:40.1653 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e33e1c99-e43e-4489-9d39-08d5e192e760 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0765 Subject: [dpdk-dev] [PATCH v2 14/16] net/dpaa: move the push queue set to global init 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 Acked-by: Shreyansh Jain --- drivers/net/dpaa/dpaa_ethdev.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index 00611f8..5c0aafb 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -1174,16 +1174,6 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev) } - /* if push mode queues to be enabled. Currenly we are allowing only - * one queue per thread. - */ - if (getenv("DPAA_PUSH_QUEUES_NUMBER")) { - dpaa_push_mode_max_queue = - atoi(getenv("DPAA_PUSH_QUEUES_NUMBER")); - if (dpaa_push_mode_max_queue > DPAA_MAX_PUSH_MODE_QUEUE) - dpaa_push_mode_max_queue = DPAA_MAX_PUSH_MODE_QUEUE; - } - /* Each device can not have more than DPAA_MAX_NUM_PCD_QUEUES RX * queues. */ @@ -1424,6 +1414,20 @@ rte_dpaa_probe(struct rte_dpaa_driver *dpaa_drv, default_q = 1; } + /* disabling the default push mode for LS1043 */ + if (dpaa_svr_family == SVR_LS1043A_FAMILY) + dpaa_push_mode_max_queue = 0; + + /* if push mode queues to be enabled. Currenly we are allowing + * only one queue per thread. + */ + if (getenv("DPAA_PUSH_QUEUES_NUMBER")) { + dpaa_push_mode_max_queue = + atoi(getenv("DPAA_PUSH_QUEUES_NUMBER")); + if (dpaa_push_mode_max_queue > DPAA_MAX_PUSH_MODE_QUEUE) + dpaa_push_mode_max_queue = DPAA_MAX_PUSH_MODE_QUEUE; + } + is_global_init = 1; } From patchwork Wed Jul 4 09:43:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 42217 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 A52B61BF48; Wed, 4 Jul 2018 11:45:54 +0200 (CEST) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30080.outbound.protection.outlook.com [40.107.3.80]) by dpdk.org (Postfix) with ESMTP id AAC3A1BE8D for ; Wed, 4 Jul 2018 11:45:42 +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=0YtF83KgByhMY/IEZFPvhgB/j/fuWdyVCEqLQecEEtg=; b=lPN5Y9ahaQYTWnK+cDoKNWAUjGXc1F5i6WKGQBhAw+aKYnDeTxB2v9KgwGnf7a/cWYUSE0bHS86Zhj9B+KKobTmXCu1uuacGWIeG5oEuZzIw8nu7zEIlnunN8isNgCTQKbHFTj8aOLZxiYVtRa3qcJyIVuXb/cYsOBewDaQiUws= 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 DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.25; Wed, 4 Jul 2018 09:45:40 +0000 From: Hemant Agrawal To: dev@dpdk.org Date: Wed, 4 Jul 2018 15:13:50 +0530 Message-Id: <1530697431-1244-15-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> References: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0008.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::18) To DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1043ac77-1aac-4a5e-1f9e-08d5e192e7e0 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:DB4PR04MB0765; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 3:akKUe1wkTMgPFOAUDrP0eAvZivWJY0CcWMnHEoNXHtoL2WnM3lKmuqqekEeH2IGmpBFD9kIiAerA42rzWiczCNo+vCYSTJNWOy8Mti2oUGbyzEykxF0ZTLdE0O2gUyIpQhR6XWIK3OYGSt4QyalonKMvqr6zCACay51tyGpIuxFG5B8S0B5a1RlXqfVX7eKKu/cTqodD3w81mYUbOfUxglPaTvpp/550Q+m9Zn6yaffAaWB+m1gz9jHFyje+HnVU; 25:BiFAOsnp2RAXZKSKSnPgAry7wvYxXRTV0m57oiIkD4FaZVju57e8WULRhv6E/9DwrKhRHXDdzhv/vAmbTE29GeECXqKoy5CvYV1/odR4Vm+SZlvvm8ZYGN7FW9OEFmLdZob0GEIuNgg+DrLLQz1pJx8t3lHGlbbr4n8LN6wgLuyHpNhkX06RitVl8TOfamz8VXvJJJYix8Z8E+47aatYi/aU/Uup75+KzMJivkqYMh0PQOoWA3i3Slofg3perRFXZg+Fm+fCvN84A9+i+SQhL1dNi6EXFoXc1os16Yuuf2qbM7/Hi9D8imuqTlpGQvf33WAe0ZeQKn9QbsyCtpAjow==; 31:nV037SIm/sLzDtfTOVZLJp09DPjJDtpG7KRHAcYfzjwgUkDR6VXKFiAroAa+A5paXUfVazGsDyh/t4lrfTWwiNsak50MZZIclcTICZ/J57rAyYFjQZjXnJTnUBTy0+CXTZQAmxPxBemoOUkGvPkS1HtBO1S0gPwmEeK5pBx4fJhzzzPJP28oGT1AbOZp888nirpcUEPJugftYRYUmTKrbHayKKVikcXcuDmaEe4YgE8= X-MS-TrafficTypeDiagnostic: DB4PR04MB0765: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 20:i2IPI30UUClyYE9b/feWPJoujvIInX09H22TNJtUGWiVUKy5gGN7hq/Oskzw+d1FEODoAgUm2gK4Swah3vZJHv2W6sFVpJod3rjYqG4iWbxcuPikpPENiNGHXTgj9+5bhh4j/RxJ8f0Qjl0EHEexIOWOloFXh2claaUHJT8UGdObhg7k5/zZV9oxB72KEY8SE4syMFe4vdmFPjTO41cswVLwaCwMFLFJV5f0nZSD5KVAeV1GL5PxWQviw0qeomLkoPQMazRkoxt4TNRVzj8xHbFFoko8D3QfxXN/4zYy/3M0LLvJpNTfD/fGl0KWyWnsD4pykpVLvBNYo7b/3fi6iprDotnct9F3SLWpLeCsAObkEkHPTZHFAU7V9uqWGNIJn0/TBumkZ0iotx8ydUpIqZz2Us4IOe+YER89QJmlUEjXF0CQdKVsG2kRkMSwS0/opixvVjYhYC96NwayDKkO5CEyh7O8whOBRis0X4JU1psJiTQc3MBysmi7bsQudnMa; 4:jTkG3heYK2OYcLPDJH+leWzBtPBC+Bn5sMLNfOMn1R/+wCznybQohr9nt6pzROzQ6ghdBBXCjVFwzTt07ywqmI6SYy2qlFQf0OE28r0tGfaUG8qdIHVWLwBTWik6JqNJR9FTyz6ABVdtrXJW0o/78ffu05qTXftE4uxatio/QAZVxyOqW03yQHqc5ybXQkbD9Hog7SzudD452HnkK4ips3zWl022X8yRthOBSxAnvQiQ0MGz/gU0iM9WWG0GTjkBFgdsPAZjGs2pHM8XjoPx6eZ5Gt7D+j0HFcInD6DNuVoOMvT/FXxeR+ItPoNV4K57 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)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:DB4PR04MB0765; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0765; X-Forefront-PRVS: 0723A02764 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(396003)(39860400002)(376002)(136003)(346002)(366004)(199004)(189003)(6512007)(11346002)(476003)(386003)(6506007)(55236004)(956004)(2616005)(5660300001)(44832011)(105586002)(575784001)(68736007)(16526019)(53936002)(446003)(50226002)(316002)(6666003)(5009440100003)(36756003)(16586007)(2351001)(6916009)(106356001)(14444005)(186003)(86362001)(26005)(6486002)(97736004)(305945005)(81166006)(7736002)(8936002)(66066001)(8676002)(478600001)(25786009)(51416003)(486006)(76176011)(3846002)(6116002)(81156014)(48376002)(50466002)(52116002)(2906002)(47776003)(2361001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0765; 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; DB4PR04MB0765; 23:IRpJRPB0j7AGO9VwfRTds7C8Nrl0rlDJcHg1+snw4?= w+TUuvctqeTfG5XaDvz1LphZzey84hXuAFpr601YuNvoaPe6j+fOPCaOkNa5HlJMGOE2MM0B3A/mhpFX+oOuOmP0e78XAovkO416hyCGc+m4sa3e78ivGZcpe4YRgnAi71NwHYs+80AhjNLvrmdve40Tz0/8jvWK7B2mhRf7dBwiiceejnY9Nt4N2cUzVUfU5MQVmADjTgx8bCgyAz98a1elivgkLqiSc9j81tavaNJ3nUT4PydtGQrG1erhRjc0fKnFSPgsqfW2yQrBYh+xW06//YfhalA8xGFa3Y9Q4JB9hbe7CZL+ZRoFpYMPZS9IaCY6HBAf9Rc+b/ziApgFxmv/vli/n4xBvq+1oKAb3I2Hxoc8bUrxMmAAzTHazrn7hqJB91GfMpIZFr801MsRukuCM/VwLdYjszXSONVbsuNWg+CU2XXCUJpWiNpH208UWxgg2cy9yV2wUs2eX6Rmkt/or0qocebC280tcDoxoviXaZfU11riK+LO2/dtviK28bw+v2qcTaBw59Hgq8sHgOCxq+VvtJC12Ivr1cGbXBUZzzBOC5uwvuVT/1AfUoNV7NxnZKHMPgS3NpVBoqdMQUKTJef4ka43OFRwjY4adcrrvmkcxHrA640fvnbOdlzP0d6tVP6VJJnRwzyg4NHyqMrKnNvawsheyu90/P/mwYiRvgeQ2bN/BrvEud9odO741aK1tqzr75Y3ly5IqWfdjuSX/xSHqsMnvfTNFqhKuir65Pdj9FCGWR4Hqi6Kks6fNXh6RljHt5h1wbiR7FTMNdx+QxuHVqUP75AskCvHx9Cq/S7cZxhHIdc3SnWrS9PbUwC9JC2eZD/nX5RZV3QcUfxH7v1ykeTczip7BHU+Kskw4D0xLQoZP3BsrkQAMU0LQvWmULncNaLaRVKwwTPY+uM9tqPK7M2D9GkrhxMde3tNcyKncNArGDqIIrbN9AYAdZPb1t/QLP1vaIWJQe4OlnUb2CcoXhC9QE7lEfFxqJ0fHWBZC200g29sFqKZTScV72fgwP/9K3q6B/kIl/pJvdkzZNY5ZqNMTwnimmsJd1pXIromI2cc91F1HJ/FjYl0pYi8E30EGWq7CrGitOaFEFddirwUtc8vMcBMotjuS9PSJ40T8CNwo7BacuN+55vGYHEwoJ18N4jfhFn3WDuugvtt5GgQxO/Ak2ncNbwGWvZT06qlrxdJQft7fU48Gh6JpJvwLaM0hRu4VlAtzr3v3ZjclAv0j5/Swij04mPbemgLAOY86wqWKf2qfbcS4nb5uNHDnLNlfgY1GU09QN/pKlqmy+0StprAD1+LgKszi5jqg== X-Microsoft-Antispam-Message-Info: U8wMzhQtOSRqsKkJ3/7qQyu+fJyDskIGDodmLzax49GpSmOqjStCRkxLSNhmXXVAC6aCamWbHI2GDFmCS2rt24gF0Rog4DTWpnm1AEbft+AEjsz5vL2nrNZ2OaQSmQxU1pwuyskpRW6KQRnPWItqg1Dv7gbR7eBSAHzZPyrNcw/anHhTTkk9cCm2D6FHoDfLxsP5NJbjc6amzgzSkH2fqolj2N0SdokEGJsP1kq+RWyBn0cZDSHvudbK2o+jAzWWxadTHaiFbW0dTqFi/FA18048Xezw2iVJNaLfkHwDTzkskPcVJxeW+MLLRIOU1v2XwhSLniM8ZfMKCoM9F6H+3AzwYMdHEQeEVi2qBnwVrQE= X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 6:cLZteYg6mOO2+W7LzYa564lA/xHlyVbXed+pq3frIk4KJVSAQj9XXzDoQoP/+aJ40Q5D/F93U7Tl61Yg24oXSMG8BWWnQYJde1jZgrbgv7rCvBbLwLyV+hl0kXa10gkhe+XSoSBId+tUEg/orZ5sA0s3W7BoIsHoDUxuYwQZtfgJ00g4a6DdyIaxHFHEU3Zn/+Lif6MrvNVgJtGQtZ52Bnb2YNz1uVPEpOqR2ytpXpWlJkaDpTXy5ShSYMb1I0KWkxdyRuyGJDjGj+AYvIWUGvDZcaYf+FAn7+uJyzU6o0Zh4HmDGBuhZ6t2gJ1lFP0I/jg9kLYVfmAVVIpDa+ruTkBc7Hw56nFha/m30SU0IaSMbiSmkU/IGwUFDQWaKdVtxoGIs+PPvN+2go75z3Ml8ZyLB/p4ZwBVjLAZtZvo5r7ANMchKugfEL2TyaPzclr6ghZXIU7p/9+wdTTvBVB70Q==; 5:u2QVL79+XeBvxGXyYNTMVNujWP9+ZFBK03knCLTYnsJBuzAWokBQ1UUPbTuQtiksdOXsXYd/aHptw5iUmIOayz0ANXHJRD/w4SGRqtmHBMX+aagiMhKt3uTWAa2y81SauPkum/KD/vnfQnrswZZQecTB8QJf5uZNwvglF4fl9oQ=; 24:XCuNRzc9rDwA21ndCQrX+9uLP1JWKxo3s7gszm9ynia2pDQwZdnM4rG8GPwEsXBpiDQRER9x8NlR60Fi21aw4snhI4AqYeIJGDaykLnsZ7Q= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 7:ZtDctobWtN7ODfH9AUPxL5JV5w8MQtE2qTml8C8wTKrKFxuBEfv0NJEntgo9yulSuCzNmiAjPWjS8EWzMd3XZh8FEVCSAebPA2Xl/Kt6aiRI4AZ1yDXZS6fRXYszPmNd4eowXLkUNCMFwEOc/N00kV5BwY2bXF3wyMwzP/Y3zDhFuyX1dd+9E0C8Lp/jEo9X8lHgnqwxq8rAlzOZcLQ8CYU4lJiAn9rYfWwBj1RxWsQAvo/fs2PoKM6efrEjnt9T X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2018 09:45:40.9989 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1043ac77-1aac-4a5e-1f9e-08d5e192e7e0 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0765 Subject: [dpdk-dev] [PATCH v2 15/16] bus/dpaa: add support for SG config 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/bus/dpaa/base/fman/fman_hw.c | 42 +++++++++++++++++++++++++++++++ drivers/bus/dpaa/include/fsl_fman.h | 6 +++++ drivers/bus/dpaa/rte_bus_dpaa_version.map | 2 ++ 3 files changed, 50 insertions(+) diff --git a/drivers/bus/dpaa/base/fman/fman_hw.c b/drivers/bus/dpaa/base/fman/fman_hw.c index 7ada7fa..4ebbc3d 100644 --- a/drivers/bus/dpaa/base/fman/fman_hw.c +++ b/drivers/bus/dpaa/base/fman/fman_hw.c @@ -16,6 +16,7 @@ #include #include +#define FMAN_SP_SG_DISABLE 0x80000000 #define FMAN_SP_EXT_BUF_MARG_START_SHIFT 16 /* Instantiate the global variable that the inline CRC64 implementation (in @@ -538,6 +539,47 @@ fman_if_get_maxfrm(struct fman_if *fm_if) return (in_be32(reg_maxfrm) | 0x0000FFFF); } +/* MSB in fmbm_rebm register + * 0 - If BMI cannot store the frame in a single buffer it may select a buffer + * of smaller size and store the frame in scatter gather (S/G) buffers + * 1 - Scatter gather format is not enabled for frame storage. If BMI cannot + * store the frame in a single buffer, the frame is discarded. + */ + +int +fman_if_get_sg_enable(struct fman_if *fm_if) +{ + u32 fmbm_rebm; + + struct __fman_if *__if = container_of(fm_if, struct __fman_if, __if); + + assert(fman_ccsr_map_fd != -1); + + fmbm_rebm = in_be32(&((struct rx_bmi_regs *)__if->bmi_map)->fmbm_rebm); + + return (fmbm_rebm & FMAN_SP_SG_DISABLE) ? 0 : 1; +} + +void +fman_if_set_sg(struct fman_if *fm_if, int enable) +{ + struct __fman_if *__if = container_of(fm_if, struct __fman_if, __if); + unsigned int *fmbm_rebm; + int val; + int fmbm_mask = FMAN_SP_SG_DISABLE; + + if (enable) + val = 0; + else + val = FMAN_SP_SG_DISABLE; + + assert(fman_ccsr_map_fd != -1); + + fmbm_rebm = &((struct rx_bmi_regs *)__if->bmi_map)->fmbm_rebm; + + out_be32(fmbm_rebm, (in_be32(fmbm_rebm) & ~fmbm_mask) | val); +} + void fman_if_set_dnia(struct fman_if *fm_if, uint32_t nia) { diff --git a/drivers/bus/dpaa/include/fsl_fman.h b/drivers/bus/dpaa/include/fsl_fman.h index c0ef1bf..1d1ce86 100644 --- a/drivers/bus/dpaa/include/fsl_fman.h +++ b/drivers/bus/dpaa/include/fsl_fman.h @@ -108,6 +108,12 @@ int fman_if_get_fdoff(struct fman_if *fm_if); /* Set interface fd->offset value */ void fman_if_set_fdoff(struct fman_if *fm_if, uint32_t fd_offset); +/* Get interface SG enable status value */ +int fman_if_get_sg_enable(struct fman_if *fm_if); + +/* Set interface SG support mode */ +void fman_if_set_sg(struct fman_if *fm_if, int enable); + /* Get interface Max Frame length (MTU) */ uint16_t fman_if_get_maxfrm(struct fman_if *fm_if); diff --git a/drivers/bus/dpaa/rte_bus_dpaa_version.map b/drivers/bus/dpaa/rte_bus_dpaa_version.map index e00c911..fcfbb47 100644 --- a/drivers/bus/dpaa/rte_bus_dpaa_version.map +++ b/drivers/bus/dpaa/rte_bus_dpaa_version.map @@ -70,6 +70,8 @@ DPDK_18.02 { dpaa_logtype_eventdev; dpaa_svr_family; + fman_if_get_sg_enable; + fman_if_set_sg; per_lcore_dpaa_io; per_lcore_held_bufs; qm_channel_pool1; From patchwork Wed Jul 4 09:43:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 42218 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 E0C121BF4E; Wed, 4 Jul 2018 11:45:55 +0200 (CEST) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30067.outbound.protection.outlook.com [40.107.3.67]) by dpdk.org (Postfix) with ESMTP id DD3301BE8D for ; Wed, 4 Jul 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=knsbvMTCuA0ZS5MYChTXetVDL9hzN5trC0SDaJ3lhBA=; b=qFX8VhRHjgDFRoZk4K3kFIw9Occ+IYa6R0qpx7Ro/V0+149SY1f6usaV2lGumHMJzq97KeCq7nT0yjb8mbDOZXzBdtM8lujkfTDQc3QvFhKzjoeHqrhkvHctdid5esq+M6g56F7Jxi/e3dZaPpgYeKFte3Ini0fySZBHOSkWow0= 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 DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.25; Wed, 4 Jul 2018 09:45:41 +0000 From: Hemant Agrawal To: dev@dpdk.org Date: Wed, 4 Jul 2018 15:13:51 +0530 Message-Id: <1530697431-1244-16-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> References: <1529574244-18997-1-git-send-email-hemant.agrawal@nxp.com> <1530697431-1244-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0008.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::18) To DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 94f6368f-e512-4b50-7eab-08d5e192e85d X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:DB4PR04MB0765; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 3:FsU1lM8Syv3xv+4Cb9MpIAihuX6yLdMlMXjfp6/6nJlpZ08Y3Pf2pa274zQAjkTc6xlS99AWIVPO8qP0Y8+Xvi/n9mTSQSU1gAZelcJGmXUlMY1x4PMYLjt0cwxKVGazAdhCgp2uzF8krSBvcvyOIqUavfqMQo5TZNUWFs0Iu5ID/N6ZRTSirEROd+egdy7eOPl4zeZbMnq7ibV2UoRlZr/GDAGt2iPMwCEomlDK7skreJLKoG8y6oF/1XX3dPE5; 25:cAkcNRN2Ah+1AmdlN30JF7M5edoEDSlimqxhF8VrNO9iV//EkEjqu0szQNMD+mTXhka4HASiyk6iKLgTK9ZbZcTi0ibzetmRL2WF0zX0mJQRDl2IRaSxIGbpJOvcFrdUAGamLuDkERb1skelrtW3m9dTc7Q31ax3qXRvgceyHmADgnhF2vvLPTbFZd0dgfiroQbOWv3zthbePvOx8wrB4xZOzpwP/QJ53PiqiuDwz0z4ZUaqHta26gZueTUIfZjPlNmflNVmAb96esy6xB5pTn8KHX8HcWq9QqnQ4DL8ezSpR03oSSBi1E10QfpsJVFYsHb8r3s3evh1zY6Uyzba+w==; 31:QM6g23huWlTVTpzxDGKuMdwvk1hBu4TQTvI7VcY5bjW2hvqGs7LR2qilero5ZBxXD3HwYfHeWe/A5ot0/E0cgphdiOqL1KQwJAi8LJ0PLYoDEOwRuSiopLX9ePWu1mz5rW4rFnWVMIkpTSJ5bgDxAVvtUTxINaZTbl1LoPeg8xGyKJnKEVH5hJT94Y/igqDz7+6yjxJnH5hm3GcfxLE1XRpojmbEfrjIcNpNe1cXyaY= X-MS-TrafficTypeDiagnostic: DB4PR04MB0765: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 20:BV0F0mLp4ok8ZkwWY1zj6ckgdO7aYCt0uCIcB3iNVnFu+ap7MdyTUJYNxI1XN2Vn6BIfgAsjR4dsDk7mPqJC7VbnHPaSVSjbc7sy5Ajewim7FdAaPA/OyoOdSVJaGKzMyXUqTPNwmG61NJ7TLdr/aSGajrNSkgIiPqTK1kvGTmae4281N2ADv+PBtFrYp3oCS6TeeqZLeB2uho6c9wM8gVYQTlJfs3Wl6tMNZJsZsEyFH7islrKS8dRLM0Omvbm4mA/fB29ke8DrRSviM1Ulumv0NSjGQixMrN4It3N9K4Cp1ioBgxVSnL4D9ya8t2QZFOZfwIVjYlh5MInH8lYyxWcDuuiVb38MJzdSPJ0gqQXbkixYHMFT3mjP6UEiKy/b0z4mC7YTAdYZobaDpHkwuK7PGXfrqQzuGzTj8+S98tYzWrEFppsn+cbupUBDdXGOHg9IzbrBaHdpgJRy9E55cEWAb5OfaA2yYmRM3rYNJBRyXMmDXewfCFSsDb2zVJWN; 4:bGwsiqGMbdwdRNpToJhEmEzhVb9UIgKVTtVyAZ7zrf4PIEIOm2HkeVa6JlA//ImiRAqP3/mHfwj70HyKmB2X8h4Ky30oB4i8bcQoBFilyUlpqa4N0WoK6Xy7I4n+6g/Q+eXzYql5NF4OfdSekP5c5Ey4mIf93F44bTQzdCyTzeMkU0vjgblKiY+RkdSYNF0sDMKbQYwEe+yi7LjKmT6246fZ0P7qQZBfJZgYxGuLO87pMkCozn1nCguewJPuGASBA1di7feeP9Ueu8LpAThZT/KB+4nvve6jnr4y2FD+klLyo58DWI6ttvLdQx/T6SaN 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)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:DB4PR04MB0765; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0765; X-Forefront-PRVS: 0723A02764 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(396003)(39860400002)(376002)(136003)(346002)(366004)(199004)(189003)(6512007)(11346002)(476003)(386003)(6506007)(55236004)(956004)(2616005)(5660300001)(44832011)(105586002)(575784001)(68736007)(16526019)(53936002)(446003)(50226002)(316002)(6666003)(5009440100003)(36756003)(16586007)(2351001)(6916009)(106356001)(14444005)(186003)(86362001)(26005)(6486002)(97736004)(305945005)(81166006)(7736002)(8936002)(66066001)(8676002)(478600001)(25786009)(51416003)(486006)(76176011)(3846002)(6116002)(81156014)(48376002)(50466002)(52116002)(2906002)(47776003)(2361001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0765; 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; DB4PR04MB0765; 23:R7+XjrVHoXfxzN4vj9fseGpmmp0L7T34+QZq61py0?= 5Wi2qIUBlbZhvHsDPzqvy8Zsc5m2LFd84QdBnPXFKKF6C/CSp5YBjElYlfp21xEZ9CBeO0KOKAkGEoBW5gSc7641ZsrpnP703PEkjH7LtKazHHQ0PR81GDyLmclkIrWRY4kcoMoWy2dbDc0onfPxXjTYUKG8LdqXtHxrCpM0fN8w5Cs9KMbkhT8WguAguFx4dJMOFPX1uZcmJwdeT5EAg6gcxqBt3dblHgr6mPvYJzgQx6XOWH0Mq/L4msAQg8VePWZtvpL7neWlc6OkcAohG2UxVXnnkR8qX/kODQY2QUbNHqLy/W9lAtRbKguPblOjHvEbvpHUZNudU9RRz/xJesrA05GZyOiXudevDi/D1EGFAXT8S1gUAlxGDW0Jw0hspFF50/byG/wSDDF03ye4//9w0PqfIGn2MpniMZMQEW9fJDrlwJr9Odyh4gyHQLkNCCPy5tJ1CVEJXmc/i0BYalh/QtvrLVAFlpZktoqkShmPj4FZDguGwew39E51zyNkGPFUSCUO237MbER2vpJq38frvsRZxfQlMJAF92jn95sKIT66TrVQ9iC53nrIZS4brN5PXLyFbNQrqT36xLkFc1n5v16vBH9oiKeN68Y+lk8MzqHqjVd3OTQ50NXSilYvrd/cCUKl64sPk285pZ7aFszYeRyFSWsfN/ax638pb3BN6lwrRLpzEfemc29JEhZRwJ66Cde/MuZldhOSJYOJ2vzDh8u6TLaXxvQH59KAqgHP3JLhAA/GJ2iMG9Qlbt4BkgyxpP8+sGR9c5pUvHk1+OmlWSiT5eXZuQd+W2sjgFl/rCVbg3vBc409q9kax2EsjxS7NEct8ZxpWMpaFgB3e0wIZk/WPibwZsvXEpKi+mOzqucpnjpJcq5PDsUQa6mlU5hUZYOAKJgud72u4pDSntSIr9O4YMNXi4orqahqCzBRemy+gyhqNzm0WQnondmi1uawM0FKT/Bav7uprXys3GpP7Mdm+Lzu1KUR33Vi0pv0kWISpZiRZNdA3r3Kck5AKpEwznWwn5od2dQzMtgZ+6wwSX6nRtQwmWQzhQgLNKBHTf5D8DQbf+xhAj0R6oxnA4buJmEdua5uQtTiuPfIOFmNw/yNforsoEB7/EMwAoZ9lcnRiKjcZjdcfcqjQmH1CPnh8iEBkvioYEEYCswW+Hc6PV8oMK0dZvjE30dBrV7MfFtaVOPBnyJX8F7zYi7u/N3/Kt4jYEdBQQz7VuPQ5qLXTh7oz0nAwuKqFtPYfcpCem0hzTyE5+ns8cFmAaOjfXB2MX10OpuDWUmfDO4RxyPASXkGOaosSPYiwKAxlhKsg== X-Microsoft-Antispam-Message-Info: HGLhznvMuO71HAfeGnDdVUD3sBE60VHhzN4XGpxDM7S5fDYbQfIL9V64MoildFYSmHm1nEj/oWTieaMTx3oKMKpn48wzhAOFW2Y2Scw+1QvXbcFmwhWq9D1agLabmEyJrs47Kff2vW5NsyKMDSFJTjwiWWMXo9KUYeSy6fbg+myY2yXnt4h92K7czodqUXNBqTShaQU17H2NX5O7LvL4OB/AeDZeIAdiICMy5JCQaF5N3W5L9qrqv/72WE4TN/on1YWnJJ9VdCYsL4DMGVAydw9vQojLTzZrw4GUF6Hh2LGAbxvjQkCxR61ikUbUVAuSs9ll3Z5UJXg9VFy5IELOURQcUTpgGTJJX5EDUH+5T7M= X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 6:G+Nov0YVbHk/0lhnSnoJFynjQdKKN+sfE1bOox8zuOXL84K4Np5MEQIDqHYRq/8zrL5uV/DsnjsvJfcdqtVLZ3D/h1ExWP0r1qQsSbOVjIO+PfQBWQ/9Kq4FFBUFGiNX8SVBb+c6267kauGeNX+fzcxWc0f+fEh5nMsrnWCgEebwPk2Vr/1jg5XmDLcaF6Wc1KOAvmw8qEmekS3eMn1x4lamShizkqUsDnnYTQkQEDXzqEMcAtMvLytqIYleL9QgIuBbkHRRwZWSRLp2Hcjq3Hy7JilRV7KPYLBHbRLEqJqf4unLaGPJFYexjuabEXwW4pvDJoLby5gtdmtLiHE12QbKItRIBhBw76LoXcMijNGAnc3T9xTS4zuMU4fa7scNIbe7d695AXhlYwCWpnFTeJIOG6F6hAJlt6NTen+HE/BcpopdYjPjmD240e+PlXj/363FAlC2T2Rrl6BRRcGnfw==; 5:gdY7t0lL9cpPdhM+I8NRUS3HANTETJVDdsLpaMocbckcPDzAP8VAX11cPDq8h90ZXal9zfe7xM5EzRH0RIAJRMD9rmXuoorTouNaTb5qWZ+nRuNv1hFwu5DfgMkYL2854QtEVp5GpM27qQD7AXNBVehtG1ndUTmhxfDY4BQ7T74=; 24:gtjxshIMoAbHWN++0I9lN2fh0Se+pCjO7WnmSqjAcP16ovz6uji4l+es0AgPdKRTHtDIXMbVtKoomYspwInZ8w0o31xDJ3ze63wzidM3jwM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 7:4/yo8iGpi98cYjQH34CRR8oCMVBezXSpaoX3RpoC9uXKC0RBgg7hvTbCwZUxjTaoqCvt3q8m8lDKwlxWjGD7wnB2U7ENWe+Wa3JSFo6J7fpTGsethPsars7qsY9S86JWRvtcu/yEwlHNE7Jn0kPbC/aj5cUWikoNtmlTh43yMd2K0PVhdZ48g6ZJ5YQDMZuu0zQNI4Utd2AVbwb/8VeasGhaaNL2F0zPf55kdtZxEfeMZ5pEhJ/vWbtuC6nkDTVK X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2018 09:45:41.8165 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 94f6368f-e512-4b50-7eab-08d5e192e85d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0765 Subject: [dpdk-dev] [PATCH v2 16/16] net/dpaa: implement scatter offload support 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 Acked-by: Shreyansh Jain --- drivers/net/dpaa/dpaa_ethdev.c | 75 +++++++++++++++++++++++++++++++++++++----- drivers/net/dpaa/dpaa_ethdev.h | 3 +- drivers/net/dpaa/dpaa_rxtx.c | 4 +-- drivers/net/dpaa/dpaa_rxtx.h | 2 -- 4 files changed, 70 insertions(+), 14 deletions(-) diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index 5c0aafb..c49d3a5 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -47,7 +47,8 @@ /* Supported Rx offloads */ static uint64_t dev_rx_offloads_sup = - DEV_RX_OFFLOAD_JUMBO_FRAME; + DEV_RX_OFFLOAD_JUMBO_FRAME | + DEV_RX_OFFLOAD_SCATTER; /* Rx offloads which cannot be disabled */ static uint64_t dev_rx_offloads_nodis = @@ -55,8 +56,7 @@ static uint64_t dev_rx_offloads_nodis = DEV_RX_OFFLOAD_UDP_CKSUM | DEV_RX_OFFLOAD_TCP_CKSUM | DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM | - DEV_RX_OFFLOAD_CRC_STRIP | - DEV_RX_OFFLOAD_SCATTER; + DEV_RX_OFFLOAD_CRC_STRIP; /* Supported Tx offloads */ static uint64_t dev_tx_offloads_sup; @@ -148,11 +148,30 @@ dpaa_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) struct dpaa_if *dpaa_intf = dev->data->dev_private; uint32_t frame_size = mtu + ETHER_HDR_LEN + ETHER_CRC_LEN + VLAN_TAG_SIZE; + uint32_t buffsz = dev->data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM; PMD_INIT_FUNC_TRACE(); if (mtu < ETHER_MIN_MTU || frame_size > DPAA_MAX_RX_PKT_LEN) return -EINVAL; + /* + * Refuse mtu that requires the support of scattered packets + * when this feature has not been enabled before. + */ + if (dev->data->min_rx_buf_size && + !dev->data->scattered_rx && frame_size > buffsz) { + DPAA_PMD_ERR("SG not enabled, will not fit in one buffer"); + return -EINVAL; + } + + /* check * >= max_frame */ + if (dev->data->min_rx_buf_size && dev->data->scattered_rx && + (frame_size > buffsz * DPAA_SGT_MAX_ENTRIES)) { + DPAA_PMD_ERR("Too big to fit for Max SG list %d", + buffsz * DPAA_SGT_MAX_ENTRIES); + return -EINVAL; + } + if (frame_size > ETHER_MAX_LEN) dev->data->dev_conf.rxmode.offloads &= DEV_RX_OFFLOAD_JUMBO_FRAME; @@ -196,13 +215,24 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev) if (rx_offloads & DEV_RX_OFFLOAD_JUMBO_FRAME) { if (dev->data->dev_conf.rxmode.max_rx_pkt_len <= DPAA_MAX_RX_PKT_LEN) { + DPAA_PMD_DEBUG("enabling jumbo"); fman_if_set_maxfrm(dpaa_intf->fif, dev->data->dev_conf.rxmode.max_rx_pkt_len); - return 0; + dev->data->mtu = + dev->data->dev_conf.rxmode.max_rx_pkt_len - + ETHER_HDR_LEN - ETHER_CRC_LEN - VLAN_TAG_SIZE; } else { - return -1; + DPAA_PMD_ERR("enabling jumbo err conf max len=%d " + "supported is %d", + dev->data->dev_conf.rxmode.max_rx_pkt_len, + DPAA_MAX_RX_PKT_LEN); } } + if (rx_offloads & DEV_RX_OFFLOAD_JUMBO_FRAME) { + DPAA_PMD_DEBUG("enabling scatter mode"); + fman_if_set_sg(dpaa_intf->fif, 1); + dev->data->scattered_rx = 1; + } return 0; } @@ -300,7 +330,6 @@ static void dpaa_eth_dev_info(struct rte_eth_dev *dev, dev_info->max_rx_queues = dpaa_intf->nb_rx_queues; dev_info->max_tx_queues = dpaa_intf->nb_tx_queues; - dev_info->min_rx_bufsize = DPAA_MIN_RX_BUF_SIZE; dev_info->max_rx_pktlen = DPAA_MAX_RX_PKT_LEN; dev_info->max_mac_addrs = DPAA_MAX_MAC_FILTER; dev_info->max_hash_mac_addrs = 0; @@ -514,6 +543,7 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, struct qm_mcc_initfq opts = {0}; u32 flags = 0; int ret; + u32 buffsz = rte_pktmbuf_data_room_size(mp) - RTE_PKTMBUF_HEADROOM; PMD_INIT_FUNC_TRACE(); @@ -527,6 +557,27 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, DPAA_PMD_INFO("Rx queue setup for queue index: %d fq_id (0x%x)", queue_idx, rxq->fqid); + /* Max packet can fit in single buffer */ + if (dev->data->dev_conf.rxmode.max_rx_pkt_len <= buffsz) { + ; + } else if (dev->data->dev_conf.rxmode.enable_scatter) { + if (dev->data->dev_conf.rxmode.max_rx_pkt_len > + buffsz * DPAA_SGT_MAX_ENTRIES) { + DPAA_PMD_ERR("max RxPkt size %d too big to fit " + "MaxSGlist %d", + dev->data->dev_conf.rxmode.max_rx_pkt_len, + buffsz * DPAA_SGT_MAX_ENTRIES); + rte_errno = EOVERFLOW; + return -rte_errno; + } + } else { + DPAA_PMD_WARN("The requested maximum Rx packet size (%u) is" + " larger than a single mbuf (%u) and scattered" + " mode has not been requested", + dev->data->dev_conf.rxmode.max_rx_pkt_len, + buffsz - RTE_PKTMBUF_HEADROOM); + } + if (!dpaa_intf->bp_info || dpaa_intf->bp_info->mp != mp) { struct fman_if_ic_params icp; uint32_t fd_offset; @@ -553,10 +604,13 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, fman_if_set_bp(dpaa_intf->fif, mp->size, dpaa_intf->bp_info->bpid, bp_size); dpaa_intf->valid = 1; - DPAA_PMD_INFO("if =%s - fd_offset = %d offset = %d", - dpaa_intf->name, fd_offset, - fman_if_get_fdoff(dpaa_intf->fif)); + DPAA_PMD_DEBUG("if:%s fd_offset = %d offset = %d", + dpaa_intf->name, fd_offset, + fman_if_get_fdoff(dpaa_intf->fif)); } + DPAA_PMD_DEBUG("if:%s sg_on = %d, max_frm =%d", dpaa_intf->name, + fman_if_get_sg_enable(dpaa_intf->fif), + dev->data->dev_conf.rxmode.max_rx_pkt_len); /* checking if push mode only, no error check for now */ if (dpaa_push_mode_max_queue > dpaa_push_queue_idx) { dpaa_push_queue_idx++; @@ -1304,6 +1358,9 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev) fman_if_reset_mcast_filter_table(fman_intf); /* Reset interface statistics */ fman_if_stats_reset(fman_intf); + /* Disable SG by default */ + fman_if_set_sg(fman_intf, 0); + fman_if_set_maxfrm(fman_intf, ETHER_MAX_LEN + VLAN_TAG_SIZE); return 0; diff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h index c79b9f8..1e7a656 100644 --- a/drivers/net/dpaa/dpaa_ethdev.h +++ b/drivers/net/dpaa/dpaa_ethdev.h @@ -39,9 +39,10 @@ /* Alignment to use for cpu-local structs to avoid coherency problems. */ #define MAX_CACHELINE 64 -#define DPAA_MIN_RX_BUF_SIZE 512 #define DPAA_MAX_RX_PKT_LEN 10240 +#define DPAA_SGT_MAX_ENTRIES 16 /* maximum number of entries in SG Table */ + /* RX queue tail drop threshold (CGR Based) in frame count */ #define CGR_RX_PERFQ_THRESH 256 diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c index 168b77e..6e96a80 100644 --- a/drivers/net/dpaa/dpaa_rxtx.c +++ b/drivers/net/dpaa/dpaa_rxtx.c @@ -306,8 +306,6 @@ dpaa_eth_sg_to_mbuf(const struct qm_fd *fd, uint32_t ifid) int i = 0; uint8_t fd_offset = fd->offset; - DPAA_DP_LOG(DEBUG, "Received an SG frame"); - vaddr = DPAA_MEMPOOL_PTOV(bp_info, qm_fd_addr(fd)); if (!vaddr) { DPAA_PMD_ERR("unable to convert physical address"); @@ -349,6 +347,8 @@ dpaa_eth_sg_to_mbuf(const struct qm_fd *fd, uint32_t ifid) } prev_seg = cur_seg; } + DPAA_DP_LOG(DEBUG, "Received an SG frame len =%d, num_sg =%d", + first_seg->pkt_len, first_seg->nb_segs); dpaa_eth_packet_info(first_seg, vaddr); rte_pktmbuf_free_seg(temp); diff --git a/drivers/net/dpaa/dpaa_rxtx.h b/drivers/net/dpaa/dpaa_rxtx.h index d3e6351..6de70a7 100644 --- a/drivers/net/dpaa/dpaa_rxtx.h +++ b/drivers/net/dpaa/dpaa_rxtx.h @@ -32,8 +32,6 @@ /* L4 Type field: TCP */ #define DPAA_L4_PARSE_RESULT_TCP 0x20 -#define DPAA_SGT_MAX_ENTRIES 16 /* maximum number of entries in SG Table */ - #define DPAA_MAX_DEQUEUE_NUM_FRAMES 63 /**