From patchwork Mon May 22 09:39:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 24428 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 6BFC737AF; Mon, 22 May 2017 11:40:02 +0200 (CEST) Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0080.outbound.protection.outlook.com [104.47.41.80]) by dpdk.org (Postfix) with ESMTP id 3AC343790 for ; Mon, 22 May 2017 11:39:56 +0200 (CEST) Received: from DM2PR03CA0022.namprd03.prod.outlook.com (2a01:111:e400:2428::21) by BL2PR03MB161.namprd03.prod.outlook.com (2a01:111:e400:c0d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1101.14; Mon, 22 May 2017 09:39:54 +0000 Received: from BL2FFO11FD023.protection.gbl (2a01:111:f400:7c09::107) by DM2PR03CA0022.outlook.office365.com (2a01:111:e400:2428::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1101.14 via Frontend Transport; Mon, 22 May 2017 09:39:54 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD023.mail.protection.outlook.com (10.173.161.102) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1075.5 via Frontend Transport; Mon, 22 May 2017 09:39:54 +0000 Received: from bf-netperf1.ap.freescale.net (bf-netperf1.ap.freescale.net [10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v4M9dk3w031538; Mon, 22 May 2017 02:39:52 -0700 From: Hemant Agrawal To: CC: , Date: Mon, 22 May 2017 15:09:12 +0530 Message-ID: <1495445969-29199-4-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1495445969-29199-1-git-send-email-hemant.agrawal@nxp.com> References: <1494851864-26029-1-git-send-email-hemant.agrawal@nxp.com> <1495445969-29199-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131399195943377522; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39380400002)(39410400002)(39860400002)(39850400002)(39400400002)(39450400003)(39840400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(9170700003)(5003940100001)(5660300001)(53936002)(104016004)(76176999)(50986999)(50466002)(498600001)(106466001)(356003)(48376002)(38730400002)(110136004)(105606002)(33646002)(6916009)(2950100002)(8676002)(4326008)(50226002)(8936002)(81166006)(77096006)(2906002)(305945005)(54906002)(36756003)(85426001)(6666003)(8656002)(47776003)(86362001)(2351001)(189998001); DIR:OUT; SFP:1101; SCL:1; SRVR:BL2PR03MB161; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD023; 1:5P/5r0rl301Mbl9Nh/WHpZyaAW3shZsp+aR26t9m+yz+zCjm/r3BQVR1Fu4Y5TMeiOra9gINaa8TdMRwA0krAarxfMt/KdzUSZJbEs1atH7OqpId9JKI9ce1kLNMmg7sPRts3RqrStvPF2iz6uxmx/kbhDWdkIIlo7AeKDgIHH3HyutLMpA5OBykQ1OfCZmPojy6+uEfURSa/w/tGz4YOnCAWNP7Wy3ggcZ6UiSdoQmeoez+Dc9FcDvUN6S8gLuF5iEejJVXRGhdSHVjNF0nqF4fN0tBSiz8rdu2PL3d0aNFE7bwCHDUh81JKKBG0IzRMwhwR62ixqR8c9pEL/JfujOjXoPqUsYvly9rCrjkPZA2M4gqNKX7a06nj0BQaH9gU7Dp2CGVUkUcbDR1efqHXHAWqIgksVmdW3sA3XEGyHFsnvgtFI93SbuFt3MaEW3Wur4RANzHeswt39RzP+mDd9DdGrDmy39edqcD2deQ0sC/MgGfWyFRTbCHdwlABhGWPDK9bz3HEgC1IeuvByIrJVYSiTWhtNLwQ93WKrI+XPhr6NYjxouV2dnKLb4mDKz40mMJ++OQE1Jhsn9vO1ZK0MpPZ21GTKppqY2UQJlYYB1bb/FjqMy5/ClLtx1sd5qumzjJ6QAJCqeGmJTKBZfVTJbx2299dxJ9JRnd7dd5FyCer4noCNwqEbpC+OFlXgmGEJ9IKKoGwyNON9xtozBKTSv8e1EOLhGeOaIZtsls9xGcv4dk2ru3v6QdK6mWBEV/7bjEnWKfZR8p7RrIBkeTuQ== MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL2PR03MB161: X-MS-Office365-Filtering-Correlation-Id: 8902edf9-95b6-418c-1a72-08d4a0f68071 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131430075)(201703131517081); SRVR:BL2PR03MB161; X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB161; 3:/qT0ZhrYJWTgjwObvCxfnPW6J2uPsLIChuPeWrviwPnOFtGxT4+If1l65qS2LGBa6JXVtED3LQWhrcPED5mjdlKY2HsmBUZjUzoSOcXC/RRaZS9JaGVyHE/Myc3WJyTHNhQFF2qTUcB4cpBRE3iACBAWn0BO2JprF9rfNm6hOB7qIHWfVIoaRT68F3t2rD3iyq/kkAf4YIesO+ktd1syoy1uN4C5cZqwVvnm7Z0ZCaRAVCSRmbJfxYFHsFTPoP/sbgJeNGpZDqjW5voqNHirYV5+7astH+zNCBh5wm0Innzo8GlRCajJyQigBO7Bl737/bZwzVp7ntRUqTNrSZvHhLoZiuM4bTVmcpAnwawXoL5IgjAy+nkQVmAIGB4N4OkSBX6UJKQDHNQW86lj4C/abSomGpsvaLlqzQ7vXYeKfCQ5BD0qei/Uxi3NRrGnzvaZ; 25:PTjdMkvWf2z5vu7ULIVlGTNNNsw6DdziBt1x13mAnFz4blZLymHHeIQC3fcn3W7hYFYNnujPYZEBNaNncLLzD0rrmpZN073lfLE6I3RgyxTZopphFtr1UMCBOARCxIoQgZF+EvSbk1jtzwW+LA048Vl454gz630Jx4le1HkRigVNzgx38Scqpwkguzcy3yIM0hhz0589voL4rk0kFmywcjxmE4AVQiGt8UtA2GPKSTrKghpSPdhdiLa+rrJQ5hqbLK3ba/XUeilZx7FAJ/wwGCRJUatr6mSof1XiXri3bJ/ZpI54jpZvVKq0kOJCVW/g2undWNkprTRd6PQ3Q4HERFgQXetCRSonGsdJCVI/5xc8KJCgN3qY+vVCJkwQzm2yYSREkhSj7vXpcpuCigEubIk+LnP35ZvXLwA+S5AQGiKJFutq82mNI67HYUhWLvqq4eZJNNRtt6cgGKtd/6Db6iCRLB99NCzZV80b81gmuu0= X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB161; 31:1LczBxoZ5EgC6ZdwfStZkjCybl+RFK79PC/xyQCWa5FaLsDG7ixrWljnLs1mqtA70MIbVaNJqDHeg9tttcp0nlZ08YC+n3KuZSASyLaUPK1vgmD1wo6GwaNJkypLGPIMPk0kdwoyKFdZ13CtU5ieAzS8oqX7UzaB0d6kFtU1yRMZl27rLQgVJxo/xHXm7/c2K8Pvao6ZrHLobo+7a5gTFtpljAhN6LICyWi96vTw9vu2gboKE8+j0h0lgAU0PusZYalt9YiLdXyNa0dUaJ07ZQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(601004)(2401047)(13023025)(8121501046)(13024025)(13015025)(13017025)(13018025)(5005006)(93006095)(93001095)(10201501046)(3002001)(6055026)(6096035)(20161123559100)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(20161123556025)(20161123565025)(20161123561025)(20161123563025); SRVR:BL2PR03MB161; BCL:0; PCL:0; RULEID:(400006); SRVR:BL2PR03MB161; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BL2PR03MB161; 4:p7ajZl2v0tevjtkZkwvLl7fdv42cSCVtRp1SUII9lcP?= F4n5YGnF7QO4L6rKUt6Gl005pe4zZBLBbLZDOiq530YU7ffOvDPYPMtVmyeU8XuKt53upbXKWQrfqsLJ/p7L2DAKfsFbZyo2y8N4PsN7PCPulbjes68bRXPTVETrVj58L7xyGEfM6aaMRm80nG7LDb0aE5ZzMeQjtbcazCGyNIMghKimNUVN8Ibgk4wayDXk9GU5v57NHsa2+rtgP14cZrz77NwrPR65w7dzYPLYLARRxcgljCV7T24e/TSIcewG3S6xoH+G0SOQzwUOABYWgqoZzBXT+0NVR/Z617UQje1OY8sPPXXyEkZnTPSvrCAy6z3hzhn5eqcPrDUpTt5N13NcradUh/YtU9z8N6XvnRKiGKusgaD8rderMm9vq7qwTFxMEucOTlNoS0OIF/jD3+H4OXnFu2E2BUywgmtndYS7piy3m0tkSoFKYeWhPRm+zjrTYBfgD4Nfh1UkMzYsTy3lnN5nCvswI2oUXi0phYFOyiIKUdtTT0Brax55aFOUo+z2CyOlE7/fof5SC9iix3CZ1XQjTkXmJvGlIrUnPeCjp9H2O98Gj7cjWXPeZWEPbsNXqQAZRmSBgumwRf9ira43dOd78+PSTGWi4mc5GAcg4uSAEPsjspwkyKTnapUSRA3wGGT/OyFX+6dHl6UKj0LHU8+ms7tUDriqu5RKLrXXY67kXaBCdh81H5gza8d45HCPJEAht8L+eV5JrAOYkG37uhPlzo8TrK2SiqpynRV0bev1NPusiJnR9FCVfkdLjqIm+Zpih1aWn3QaZiMvmyfk6bkurBgtWqYtH5YcGdjBd+lER8ObTsnucW0f4PDEMjyiPfR0qOMD9zY4Pdrqf4/JzqM8lfavxZeVVbXPLd21Sp5qMfNVZ3Ve+VCOF2dfzvprFBE4vingIUdzND+Bwoa7DHRqT79Hnk55NXfy+bk6DkCJB2w6+h43FmlZKYlI= X-Forefront-PRVS: 03152A99FF X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BL2PR03MB161; 23:pIp/SqYLAWytaBJv+BME8XDidbM0coyOU1y+6M3hqj?= 6z1+DJFWzaayH7nx1vehNzLqvw8LPO1uXkYky3WbfDcXkQkaPjbyWpOEMpXvfWedIpu6xlFlaN1Le4J1KAVUl+2ft2+t7PRJKn2epSCHvSZxCLDR17M/+bTZQMSmHbwTsK8qSg6E145Pg0hcJQGMA/CkfM1jDJYuu/Ea6c1FBStEoSpGkAJF7ACfgmB1sNba0kV5/PZ4QbfkH1gIO5G3AutbqGSR/0vsEPfmuZgvs32lG15e39DxdHvxYye4H0NmJuFyLyRrXsvlR8rDB21DcJsW/6JtiXKZV/p+jfnpEInfTuxT9R1AC0jUz0FIurLHPR+3BlMZ3SwFNsCfJW2WU08ZP16/wUpq39PBurZgbaQv60Bj/m7h/YvKpjSPIL0gKUSIzcAMZF4nca0Ki/Hmug0wbvAW74DoNeSnY7PCrMSRPjilBugnK/wdP3u5iLxguzWifMWHIhg9KwOJ/J2DHoehcxEWVKM0e70ScBHUs7A+Wx8jANECxkAgZ65ax14Sc0A9UhXXbanZzQvocS2Nw4QW+sAlBSgW+hOK7/Q8vDRqb3dn1Hd8GteiNI6dlPn2mWISvjy3ssh8Bu4VlOHrYsLTg46pisbt7fENoXE9hp1U/VtsR24usbkEWbvlWT9aDecbRVmHuQ1IqMFckOJKJ9J0TYrabdFzVzmoqe8Pr7Bn38cNi4cD4zo6U+TO5vhx/WvW3eFjDzkUQwKt8L/y9ZhMstb/zkQMNdDK1b1WgGMN2sG4G6sZlFfqHlsqbHzPlHwyjHvGw+Lb7sBcmS5zd2pUT3k8qSB/fyCC0kBtz3H/86u4LbmXeg7F+hUC0wxMAyP+GqF1/68Szr0AL8bA3EV3bcVCB+wPrJMPakV5SvR4yKAfe6ZC4poWmwBRmB4YZgMG2Kc+V4SqN3TF0mPVTsXl7g4lDVDivvdBLz9ti/2XquOokel1dttAJSPJRp5u7SDW5wOZ8ZFvJ7Ykw5NzwXz7+3n5fCwy7xJPvF2pUkzj2D8fnP7pElDfpyoigbxUCkXNayhl6tTfHGbofDm4w/XiJb3F7GArhOwQ1Tu0rRryoJ1egbWBvUKYU6HLtznRUleICfcOHRu2oFBrIateD05QrhCanDZGv9CU5/nTQDCNcZ1XLPMnuMHotyyRnJShjKJ2E0W8y4SNUJd52CoazBl+F4hs4HB58CS0kLR6+uNKubz0syXt5pzAIDm7otn3M= X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB161; 6:5f71Je7eCuKgbwKgBru9iOjhyPHxAAmHTDkO2SEsa8o3P1pDrez/3claeMr7BnX4iJLgltDpb+IOed8KgsN9xeR+UR50do7VnLHgL9SDf5b/ywiTtA1G/Yg72cuh8v1XQPHsRIqr9jv7ZeCZBxVVvNaa/u5n67OG/7iyKqIsh4dohdZz18qAf5ECsj7jRsnf3ojXW7Ky9lwPjjd9VssoBr8mL+30RlLhroJUMOkw2/l17hDaayT0jWXDrzwaFhooU2Ezu23u3M5Ph3FKcI6eI+4iJD/9N/Xf60bWd8ESMEfgQbZwUlsNTy0rkFxxAeoeGSwxMuTAwH/FAcOARzhYeP16LsAjRRanRRlgEx9sNBuOFT55VxzTkNgxVNwVAzSnrOdbnWSxG9ODyD0d+Qir4orfgTYIKP0odWE2sDPgERuk+iPndD699OoXNl+cnzWa3PplP31PAStiAyqu8CS/KVIxZnwMF0PtxUZQrTjHoLEaABV+o3d6pnyqee9LMshSe13pqOhqTqZZkxyHJENt4Q==; 5:GX7iSuPHkfFlV7A+FbtoEHfJ13eml+f4PlTHW1yWM6AhsthsPrg4/X4wuRlzF2OmJbxvJlxFO/5ccDAatYMwtH3ZQTLgZ0sfMprPuW+3S6ILSprGseuGtWp57hHUmbuf6MvhOF6IcYi8ni9jWx+kPWeNObkm2Z8HUgkpdPOdT1vTVh6W2CW0/VnXBBuqiDOf; 24:jJMgg1mIBbD8b9JdhpGB8pZJPGOlKpeFy+AtDGNuGh0EGNSnMc4bDHuVvns6F85QkyQitdlw+6SxZk5le0ANnSuJugDQL4h+98UkmCWQND0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB161; 7:K88l1Hzap7Q7Zp+7eRnud6TorM+FsPlbSeA775xN79g+UZ9NtsXcDp4BwuTb0Yez6ophHWNTmrqneGEmW5ZV3/zYrz166DDFCpA6QX3IBhRzBLVt2QNgH2b17EVstYiOJNjyJ7wvrHcW0W1jKtEu/vrQfVJLMzsMddBB9mpczeNMUvf1CixvwyHlov7XzO6AVAuqkCnlxmxRUsSTESbBXTWd/9tpThnhItKHPUMShbg7+1KJ/QFpjiKpaR6jUc4E5kCUiNOU0AySD6qg67Tzyck1Er4hhqa5ACiRfR56NtwZJIMVVobVfOZq1SErG1JXCn21R5zZPFOuy5lGvwot7g== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2017 09:39:54.1817 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2PR03MB161 Subject: [dpdk-dev] [PATCH v3 03/20] net/dpaa2: stop using software annotation 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 DPAA2 driver is not using the DPAA2 frame descriptor software annotation area. This patch reduces the PTA length to zero and adjust the RX Buffer Layout accordingly. Signed-off-by: Hemant Agrawal --- drivers/bus/fslmc/portal/dpaa2_hw_pvt.h | 2 +- drivers/net/dpaa2/base/dpaa2_hw_dpni.c | 19 ++++++++++++------- drivers/net/dpaa2/dpaa2_ethdev.c | 2 +- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h index c022373..9ffcec3 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h +++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h @@ -65,7 +65,7 @@ #define MAX_BPID 256 #define DPAA2_MBUF_HW_ANNOTATION 64 -#define DPAA2_FD_PTA_SIZE 64 +#define DPAA2_FD_PTA_SIZE 0 #if (DPAA2_MBUF_HW_ANNOTATION + DPAA2_FD_PTA_SIZE) > RTE_PKTMBUF_HEADROOM #error "Annotation requirement is more than RTE_PKTMBUF_HEADROOM" diff --git a/drivers/net/dpaa2/base/dpaa2_hw_dpni.c b/drivers/net/dpaa2/base/dpaa2_hw_dpni.c index 3dc60cc..547025d 100644 --- a/drivers/net/dpaa2/base/dpaa2_hw_dpni.c +++ b/drivers/net/dpaa2/base/dpaa2_hw_dpni.c @@ -306,15 +306,20 @@ int dpaa2_remove_flow_dist( */ /* ... rx buffer layout ... */ - tot_size = DPAA2_HW_BUF_RESERVE + RTE_PKTMBUF_HEADROOM; - tot_size = RTE_ALIGN_CEIL(tot_size, - DPAA2_PACKET_LAYOUT_ALIGN); + tot_size = RTE_PKTMBUF_HEADROOM; + tot_size = RTE_ALIGN_CEIL(tot_size, DPAA2_PACKET_LAYOUT_ALIGN); memset(&layout, 0, sizeof(struct dpni_buffer_layout)); - layout.options = DPNI_BUF_LAYOUT_OPT_DATA_HEAD_ROOM; - - layout.data_head_room = - tot_size - DPAA2_FD_PTA_SIZE - DPAA2_MBUF_HW_ANNOTATION; + layout.options = DPNI_BUF_LAYOUT_OPT_DATA_HEAD_ROOM | + DPNI_BUF_LAYOUT_OPT_FRAME_STATUS | + DPNI_BUF_LAYOUT_OPT_PARSER_RESULT | + DPNI_BUF_LAYOUT_OPT_PRIVATE_DATA_SIZE; + + layout.pass_frame_status = 1; + layout.private_data_size = DPAA2_FD_PTA_SIZE; + layout.pass_parser_result = 1; + layout.data_head_room = tot_size - DPAA2_FD_PTA_SIZE - + DPAA2_MBUF_HW_ANNOTATION; retcode = dpni_set_buffer_layout(dpni, CMD_PRI_LOW, priv->token, DPNI_QUEUE_RX, &layout); if (retcode) { diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index f4c73de..007eda7 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -284,7 +284,7 @@ cfg.flc.value &= 0xFFFFFFFFFFFFFFC0; /* 00 00 00 - last 6 bit represent annotation, context stashing, * data stashing setting 01 01 00 (0x14) to enable - * 1 line annotation, 1 line context + * 1 line data, 1 line annotation */ cfg.flc.value |= 0x14; }