From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0072.outbound.protection.outlook.com [104.47.32.72]) by dpdk.org (Postfix) with ESMTP id 6EB64D018 for ; Sun, 9 Apr 2017 10:10:02 +0200 (CEST) Received: from BY2PR03CA076.namprd03.prod.outlook.com (10.141.249.49) by BLUPR03MB277.namprd03.prod.outlook.com (10.255.213.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17; Sun, 9 Apr 2017 08:10:00 +0000 Received: from BY2FFO11FD022.protection.gbl (2a01:111:f400:7c0c::154) by BY2PR03CA076.outlook.office365.com (2a01:111:e400:2c5d::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17 via Frontend Transport; Sun, 9 Apr 2017 08:10:00 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; caviumnetworks.com; dkim=none (message not signed) header.d=none; caviumnetworks.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 BY2FFO11FD022.mail.protection.outlook.com (10.1.15.211) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1019.14 via Frontend Transport; Sun, 9 Apr 2017 08:09:59 +0000 Received: from DTS-02.ap.freescale.net (DTS-02.ap.freescale.net [10.232.132.223]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v3989Aor015502; Sun, 9 Apr 2017 01:09:56 -0700 From: Hemant Agrawal To: CC: , , , , , Date: Sun, 9 Apr 2017 13:41:15 +0530 Message-ID: <1491725483-6619-15-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1491725483-6619-1-git-send-email-hemant.agrawal@nxp.com> References: <1490362538-20854-1-git-send-email-hemant.agrawal@nxp.com> <1491725483-6619-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131361989999700283; (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)(39860400002)(39450400003)(39840400002)(39400400002)(39410400002)(39380400002)(39850400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(9170700003)(33646002)(2351001)(105606002)(6916009)(2950100002)(356003)(6666003)(2906002)(104016004)(76176999)(50986999)(4326008)(47776003)(38730400002)(189998001)(110136004)(5003940100001)(48376002)(50466002)(106466001)(36756003)(54906002)(53936002)(8936002)(50226002)(86362001)(8656002)(8676002)(81166006)(305945005)(5660300001)(85426001)(575784001)(77096006); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR03MB277; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD022; 1:PeswtlaRVY9afpM2jJ49S/XONTw5cXMTeSmI+8ujDi5lJqQ3gSRHl2745mNo8yW0+XBcbqD1kkOpq6eXaJkqed5qlCRFMJVJQvQnXzdlV4novhLs8hRiH6K8ku4eBjYlTWT7x+ym9mm9dRcExIbfEPw5LScPQZe3AD0pDwfcpYu18oZXPYj2kj2LSCWDOkcTuIHrz5JBmY3xRIEJmBA0StstRJBSWW2yszzLvW0UNGS8UND+cvcUQaA7CWCmb1bKRtfRPqBWee5pO4r58kp0K7UUdtr5kRGIHGmVPU85F3Y+eV9MG9rmB79GAmpLq8LF2aStyOBPbcdbWKVZn8EP2XdUxD3bhU0iAaPRgrfMzQ16Yh7KZrR6PZxQBwBWHBemW4f9E29/oYqQGwbFlW3bwnKXqKqv1ocXGUIBhMvIHtA51o+ha4weAIRiKoLlxR1RgQ1GxcaPojr2i9wF11SvYQxpGzmUip4iALkH63aoNWXETEsUybCy7hKfgKZQ1+XIeNYdiJSeGy0mEIwMJgsgrRzsp1AvkP5dHChOh01yKJD+FP2+716I/5W1FgDcGtbbPUYnQ2GegL/41W3daT14/F4rp9PRS4oxI35wqgIGTDJu/nNmDSVnIQNvYd7S+vtijYpUiTF9myFz/mmFn/e5qg+p3ZCI6Nd4GDL8vwuOkJk= MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 5171f287-008d-42cf-47df-08d47f1fd160 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131430075)(201703131517081); SRVR:BLUPR03MB277; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB277; 3:cK5v0CC7AmgDSm4M0uboHLaUBwE7vE8jMBEL9q6cwjsAyuOTE1nC/uuxAz0osjCXQknDoIDDjt+cWF2kigbFyH7xGmt7o5JZPp9sYYWJbaGaGd08Wy4SA2UVWNJ3fu2ScbVpA7/ZNSrzWpKiP98AYt2+8uF/5v9NP6KzLi1myRz8db08jE72qnCVVFbP7iQfshie0KVUsyHq6NtFR+Hp4FJ6GY7AMgdHDuEd6E0TIVS2qg6SJIvixFmJHzkeZAeksoqQnPDH3koHCHx3rPFCbV+Zw8DViRWEAagiyCEi/kAOg7NPgILOChVL5FK80wo6spuvyDQa/zt+MUxXkXhMhQej+RgzvQMG+wR/8kVlVltLpz/dmODI20UzSJRa/kvPZlVXoean/9XyipEbC2QZl/ZJdqNz/zfhSNtSH2QW9HS4BUkWaX19UiqHTlAWDQvx; 25:wWnj3+xb1SWxXR1nwWfotXfY9b7/DAFWqSAlLAZC3DdmUCqDPvNMsbJvOQXOth0apT26ce3VXouqRo6rlYdW8yk4DfIpikXURlgfRRTgpaynvCOeNDcdr0xmHfJ+l77BnOFcDkzKfpsKScBt2bZd0X6d33kjprZwTVAgFhJuQELau+85AvK+MNRb908vlcSXxYPUYGJp6UsbuUb7PxUW9A/qGnFzl9WLmrDYxPxmu2hpVK70+NOI6Hzi++Wyma0WVE4flGM730fOG2WuiclCP5ms8Y2YKqJPLpyviwmIdUMmE3wmBrsMDJW80mjq7BvuNcntoyKyDctIQNZ/Qdw9ukQULHQNVLVuzICvCtlvImzH+NGshK8X1mBuqv6c093YbYmv6pGGHbu+meA1Z3p8IC/xoJgra6Mj0h1AdzGrfgb+z+bIWJzXfY7lle/jgIMTHk7dTS86Oz1UjXlTxs3Avw== X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB277; 31:89ZmGDvZW7HtLtLwVv7jAneFAdBizg1yEnSiui25NyoDLkcgh4PlsX983qZrHNcfqaYRPD4aH6V9DgtUupzGgjlAa5qvou4RI32amrN5J7v7JTp/5xxoEe43SvS+LPoeh1pjdxw9o5HbpL+gaspM1FwmSNkfKOHDjsc2ZmvgdFQG/UgyIWcw/cNYYQcj+1oADeuxxr3OsDFAPbkO6Ib1LC64Ktdi8Cn4PEoRGlQA/mRL+u6FNRlNaHrg9/OJw8ZoBRDdL/MiZha8+LCLuCyONQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(601004)(2401047)(13017025)(13018025)(13024025)(13023025)(8121501046)(13015025)(5005006)(3002001)(10201501046)(93006095)(93001095)(6055026)(6096035)(20161123563025)(201703131430075)(201703131448075)(201703131433075)(201703161259075)(20161123556025)(20161123565025)(20161123561025); SRVR:BLUPR03MB277; BCL:0; PCL:0; RULEID:(400006); SRVR:BLUPR03MB277; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB277; 4:ZgtuCWP39vorfDF+vZ0dU7I5YYO7JZvhhFC2mr7mTikxt/fr6cMMkmGYFR1yTOzjRAWP+4WP90cyp6TEBBwVaMb78lj+DvseBo7t5nEJ4VT/BVRPWycKQ3q0SpQvF+YRSJ+Gacq0PVLnO8FohzylAffgGTEWmNHJN8oXnH54v8jgVh220VT/ioWWR1lv9iUcwGjZr0G6mGlVui6Y65t5Q+A+xRSOd9xoAp6zJ80fHQjmG2B9kyvPias1N+Gt+uQj2EtcSzJgjb3KAoBaLAEL6UMrJjgnDpRfepioJLKHHUivKgdTyGunncpcGb3i2yPFeddF+U8mr2pETGrb/ZKwL7xpFZM3UcEEGwo+zZcifhWmYAIYKRKvCdxsBapI1H7IrzqMx9G//EMk2yNtZBlNn5E1+Pwxfke9YDN6Sj9784D8MGj5mxKYohHIhK48UruHOld2/Vt2cNArvNGjaMJfriddQei/VYlPqtbQrEBotL0Oxnnl11e0ou6Gd+4dtQSRXOdLUXvMrwa7wDmGkKIdnuY26j/2GghkydVrXHhV++gXyQHeJzkdbLsiQ9TCz7N9SNrsRCfjRgGnQ1oQkFfkS5C48E+KfOITmRDFtjZ7NuWVl0knc2hUGnCPqhPhPx2H6wo5oQgHIuR1YuPwUxCtpuZ6pNytTuNCtUn38JFhhbvb64N8j79iP5ThFlXjKfRwIoAFZXQMCVR8IwDc8p4G3P/LqlvsdAcxhMM2nRlMLphVmsQR1+128mAAFx1CYDG3PJQZRbkEnyysbKgp+HEJjBVMb+hrMk+9SY/2lAGvEFz+V+9HduRvikAFpPpOe19fU8jEiyVDQOO1vdrNT9yyiC/Qdt2jiwj9diIP6wI2HHYmpVWsSEVsz0rtOxnCjQmSU9cUon9b9FKO4pJH2AWQng== X-Forefront-PRVS: 02723F29C4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR03MB277; 23:FVt4JCaU6PbzM62D7M2VcIwh0jVPqjDEtxL+NNlHtK?= =?us-ascii?Q?ri/o6yOMhrwT3Xd+i3yA3TWkvgBd5ok8JlavY53Ti01rS7Vy8+l+MoEmnez9?= =?us-ascii?Q?IOIFMd+72i5xJCrd/8vHhgfMv/NcrhV4D0ODkJhTPeXzCbjH+uGYzc/SMdF9?= =?us-ascii?Q?0FMgJB8ET1vAVA8aMWD6gqEBFKnGkJGDtcIxnkUiKJlxBzVWdojlbeYu4HTw?= =?us-ascii?Q?T2oMOufYFqjl5dEWB99ACReOhxxZddN4vQFcWxMWiOnIae4KK/APvtYHkO2s?= =?us-ascii?Q?eFHrKbPqzJ3cfczszfzd73h2vktXNEkUyNtrXjDmmmlNfrGn6vygeJ8TeJss?= =?us-ascii?Q?5Q/XRKOhHshMvfpgIk6zmZutTkVfEcondPjC67zMduvkyQOg6Yk64Q5wfRuU?= =?us-ascii?Q?ezbEqdfGOtOOVhAYQsYJ36dn2vfDH9cKaNo1Kdejei9kiyADXxxSYt5Z3rbG?= =?us-ascii?Q?foR88E32Pu+dj1bAFY0aJ1YYxJFy3Tq02Kl6LKJiPaSJA+zb0WXN97I5Ha2C?= =?us-ascii?Q?nf1OOz3lnftzxKnELyNRg+QPIpNlZDsMnIQTvBSoKukH2vH9RBMh9NSNfQqJ?= =?us-ascii?Q?/Ke9cj+Mka+oEplcKAK85X/GyUjrcpWklKiuq5Jzdl4kJfuj2lfe/wELfkyy?= =?us-ascii?Q?jGsniPxNLQ6/QVWwNVgYedRXckdelGlfwTBkZV4+H3VKd1/L6UqBCDlp3yM4?= =?us-ascii?Q?qn+WI3hXQV6HNcESI5+CCuUFaYU9hPDVXndjBm7efiZJ8OjCSotNgX+KTKYo?= =?us-ascii?Q?4JHyFmyshsArJE/WkQESpbmLmFR0bUS3O4/NKhU/W3FvzkHS4TdfMCjY274F?= =?us-ascii?Q?7u21ahWKTJoaSttPKmcezEWHXA3AkASg0sQG5WbAR/++jSHi7oL1n9F4T6tE?= =?us-ascii?Q?Iw/a76Hqy5kxpnhVf5DOZFpKv2/d54U518BaNt4CydvkECL2tMCXBSoPn/ZM?= =?us-ascii?Q?sD+HHrn4cu01784dCV6q6FEZsAH81QLpPOczLXeHuykA0hboHh+Gzv2+5TYN?= =?us-ascii?Q?N2jzOKQZURuoBwqDkE4hFdA2xKVOqpiYWv0sPz1Di7ahBlRhAr6afofRFsK0?= =?us-ascii?Q?lLWKImJwd3McmkPbRh/zbBEiosT4WSagZbMDZ22vybPwtNzssNu2wPYCh96V?= =?us-ascii?Q?KE31vhglSBZfhnQQLTX+knsFe3KNinjVVVH2EHw9NqUGoeLAUjoUrfy0qbUA?= =?us-ascii?Q?VMdudQYfCyVJq6pGTA5hWHC0bCfervL9awQ6Cww6wPgDd9XA+7+aA0DIkmro?= =?us-ascii?Q?7clcKgRvYMdgCBMO0=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB277; 6:UQSJNRO1jPbG312qNGeEVCTj26qn1ZvRDU0prHzPsIkEcfPRqN9K3LCneCKAOOO+VHPBMGr8puB6TltIIEzFQCtF9YsqX7ARRh/PugrXeuBA9s/uti+ruEY5YZC+EyMIxlDOcKu0IbLb90SHlYuglQ/V6s0hRlz+HxKpNSn6XO4Gz6OBHlXhcX8wQ/SYoIxD4j3MdQbDqXrIw9kW9ehB2dgl+wkef8tNwxCQaH2k0Db7mRbc11rNTqgYCW7vU0kbRe0z7ToZJp0FMN4wpVDdeiTKkYzWmLINPt5r92xoxZoxnWm/o/SkFkXOsAuVs+SE4ycF7tepmT4evLihZuC8PBVogUvZqf6WBBb6lwc3taRRHym3VvOqNEP8RNWADv1Iz3xi1yDNfkzSd+hSJ/Eu1Ch1BBNoR3dnTWBkADPtQZXzbgYB8lRVphVTxsx3275yUypIZq4WsBlUsJiuC70S/dRDOGieiJE7v7oJ1cMXF5xjk6gkhZmrhMCj+U3YSDe/; 5:XBGR7zqyYyGNtFKPqUUAz+jSHaEdy7evC9FazEuU819WWOOLN/y8dZHXaxikCEfng2UeJ83uIlpHbEhDgoC+4icZ8IBGjisgQ1Clb7M2Qg1bi1puFcLsBP7u/ZKjmCoNRIai30B633e/JSTHIMps+t0yBQeGuVBlUxy5HLHeU2Lr/ubN+zL9G5UtOrgfoAOQ; 24:sGGfhfCkU46Jk9poBtQ/qt0XH7ebXEJsA/C4ICBywlACiLUeO8g5NV8YvLBj5Dy4QROeYQ0fhUlRkMIza3DHypS7k27fOr+eT0dMb7XQMYw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB277; 7:pEwLRf2EyJaSHdxNHo4cKOH5D1oDV1pxJsXjxrB4ww1ZmcgiDYyI0girWQDW8QJ8C/kCRHQRnsb7sBMmJ9pvNMTgOat3SJManSVduIkBe5D+u2p81bvt64eqdP+gb28khEJSwOiKntOXk3wrK/LFVzcL6oeOEyhINQiiMCRLI+22mFCz+OwqjHLeC+vgNj7iafZbJjgNc8DSuieDyzsmUiSwuTaDudDO8aSonuBIbaiwzlywcpmyX3/FZjIKG6k6Ng3orsQb5SkarNme7gwQLCC44q/GUCnHlXAO35z70nfDrf2iARwyxxdWgCW0x6AmkQb2VAap6IPDX8vqnbL+0g== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2017 08:09:59.7672 (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: BLUPR03MB277 Subject: [dpdk-dev] [PATCH v11 14/22] net/dpaa2: support for Rx packet parsing and packet type 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: , X-List-Received-Date: Sun, 09 Apr 2017 08:10:03 -0000 Signed-off-by: Hemant Agrawal --- doc/guides/nics/features/dpaa2.ini | 1 + drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h | 257 +++++++++++++++++++++++++++ drivers/net/dpaa2/dpaa2_ethdev.c | 23 +++ drivers/net/dpaa2/dpaa2_rxtx.c | 91 +++++++++- 4 files changed, 371 insertions(+), 1 deletion(-) create mode 100644 drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h diff --git a/doc/guides/nics/features/dpaa2.ini b/doc/guides/nics/features/dpaa2.ini index a6b7964..0746d4b 100644 --- a/doc/guides/nics/features/dpaa2.ini +++ b/doc/guides/nics/features/dpaa2.ini @@ -10,6 +10,7 @@ Promiscuous mode = Y RSS hash = Y L3 checksum offload = Y L4 checksum offload = Y +Packet type parsing = Y Linux VFIO = Y ARMv8 = Y Usage doc = Y diff --git a/drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h b/drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h new file mode 100644 index 0000000..9324c6a --- /dev/null +++ b/drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h @@ -0,0 +1,257 @@ +/*- + * BSD LICENSE + * + * Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. + * Copyright (c) 2016 NXP. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Freescale Semiconductor, Inc nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * @file + * + * DPNI packet parse results - implementation internal + */ + +#ifndef _DPAA2_HW_DPNI_ANNOT_H_ +#define _DPAA2_HW_DPNI_ANNOT_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/* Annotation valid bits in FD FRC */ +#define DPAA2_FD_FRC_FASV 0x8000 +#define DPAA2_FD_FRC_FAEADV 0x4000 +#define DPAA2_FD_FRC_FAPRV 0x2000 +#define DPAA2_FD_FRC_FAIADV 0x1000 +#define DPAA2_FD_FRC_FASWOV 0x0800 +#define DPAA2_FD_FRC_FAICFDV 0x0400 + +/* Annotation bits in FD CTRL */ +#define DPAA2_FD_CTRL_ASAL 0x00020000 /* ASAL = 128 */ +#define DPAA2_FD_CTRL_PTA 0x00800000 +#define DPAA2_FD_CTRL_PTV1 0x00400000 + +/* Frame annotation status */ +struct dpaa2_fas { + uint8_t reserved; + uint8_t ppid; + __le16 ifpid; + __le32 status; +} __packed; + +/** + * HW Packet Annotation Register structures + */ +struct dpaa2_annot_hdr { + /**< word1: Frame Annotation Status (8 bytes)*/ + uint64_t word1; + + /**< word2: Time Stamp (8 bytes)*/ + uint64_t word2; + + /**< word3: Next Hdr + FAF Extension + FAF (2 + 2 + 4 bytes)*/ + uint64_t word3; + + /**< word4: Frame Annotation Flags-FAF (8 bytes) */ + uint64_t word4; + + /**< word5: + * ShimOffset_1 + ShimOffset_2 + IPPIDOffset + EthOffset + + * LLC+SNAPOffset + VLANTCIOffset_1 + VLANTCIOffset_n + + * LastETypeOffset (1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 bytes) + */ + uint64_t word5; + + /**< word6: + * PPPoEOffset + MPLSOffset_1 + MPLSOffset_n + ARPorIPOffset_1 + * + IPOffset_norMInEncapO + GREOffset + L4Offset + + * GTPorESPorIPSecOffset(1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 bytes) + */ + uint64_t word6; + + /**< word7: + * RoutingHdrOfset1 + RoutingHdrOfset2 + NxtHdrOffset + * + IPv6FragOffset + GrossRunningSum + * + RunningSum(1 + 1 + 1 + 1 + 2 + 2 bytes) + */ + uint64_t word7; + + /**< word8: + * ParseErrorcode + Soft Parsing Context (1 + 7 bytes) + */ + uint64_t word8; +}; + +/** + * Internal Macros to get/set Packet annotation header + */ + +/** General Macro to define a particular bit position*/ +#define BIT_POS(x) ((uint64_t)1 << ((x))) +/** Set a bit in the variable */ +#define BIT_SET_AT_POS(var, pos) ((var) |= (pos)) +/** Reset the bit in the variable */ +#define BIT_RESET_AT_POS(var, pos) ((var) &= ~(pos)) +/** Check the bit is set in the variable */ +#define BIT_ISSET_AT_POS(var, pos) (((var) & (pos)) ? 1 : 0) +/** + * Macrso to define bit position in word3 + */ +#define NEXT_HDR(var) ((uint64_t)(var) & 0xFFFF000000000000) +#define FAF_EXTN_IPV6_ROUTE_HDR_PRESENT(var) BIT_POS(16) +#define FAF_EXTN_RESERVED(var) ((uint64_t)(var) & 0x00007FFF00000000) +#define FAF_USER_DEFINED_RESERVED(var) ((uint64_t)(var) & 0x00000000FF000000) +#define SHIM_SHELL_SOFT_PARSING_ERRROR BIT_POS(23) +#define PARSING_ERROR BIT_POS(22) +#define L2_ETH_MAC_PRESENT BIT_POS(21) +#define L2_ETH_MAC_UNICAST BIT_POS(20) +#define L2_ETH_MAC_MULTICAST BIT_POS(19) +#define L2_ETH_MAC_BROADCAST BIT_POS(18) +#define L2_ETH_FRAME_IS_BPDU BIT_POS(17) +#define L2_ETH_FCOE_PRESENT BIT_POS(16) +#define L2_ETH_FIP_PRESENT BIT_POS(15) +#define L2_ETH_PARSING_ERROR BIT_POS(14) +#define L2_LLC_SNAP_PRESENT BIT_POS(13) +#define L2_UNKNOWN_LLC_OUI BIT_POS(12) +#define L2_LLC_SNAP_ERROR BIT_POS(11) +#define L2_VLAN_1_PRESENT BIT_POS(10) +#define L2_VLAN_N_PRESENT BIT_POS(9) +#define L2_VLAN_CFI_BIT_PRESENT BIT_POS(8) +#define L2_VLAN_PARSING_ERROR BIT_POS(7) +#define L2_PPPOE_PPP_PRESENT BIT_POS(6) +#define L2_PPPOE_PPP_PARSING_ERROR BIT_POS(5) +#define L2_MPLS_1_PRESENT BIT_POS(4) +#define L2_MPLS_N_PRESENT BIT_POS(3) +#define L2_MPLS_PARSING_ERROR BIT_POS(2) +#define L2_ARP_PRESENT BIT_POS(1) +#define L2_ARP_PARSING_ERROR BIT_POS(0) +/** + * Macrso to define bit position in word4 + */ +#define L2_UNKNOWN_PROTOCOL BIT_POS(63) +#define L2_SOFT_PARSING_ERROR BIT_POS(62) +#define L3_IPV4_1_PRESENT BIT_POS(61) +#define L3_IPV4_1_UNICAST BIT_POS(60) +#define L3_IPV4_1_MULTICAST BIT_POS(59) +#define L3_IPV4_1_BROADCAST BIT_POS(58) +#define L3_IPV4_N_PRESENT BIT_POS(57) +#define L3_IPV4_N_UNICAST BIT_POS(56) +#define L3_IPV4_N_MULTICAST BIT_POS(55) +#define L3_IPV4_N_BROADCAST BIT_POS(54) +#define L3_IPV6_1_PRESENT BIT_POS(53) +#define L3_IPV6_1_UNICAST BIT_POS(52) +#define L3_IPV6_1_MULTICAST BIT_POS(51) +#define L3_IPV6_N_PRESENT BIT_POS(50) +#define L3_IPV6_N_UNICAST BIT_POS(49) +#define L3_IPV6_N_MULTICAST BIT_POS(48) +#define L3_IP_1_OPT_PRESENT BIT_POS(47) +#define L3_IP_1_UNKNOWN_PROTOCOL BIT_POS(46) +#define L3_IP_1_MORE_FRAGMENT BIT_POS(45) +#define L3_IP_1_FIRST_FRAGMENT BIT_POS(44) +#define L3_IP_1_PARSING_ERROR BIT_POS(43) +#define L3_IP_N_OPT_PRESENT BIT_POS(42) +#define L3_IP_N_UNKNOWN_PROTOCOL BIT_POS(41) +#define L3_IP_N_MORE_FRAGMENT BIT_POS(40) +#define L3_IP_N_FIRST_FRAGMENT BIT_POS(39) +#define L3_PROTO_ICMP_PRESENT BIT_POS(38) +#define L3_PROTO_IGMP_PRESENT BIT_POS(37) +#define L3_PROTO_ICMPV6_PRESENT BIT_POS(36) +#define L3_PROTO_UDP_LIGHT_PRESENT BIT_POS(35) +#define L3_IP_N_PARSING_ERROR BIT_POS(34) +#define L3_MIN_ENCAP_PRESENT BIT_POS(33) +#define L3_MIN_ENCAP_SBIT_PRESENT BIT_POS(32) +#define L3_MIN_ENCAP_PARSING_ERROR BIT_POS(31) +#define L3_PROTO_GRE_PRESENT BIT_POS(30) +#define L3_PROTO_GRE_RBIT_PRESENT BIT_POS(29) +#define L3_PROTO_GRE_PARSING_ERROR BIT_POS(28) +#define L3_IP_UNKNOWN_PROTOCOL BIT_POS(27) +#define L3_SOFT_PARSING_ERROR BIT_POS(26) +#define L3_PROTO_UDP_PRESENT BIT_POS(25) +#define L3_PROTO_UDP_PARSING_ERROR BIT_POS(24) +#define L3_PROTO_TCP_PRESENT BIT_POS(23) +#define L3_PROTO_TCP_OPT_PRESENT BIT_POS(22) +#define L3_PROTO_TCP_CTRL_BIT_6_TO_11_PRESENT BIT_POS(21) +#define L3_PROTO_TCP_CTRL_BIT_3_TO_5_PRESENT BIT_POS(20) +#define L3_PROTO_TCP_PARSING_ERROR BIT_POS(19) +#define L3_PROTO_IPSEC_PRESENT BIT_POS(18) +#define L3_PROTO_IPSEC_ESP_PRESENT BIT_POS(17) +#define L3_PROTO_IPSEC_AH_PRESENT BIT_POS(16) +#define L3_PROTO_IPSEC_PARSING_ERROR BIT_POS(15) +#define L3_PROTO_SCTP_PRESENT BIT_POS(14) +#define L3_PROTO_SCTP_PARSING_ERROR BIT_POS(13) +#define L3_PROTO_DCCP_PRESENT BIT_POS(12) +#define L3_PROTO_DCCP_PARSING_ERROR BIT_POS(11) +#define L4_UNKNOWN_PROTOCOL BIT_POS(10) +#define L4_SOFT_PARSING_ERROR BIT_POS(9) +#define L3_PROTO_GTP_PRESENT BIT_POS(8) +#define L3_PROTO_GTP_PARSING_ERROR BIT_POS(7) +#define L3_PROTO_ESP_PRESENT BIT_POS(6) +#define L3_PROTO_ESP_PARSING_ERROR BIT_POS(5) +#define L3_PROTO_ISCSI_PRESENT BIT_POS(4) +#define L3_PROTO_CAPWAN__CTRL_PRESENT BIT_POS(3) +#define L3_PROTO_CAPWAN__DATA_PRESENT BIT_POS(2) +#define L5_SOFT_PARSING_ERROR BIT_POS(1) +#define L3_IPV6_ROUTE_HDR_PRESENT BIT_POS(0) + +/* Debug frame, otherwise supposed to be discarded */ +#define DPAA2_ETH_FAS_DISC 0x80000000 +/* MACSEC frame */ +#define DPAA2_ETH_FAS_MS 0x40000000 +#define DPAA2_ETH_FAS_PTP 0x08000000 +/* Ethernet multicast frame */ +#define DPAA2_ETH_FAS_MC 0x04000000 +/* Ethernet broadcast frame */ +#define DPAA2_ETH_FAS_BC 0x02000000 +#define DPAA2_ETH_FAS_KSE 0x00040000 +#define DPAA2_ETH_FAS_EOFHE 0x00020000 +#define DPAA2_ETH_FAS_MNLE 0x00010000 +#define DPAA2_ETH_FAS_TIDE 0x00008000 +#define DPAA2_ETH_FAS_PIEE 0x00004000 +/* Frame length error */ +#define DPAA2_ETH_FAS_FLE 0x00002000 +/* Frame physical error; our favourite pastime */ +#define DPAA2_ETH_FAS_FPE 0x00001000 +#define DPAA2_ETH_FAS_PTE 0x00000080 +#define DPAA2_ETH_FAS_ISP 0x00000040 +#define DPAA2_ETH_FAS_PHE 0x00000020 +#define DPAA2_ETH_FAS_BLE 0x00000010 +/* L3 csum validation performed */ +#define DPAA2_ETH_FAS_L3CV 0x00000008 +/* L3 csum error */ +#define DPAA2_ETH_FAS_L3CE 0x00000004 +/* L4 csum validation performed */ +#define DPAA2_ETH_FAS_L4CV 0x00000002 +/* L4 csum error */ +#define DPAA2_ETH_FAS_L4CE 0x00000001 + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index ae2549b..9c0efcb 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -310,6 +310,28 @@ dpaa2_dev_tx_queue_release(void *q __rte_unused) PMD_INIT_FUNC_TRACE(); } +static const uint32_t * +dpaa2_supported_ptypes_get(struct rte_eth_dev *dev) +{ + static const uint32_t ptypes[] = { + /*todo -= add more types */ + RTE_PTYPE_L2_ETHER, + RTE_PTYPE_L3_IPV4, + RTE_PTYPE_L3_IPV4_EXT, + RTE_PTYPE_L3_IPV6, + RTE_PTYPE_L3_IPV6_EXT, + RTE_PTYPE_L4_TCP, + RTE_PTYPE_L4_UDP, + RTE_PTYPE_L4_SCTP, + RTE_PTYPE_L4_ICMP, + RTE_PTYPE_UNKNOWN + }; + + if (dev->rx_pkt_burst == dpaa2_dev_rx) + return ptypes; + return NULL; +} + static int dpaa2_dev_start(struct rte_eth_dev *dev) { @@ -517,6 +539,7 @@ static struct eth_dev_ops dpaa2_ethdev_ops = { .promiscuous_enable = dpaa2_dev_promiscuous_enable, .promiscuous_disable = dpaa2_dev_promiscuous_disable, .dev_infos_get = dpaa2_dev_info_get, + .dev_supported_ptypes_get = dpaa2_supported_ptypes_get, .mtu_set = dpaa2_dev_mtu_set, .rx_queue_setup = dpaa2_dev_rx_queue_setup, .rx_queue_release = dpaa2_dev_rx_queue_release, diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index 25574c0..c1ea33a 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -49,6 +49,88 @@ #include #include "dpaa2_ethdev.h" +#include "base/dpaa2_hw_dpni_annot.h" + +static inline uint32_t __attribute__((hot)) +dpaa2_dev_rx_parse(uint64_t hw_annot_addr) +{ + uint32_t pkt_type = RTE_PTYPE_UNKNOWN; + struct dpaa2_annot_hdr *annotation = + (struct dpaa2_annot_hdr *)hw_annot_addr; + + PMD_RX_LOG(DEBUG, "annotation = 0x%lx ", annotation->word4); + + if (BIT_ISSET_AT_POS(annotation->word3, L2_ARP_PRESENT)) { + pkt_type = RTE_PTYPE_L2_ETHER_ARP; + goto parse_done; + } else if (BIT_ISSET_AT_POS(annotation->word3, L2_ETH_MAC_PRESENT)) { + pkt_type = RTE_PTYPE_L2_ETHER; + } else { + goto parse_done; + } + + if (BIT_ISSET_AT_POS(annotation->word4, L3_IPV4_1_PRESENT | + L3_IPV4_N_PRESENT)) { + pkt_type |= RTE_PTYPE_L3_IPV4; + if (BIT_ISSET_AT_POS(annotation->word4, L3_IP_1_OPT_PRESENT | + L3_IP_N_OPT_PRESENT)) + pkt_type |= RTE_PTYPE_L3_IPV4_EXT; + + } else if (BIT_ISSET_AT_POS(annotation->word4, L3_IPV6_1_PRESENT | + L3_IPV6_N_PRESENT)) { + pkt_type |= RTE_PTYPE_L3_IPV6; + if (BIT_ISSET_AT_POS(annotation->word4, L3_IP_1_OPT_PRESENT | + L3_IP_N_OPT_PRESENT)) + pkt_type |= RTE_PTYPE_L3_IPV6_EXT; + } else { + goto parse_done; + } + + if (BIT_ISSET_AT_POS(annotation->word4, L3_IP_1_FIRST_FRAGMENT | + L3_IP_1_MORE_FRAGMENT | + L3_IP_N_FIRST_FRAGMENT | + L3_IP_N_MORE_FRAGMENT)) { + pkt_type |= RTE_PTYPE_L4_FRAG; + goto parse_done; + } else { + pkt_type |= RTE_PTYPE_L4_NONFRAG; + } + + if (BIT_ISSET_AT_POS(annotation->word4, L3_PROTO_UDP_PRESENT)) + pkt_type |= RTE_PTYPE_L4_UDP; + + else if (BIT_ISSET_AT_POS(annotation->word4, L3_PROTO_TCP_PRESENT)) + pkt_type |= RTE_PTYPE_L4_TCP; + + else if (BIT_ISSET_AT_POS(annotation->word4, L3_PROTO_SCTP_PRESENT)) + pkt_type |= RTE_PTYPE_L4_SCTP; + + else if (BIT_ISSET_AT_POS(annotation->word4, L3_PROTO_ICMP_PRESENT)) + pkt_type |= RTE_PTYPE_L4_ICMP; + + else if (BIT_ISSET_AT_POS(annotation->word4, L3_IP_UNKNOWN_PROTOCOL)) + pkt_type |= RTE_PTYPE_UNKNOWN; + +parse_done: + return pkt_type; +} + +static inline void __attribute__((hot)) +dpaa2_dev_rx_offload(uint64_t hw_annot_addr, struct rte_mbuf *mbuf) +{ + struct dpaa2_annot_hdr *annotation = + (struct dpaa2_annot_hdr *)hw_annot_addr; + + if (BIT_ISSET_AT_POS(annotation->word3, + L2_VLAN_1_PRESENT | L2_VLAN_N_PRESENT)) + mbuf->ol_flags |= PKT_RX_VLAN_PKT; + + if (BIT_ISSET_AT_POS(annotation->word8, DPAA2_ETH_FAS_L3CE)) + mbuf->ol_flags |= PKT_RX_IP_CKSUM_BAD; + + if (BIT_ISSET_AT_POS(annotation->word8, DPAA2_ETH_FAS_L4CE)) + mbuf->ol_flags |= PKT_RX_L4_CKSUM_BAD; +} static inline struct rte_mbuf *__attribute__((hot)) eth_fd_to_mbuf(const struct qbman_fd *fd) @@ -66,7 +148,14 @@ eth_fd_to_mbuf(const struct qbman_fd *fd) mbuf->data_len = DPAA2_GET_FD_LEN(fd); mbuf->pkt_len = mbuf->data_len; - mbuf->packet_type = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4; + /* Parse the packet */ + /* parse results are after the private - sw annotation area */ + mbuf->packet_type = dpaa2_dev_rx_parse( + (uint64_t)(DPAA2_GET_FD_ADDR(fd)) + + DPAA2_FD_PTA_SIZE); + + dpaa2_dev_rx_offload((uint64_t)(DPAA2_GET_FD_ADDR(fd)) + + DPAA2_FD_PTA_SIZE, mbuf); mbuf->next = NULL; rte_mbuf_refcnt_set(mbuf, 1); -- 2.1.4