From patchwork Mon May 15 12:37:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 24298 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 68DFE29D9; Mon, 15 May 2017 14:38:14 +0200 (CEST) Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0053.outbound.protection.outlook.com [104.47.41.53]) by dpdk.org (Postfix) with ESMTP id 4D1FE2629 for ; Mon, 15 May 2017 14:38:10 +0200 (CEST) Received: from DM2PR03CA0028.namprd03.prod.outlook.com (10.141.96.27) by BN1PR03MB169.namprd03.prod.outlook.com (10.255.200.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1084.16; Mon, 15 May 2017 12:38:08 +0000 Received: from BL2FFO11FD041.protection.gbl (2a01:111:f400:7c09::136) by DM2PR03CA0028.outlook.office365.com (2a01:111:e400:2428::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1084.16 via Frontend Transport; Mon, 15 May 2017 12:38:07 +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 BL2FFO11FD041.mail.protection.outlook.com (10.173.161.137) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1075.5 via Frontend Transport; Mon, 15 May 2017 12:38:07 +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 v4FCbxNp003970; Mon, 15 May 2017 05:38:05 -0700 From: Hemant Agrawal To: CC: , Date: Mon, 15 May 2017 18:07:26 +0530 Message-ID: <1494851864-26029-4-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1494851864-26029-1-git-send-email-hemant.agrawal@nxp.com> References: <1492607395-5922-1-git-send-email-hemant.agrawal@nxp.com> <1494851864-26029-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131393254875854808; (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)(39840400002)(39380400002)(39850400002)(39410400002)(39400400002)(39860400002)(39450400003)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(9170700003)(5660300001)(498600001)(85426001)(305945005)(81166006)(2906002)(189998001)(8936002)(2351001)(5003940100001)(33646002)(6916009)(86362001)(6666003)(36756003)(4326008)(2950100002)(8676002)(104016004)(50226002)(106466001)(77096006)(68736007)(110136004)(48376002)(50466002)(105606002)(47776003)(356003)(54906002)(76176999)(38730400002)(8656002)(50986999)(53936002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR03MB169; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD041; 1:JA75r7zmr3W1vbBoAWS350vdKufysqM65I5zu7dh8gK6RrpZWZx+NwFoh04e5TCHpJT8mhPosqSxlpqhiHVv4Ygj6UFs9Vi9SB8TjVhLYNDjMXh2/SkExq2vU7qEAGQMDR0zw47wSzLzHRSl5YIDiO68ofxqSp+d7N5dR8gyg6YCoviA1h1YNGULD54nKFbAbM4UUKsuHmVpPzJz4PlliC79jgmk9XuKep0k/9KBZKU1H1qtgXFAYbMQaWpg1+EsTt1+fLcWIHwLMw55hWaQBMMirFcrweymacKuoDvGGsWu9CVLzIWTwmg0/MOUGMJJDnhkvt9MEmBOXvDMMl2kfj4erOMu6xFBDuPPC3Kd6T3bQVjaLd+/RyhX+G+2odCjxyKGWWjxgLTTGjU7APCWVQqY41Ca1G/OAVE+GjIWUhyGNJOYIk9G1gaiaRDzt6OGFNKNcNwGDgzuhEomiTXg6MC7Zwry4tw3I0v9VqRhNsjuAaFeQsu/ZDs23rNo3U+iSd7+sZzq7SEiN+5n4ve7dENEuGloR/hAibY6n3gTvt9RwNiuD2Wr7YketvM2pvq3llt1bcyjjw9Mgu0ynbk1Kavfqsnd7k0TyEekrolZgUHy9I+UahMtzoKZufu8kAz+7aF/LK1dP+Q+idFnNdYrgcR8ZRAQwLgv67ZgOyLh15mUlhEX1Zev7og9hOdhB9a/hbASdeEnzVsW0BCOZt/HBK5z4sskQfr4OQYPqkpmgW+bPzBw3mu47c4+RB1HRWbmZGWfVNCSNlfEXX/IZ/1Mbg== MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 821a50a1-63d0-41ff-f7d8-08d49b8f3d38 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131430075)(201703131517081); SRVR:BN1PR03MB169; X-Microsoft-Exchange-Diagnostics: 1; BN1PR03MB169; 3:1pBBs9mDYqkIXl2t/ClGcC9l1ByTfvIZ8d6FYx7SRPsRyNHiFhsKHHjHxf8NLgSz1avPn5mmMSJ9X+v9vXCsou/gnTcL17G6YgE21UhQJeNgMSrKUnyGHkz3RG5eJk/JrbkFYqBrohCC5MEdWyde4MmYGiakY19mSlOlHDFr0aZ+BK6q7k8GXw4qDClmKhXFThJ8RyNhRX9vDqt2UnJ5/PWjFyCzjpcQknfiJdmGIOL4LYSRSk9rUEuC6i8goq+T9tCpBzhpamCiIR0KmrsXFuHzOORJ7b2bcU/+KdPplSI7B81y+Cy55Bu+OBxogTQI6QelYTfYzWYarA13Ry9fBvCCYlGy0ko8V11Z/rmcqVY3N0igLBNkyQ914NahRIU0FSuy/hILLpVyER70dhYGQ2ifudqrKOKbRVbK1r/4J3CvC6BeQVea/NYkrPvEQkGj; 25:KSKP0Vsfs/0HZ52+mrl2pHytCmMb5cBjQ+lsagGk0j8H8FCugatSawku02BIOPWN4R9buzAoFiWuMpUm1SatTdWaOYM/9+dR4Q9yu7v2OKETJiBiKKfisCxnDXcox7OprzRiw5967LC/tHh7c9kyzKH7cc+ggRkGHbB2zrAyBxbBbTS6VFCxgYYSQ2iO3kGPfRtRq16sEUBp/GwejFdOfRMnOJA/GZ/6i9onz4mO62Uy/nfxtSJPp8e2gUfFBOhbNMieI1Yt+ugsrqzWUgpG0foY2Sp/BnVyDol2AOrU/ugx7K3yhp+iqWwErOiaRHRCvsT0exj6nPGQtwumn0b7rEkziNxfzYRHPdnEIZd+lRsfY3wtYldXj2zNWVAAIfEPzI2/QZHXI5zCSJPRJqSbVQ9JqlBFxR5T/V73ToUo2AxQp/pOv1Ycqcgs/QWFym+btvaLo7DCCBXL6r4goXohbg== X-Microsoft-Exchange-Diagnostics: 1; BN1PR03MB169; 31:7vIAGSSCI03SDfxIOapVLSyYxGwQh+v7Wum5xpe7Xruh613basKZL9QZ9/7Ir3Dvc3XVWXWYhbymrbD20jjhiyiBMlPMJuzx1xOLcsE7RxLerznHllIEkhjiX6CvpOSJrMrLBo+YsApPaIgkjuKFbyAzgT1Y3XXD0HbwWypzgkYs4hSnui8c5fOjxOyt7t9aJtyx/FaJOQ7PT+mb9CB4tObe49W/NiwSh/tfimw6cXZaNbD1FTQNb/ix1aNhOC8z+xeuwBoISmdJpwk0Q1WGBw== 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)(13024025)(13018025)(13015025)(5005006)(8121501046)(13017025)(3002001)(93006095)(93001095)(10201501046)(6055026)(6096035)(20161123561025)(20161123565025)(201703131430075)(201703131448075)(201703131433075)(201703161259150)(201703151042153)(20161123556025)(20161123559100)(20161123563025); SRVR:BN1PR03MB169; BCL:0; PCL:0; RULEID:(400006); SRVR:BN1PR03MB169; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR03MB169; 4:fvB8L+m0paELl1S0O+OyO/57u/mZGcBtxahXUG5+raH?= 3OHuMs10FGNjwNALJaiQRzqDCLAuRvDCKifjL+6605zhn82mseHPgjXMGLd1XjEkSQfhgxvdFyzTcEWAKKVoM7SW99QHlYfeL+diH1IyncytmN+aWgNx1kxRBdTnGfkz1TGd5dkXBNOlt602X9QKZToWuxS2iy7BjY+CYI5ITtqBERWiKCArfHP8MwIij1D5APC8EDuttFc86wHpfi8LSLwOu8Xoc5ObTujU7DGC9JSLniZgUP2paD1rRJTXazOaczli80CxT1QsHHHNZXv+zn/t9VG+dd3JiIwDeMoU/bDOHvhcxHNjjvWat0ZvwVDx1d5EPC9skbUVy07n3gGmfifOklMaNnckkNsfm7aeiLX9woVYpkWlQeuY8bedwSk9SHsGzyDegXFWLO257Igr7xp6maoIBqizKbg7ErFZIWUCaKGRiHyNjvDBpW9mD7bm6RZQYSYTn3n2D9ZuV1rbr+KGWpKPz7p8jBhb2etiZOBpCq9kVkh2VtG6VEqwYgfhlcr56fLRrMhKFxSNJSVUSdW+Aodlh5BWeW3jc8xZujbO9K5xRNL9YEB6UCwamHl2Xf4MiPBEQBYhDMGB70vuDVGjxdT199l+GHY3NuA7lA1Xi4V0Ht6gDIE4RViUgMrd9uHU7BKtnmNdRAFVmZUhSucvo5MJfc434IfJRF+6p4w2Eabjg01y0yhfSQ6uq2ej4U6SS3SgCGUh6TLUnydJ4I02QWvep5UDIl+aFa/ZSHRTNWLmEl3y+53VKJzMDjrPrujQcMrUBDm08unkQDDnXFg2Q3OSZUXtdiy7FoM73oalj8KRDVsCTCl8UczWFNCzpWw2yZX7hGz+vPjyLU0eW0cDiXxT2ceReGVRrGSEZN5FWPlcM4mxWfdw6N4WygZhqmMko599jmfcjP8NnSuTMaRh9najD4KVdacqCjADPp0G7x0hR9E6cq8ai8Q77B0o= X-Forefront-PRVS: 0308EE423E X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR03MB169; 23:eYrO5ng4F70Ea4aqIej1PujZst0sd08lycjC94a2wI?= FK/gv5nOdUWjh4P0cTJrJ9nCr7RD2kvU8gsAT2oQaSwCBtyrHSYRXI/pnTgv39VW53inHXkxk1s1iWokjojHna3kpHYJf/RD3w1hSe58mj2HMiv5wsoZ9TGKnRDgg0pukSRKZTRNHOJkfpn70TZUjmFoSExvwKNiYFFxYnMsjJLpwH9lmqGpSU9MM+TJxAvOA6pZdkhVWj81uQewfdgQs6Pt0KnDFIQpao86I5MCPyQEhJZaMy71r3nF1wPrBlvxNxWq6uqtt5ayotDJM2TiuKSsmu3PrI2mMsM4wbW/gDoMgvDRbVwj+nuzUg/+nxfUxygwv5i/EBu5iXqyjXfY5SWO+O8Q3Ktbl7uwx3wQJFKb4+0xU7hfkQrTnDM4ttwqgpruvBPytEgCy2awXKE9WyxSKvZ0stmnIABZUGjBgr/ZNCeUXNBIku+zbaW5+Q/X6Jxf0wHQ5y1zJrLkTMeVAqcyi+iCzloI5jwUvvVmzAR5gBWrnuudGkae3v8mGjkVO6Q8V96m08Sv6r0aq2A/NIMGxdKpOLQ7Qm1L61gsPMeOUPlNF40USRK/QMS3QvXUp6cjdKgOq2oW1qV06wX4DOgQkCWA1xTkmcG+K+b1/WmfmAVYTc8FMyHsyCU7R602XvuUidi71S1oDp30gw5Ds3QRcyW31wm3SwYRLEZJOpql41NUoabAAfNVy85bZyUcn5QQOmPX5quUxnLe5fFdfEO+4JDHAm4JuGFSMIc4rlvXE+d0/9YEeV9uD++vnhDVzPOcXgK7cexLKtVYsypmeTRXHj6tt3Hx3ZraRgDh1x7M98Akqz9p8iKIlLt96OshHYD+sfpLuuLruIP5fDGBm43G7RzUfklYkmoeoHH0yojhZ2Ezcrna83/m9BTUyDBBK+Yx06GdAVXHDyNTfIfiqQMcLYO3XQM9n2CC02YwWF4AMd3Rz7FMe6JI7zk1hh61kukms/4PO+I0uVW6jKjBjOZwmFABXpYcYoeU8sE0gXMUU9kkItcn+Vy2a2hjPBkJI+aZRz3hPoo5NQ01OK27AcDONwvwdEd8LNBasJB5ETlKt6WUF3hnvutMjbT66Bh4npRN1KLYly7KheYsVB16QR9gTwKtTSnZrR3hvMKRqjuyRq00tRotyZh9I+XO1avFXncpLzfsw0CNACS0saAUgcc3piw0dyhFbvNJbFvDZpihDuYnB5l2QPjM/O08h29RCvLWhyqRQxU1eyLLQDK9vv X-Microsoft-Exchange-Diagnostics: 1; BN1PR03MB169; 6:9vfU/0mDz5yHUbHDCTgO6xtsKxPLC4o611pYGAiPyJdqurdveB40eLcKQx58ZrafcLRWSAyxGVo8ywXVjAEHYgoJNemW/SW1SvumL+AuBvxIl4QEVHlqUQFlP0r1sV0ypCjP/dc2EudDBrIeaBDC2BLwUV6K6roBprqzDLJHgraRh/XV03VaWxjkyg4Xh27gEOhG3L/iAOEwXJxhahnu713YMgSPmdgzdfML6punS/A5+6PWDQFoHNrCjF3hYmAKZjuQ1dv9hR6L/cELbyovYO42wy0IKsF9rw7EqF2wghLesFDfbm8f0nDUq4kmIITYy63OLMBuW7jXl+eysrZIALjK+PY4CMrqI4X44IrZQNml0QgLNiMKJfDt8hcSRmf+VzoVU/rHM59ZNQtx82wVxugmjHgap5sXSMJPrdkI12l+yRMRAzTccBj2faxG/1CJoR3HehErepLA5njTJ9d44chZiMGulRqEUkjQlSPQxoW8vDTID4wgg0DhWyllli3o; 5:Q9OWg2GBKAm0sdSmRvV8jlyJfZ29ehXY0VaCMxR85lSCoJy3hmFPNrnj+2ww8FTMNJBHo9ovCmHXiu/BfXSkvxKWw4WR363G0262BxD5nvwiE7bvIXg20pm4hQuTh5aHthszlTVghOfnzRvJ/cLYb8qAmzrUKEvC8gs09mSuw8FjTcjEBzFvnvixg21qJ23R; 24:0thKXikNr/DuHUb8i6UyQReB9jiF6hAli7bfMJwUd52JhISk2mPh599kziPJa8AJR2ykBr1JlxGkLL7f/bIPd3Mv4eIpQ5Z2mEqJuFtfJmM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN1PR03MB169; 7:VDDU6qPO5/glGWPEZuZRqYiNh13z81G7MY2v/lAX5s7WJC7PSsH70/DmGrytoYhSty6qVXkxhS+6oKORSkazRkMxmm2EG9JOdDCVXi/wVBu8lVMzPISDhUQ9zJJ9zTpAw7F/4K4X7JTvIgOw4QcM8cE3Q9UMP3D1D3FLzG1n1i10asnnUdcABlsI9423WBAedkxnpAhGu7UUrpCAKn/8Ra7I17fQmP4oJQXVxiFSqscjfGrQ1hJJAO6yo5MSSubF5Bf8Zkxyf58+JA0OQNtnX9BoSeK89evzl9tl1KvXCO7mKixu8G1l7G7WAHGEyLUrdFHocgN644T4Zx64WhDoDw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2017 12:38:07.4294 (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: BN1PR03MB169 Subject: [dpdk-dev] [PATCH v2 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; }