From patchwork Tue Jan 17 18:52:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 19599 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 6BF72FA5F; Tue, 17 Jan 2017 14:20:48 +0100 (CET) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0042.outbound.protection.outlook.com [104.47.42.42]) by dpdk.org (Postfix) with ESMTP id 39275FA81 for ; Tue, 17 Jan 2017 14:20:41 +0100 (CET) Received: from BN6PR03CA0011.namprd03.prod.outlook.com (10.168.230.149) by CY4PR03MB2470.namprd03.prod.outlook.com (10.168.163.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12; Tue, 17 Jan 2017 13:20:39 +0000 Received: from BN1AFFO11FD013.protection.gbl (2a01:111:f400:7c10::112) by BN6PR03CA0011.outlook.office365.com (2603:10b6:404:23::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12 via Frontend Transport; Tue, 17 Jan 2017 13:20:39 +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; nxp.com; dkim=none (message not signed) header.d=none; 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 BN1AFFO11FD013.mail.protection.outlook.com (10.58.52.73) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.803.8 via Frontend Transport; Tue, 17 Jan 2017 13:20:38 +0000 Received: from bf-netperf1.idc ([10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v0HDJ8mX021741; Tue, 17 Jan 2017 06:20:35 -0700 From: Hemant Agrawal To: CC: , , , , , , Hemant Agrawal Date: Wed, 18 Jan 2017 00:22:47 +0530 Message-ID: <1484679174-4174-27-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1484679174-4174-1-git-send-email-hemant.agrawal@nxp.com> References: <1482988612-6638-1-git-send-email-shreyansh.jain@nxp.com> <1484679174-4174-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131291328385982100; (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)(7916002)(336005)(39400400002)(39450400003)(39380400002)(39410400002)(39850400002)(39840400002)(39860400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(8656002)(104016004)(92566002)(2351001)(54906002)(106466001)(48376002)(189998001)(626004)(105606002)(50466002)(110136003)(86362001)(85426001)(356003)(8676002)(305945005)(81156014)(81166006)(97736004)(8936002)(33646002)(50986999)(50226002)(76176999)(5003940100001)(6666003)(2906002)(6916009)(38730400001)(4326007)(2950100002)(77096006)(30001)(47776003)(36756003)(68736007)(5660300001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB2470; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD013; 1:zYJik6jeQFa6u2MFzo32NKkccNN9ME6OGx0OvsUCHgvG791BSUlyiGPeISyRFWXwta6GTEmTLk2Rdzk+d5AH5oKaMfqKbuUkkh3aAyErj2c9VKgieY1kN8ASplsYPJDOkVjGh6BgNb1g6z2wHsS3d4WASWg/8h4ljN9XsnOlyyfc9jh4VEUaAmYtaIQmZ9WSM9OtCHv8qWtVYLgMClfn5d657JK/Ro/6O64X2mVlGh++ZxTf+xgUFGLHWU+tyqRFKu46r4XTX8FvM9oXqTxSGkKhylzFz8cMgSohAfUYFv9POB5c92jafqT26FMcRl4imT4YEbH5qFgd1T0BjnglJz0Tmq9NfWCrYcELd4bEMTBWTxWNWPAdHtmFsp60hgwOlYlbgcOBqzjtvrUUMUUL+TF2bddNSFxhi0OJ4cCYWezdk4nnPfXv/IHXcE/z27x6lichu/tEfaTkn9sQjan4lOs78z/+FTplnwYeHIpr3dWKadj0zt/540/vLppvdSarTf71Uea1/VeSTTICTfdUEXM1ROip8rFZqvwmEdcSUOaBZC/lT2iZPYNma2mU+C9lnr9c5kjc4LxQ0o2GjUXdDKZ0+wErMGjKOE87kQU4z/EgoS3O1qGEfnSuGzG4zOODFhsSKBxA2v5oWVfHOL8x1X/Ps2sxONnTBmeUQ3WUSkHxujCMDnw1ePdz6lCVc0bjut0bNgBg4CJ8rLZ48qG1wQaZLIISp4dSDRxDvm1Su2BIYLdluD0bxDC/8xQvJQxg MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 142f5a2b-25b1-40e6-bd3a-08d43edba0fd X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY4PR03MB2470; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2470; 3:EL+5oiCOgzws6hN1HHJUIArpEKISESLHz56zWUuTd9fsY5XzGp0/tXY34mz6qmTOJH2fbrx1iOBcMghzEg5/u69B9bPPCyx//VPXhPNy4uqg0g/0eOu/2FePmmhJYfXdbpsw4dqEMviwsW/7ZrO4xk8ZKywhbeTYPB5JVW1YKpqm5LqsHpSaqKuGgoDpY5LF7KyIV6uCU8MW6TKcgRPkzVWJQ8sJNI1WTwPKIKVS+8o1vCgb4h/iR+24grKTHSmf4AbWgJPUD1II2rMXfDp91TGZiD4zQgVqxShBB4sR8I8sLC/EKN/Ee6JTVuBvgrCvD4azHzWPDwDFnLBFkUNaNkNNCEw5KG8ISgW1HDRI63JUqnCIMjGYs7Mzz+hLLqwA X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2470; 25:tLutLl5W9Cppw8cfB4CfN+Cz3sqfePy+SLOTfeubGAhPKim3oEXJ6u5sml9JO3ekt3eSu+dadx58nBUENsNywSB1qguVyE3rRzVCRqHYor82v6KJDkcTxQinEFxntgsUXIxZQrGCJnV+47b6GqvVW5dLruGG8ILz5nWaIZN+txVKQxZ8Nlo1ouUZ8oBBgoFqzRHdd0pxjllwj/FKx2FVRVTLoV2BzIdKXojbknpBLVIEmH3qxduZzAjR3tJKSkAVeVXW7v1Twbk60TErmm3fLZm523pyLYrfZjmrqRxlXmUk7HYQUk0cwlCZdNVGQRw4syOu6/BJ7JoAxbTkyXIFqpaynUGC2IpHMMXoRk4puoXWb6gbmmpAiCpmqWhq6dpZpbMjGsBtAY/x6lNyZQYYHHdQJfAmiZwXKhN1QlcnGwRcUE6Ttauv6iXCRqct6g3V1PUooL1nPat1US+hVFCgTGkcC9Sr9xq5u/AqAn2FO+4L0VOQU6yNTWPRTle9xHZBlH5ko/ivCqsz+Q+3UmmiizpvGIi4XYlLVd16gpWNuKkYFFkHD5WJLA8fS9GiG+rvEQkZOOr9fmxgpqTWWWR2VBtxidAwGjDG7m4FU8n3ySsnLHtGL3q3xeU9roNcMsl08dY1Kq5x18rBT+DW1vUjW3+Y5R5L7yv99WKqQAArVWkTckgqM3HycewD3WodipkMYrRZCF4hU741FJBJNJjSG0Kpuwp7c5MKS/Lad1E77icQWuuVxdc6RoOw/LpXO/dsQx9F/GwG9MlynMMFLXex41SVd/leUoLYChlmE6KlFHs= X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2470; 31:LLPga4lxg4suAFA1qzPd7/12OmqiDZU/24stOBcla5M1tv9Y9H1XFTlE6CRSBwY4TXjlmx7tW6/51Erv4EFV1Xzb3PUVCuszYjNjmrZo/Hvlk6OTDsMKERtcZxtGm+iYDvVy9/1loR1OjFwUK9c77s2H9KKlg1Av55qcZV8M30fdsYiYChoWohtwBl69HgYGzX5hhWRJrwC2BN4laQavC9UuXhDk6O2WUQ2POarzQbv1SFBviHx0t3/gubhxhrNPfeb6wWUe82HRL0naJVJDExm5pQMCCq1itW+sI6F4E9E= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(5005006)(8121501046)(13017025)(13023025)(13024025)(13015025)(13018025)(10201501046)(3002001)(6055026)(6096035)(20161123565025)(20161123563025)(20161123556025)(20161123561025)(20161123559025); SRVR:CY4PR03MB2470; BCL:0; PCL:0; RULEID:(400006); SRVR:CY4PR03MB2470; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2470; 4:n3RzeO/GbldQWtWxFGXjPLiFFkEvusaDPpPEEbVJxZEJ59gg5JJfLId8T79RHGc256ckwWR3Rr0h76uSkf5M8X8MnE5W5Fc0h+Y1Hevhv4loZWlCqdn4M9lPjgVU6SiHbu6tNvqrvTmxmRjUBTdZ9G5iCrbg+eoYkSJlsFW/kz20vNHulA8VUcUs/FeQagLhJ84qYOrLheC7clRXVyUEL3UugU2/bjOUXUYuE4J58yWEAzeUx3agRoF/XlpDp1tFdyJ7KBNCqeAU0cUsBCqMTQuh/U2K8p6FWawP790iZq3Fw0GT3T4dZARLWqwYHVR6v4hA7jXGmjWU/lZw2b1DLZQOlMDcmzim01aGjjzWEeiawC8pujwd8qE3H3rrpQxxpP7AI17+gOX39Rl6YIESbhaLCBo0FrrZtI/q8NJPcBmFsHSL+lgO5y0ocOoT0HWBNafR0IkhnCEuKmxm5j77lRiaBYwbuBYg5HehJ31631oXM2qB2UDMxCHtG/96/bDBsDVzJIAsn8CpVuIc4Dtw4IFIBxQbAbI1ILH2I+96KMTPz6vRV2y3xNZGlut4q5SC35aKDEJAgxXfKjTUdpFuJMI2nsL4F1s9KmyynPrlUmDAGtk45vz3rk/CKU3UvCEDyhGZ+smvWUAp6tsuvjesV7MK71hTM1WxG1Gq1YK++y8L2LnaclAqmM8HcBnzH27r56l/32f5w0XPgE6lVFAlJ9nxmCIl01X+SMZFQJnfkE1iXyuSLgV1PsLLUa1dzTMS X-Forefront-PRVS: 01901B3451 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR03MB2470; 23:363DV2wi18Dg4i8MCMLlOG/AVf+NRZKDaR4ZmieqR?= Yn8xrfkVahhjSpy82n34beTyycWSHR8J79pQH/sLTX0xDlBOPvB113bmpxr8GllPEMkbPY1DCoBY3D3FCQi59vlneWURSloQNEfO0jfue0ras0IDKsrX0SXSXECl9WtrwP81f6/e8dm/jyoOeM1YLjPoKkZXLSCXZm1M+kNri3A0e9NJOacTHoSYgPxJMZ1NsZAcfB15tsSchXLjnQIPZCRp8+5UItMQON+FBj1hi4PU4gn90s7OBPDcoYcXuaEzEE9OnYnA1/HBgfoKkmkXvtdpPOh2ZTb0r3Bf0sAhlI0Xi24duQkejg3W8/WdruSxsXNxe/wEY3prC/BKKdTlmKBLy+RAY0Z7hDUOi5K14JYWFacLkBCFJKHLEcAZhaqg9xipI8YyASrEj+9rsAkVPHUGe7/ccwApMwXo9AYYCORhRlUFMKkYKhium5UjrLlJz1BuJsybS7L7JdpEutNv11G2hATBtJY8pqj1J6sOdX0Toy7bHMzV5Qy0/UueZNbngdjQom9gXmIZ4R96koSLZ+7PJFkM4NLtwsvcHL0xBEs+VVk8bUyy5Q2JvnyrCAnqUrGRd+Gr+AKhTBiDv/GLk2PegBplskD4+NJ0aH2I7hUeqDGePDCz7ZylQZz0rBUIyrhJSIU1alEC7rPV38tQTcfcR5syLheqvklj+2NBd6TCRk6BjxZyXagDnsev8z3yiTG0NUTYQH9ajso1gJ+kRGUXO/LEdcuP3evZ17/7xmNQQI+hBq1edYft2KyC1y1pL+bQgWyMH/jvmm7Xro2Ppaw3NpKbZXrOsXcPYnfW2XPNBPwbnKikthfyPTe31f6ijUea7KV078yCaVVDIDUgY0Cl4udyjzoClCZtdddfIr//WjrEVNK9nMfCgXrY8S+/mYW5rMtqYfFsSl8MJkfY2tdQ5uaaP2+2adm46idW07A4b1mc7EE9Ln+qgSkalhAWyO1wPl5qziPIb5K2DbOVCB70ldU5q+zTS6+Z/AO46CH4YWuY7bc2bRoGp5KXJ+RM8vTlSf7tq97yq6nlsPKvx4qqGd3u1YnF3CgRcm2Ub5rQBYqhetv2lmHAStIYOXxLnYmIDYrQrzVQbbtIzva7v1ECb70nzo4Gno41xCrxn/9QTZriSr/g5ZAUPGzrp7DBK1FxaXWmETeCCOhe8zqvSFNhhCJkPJogx+RQdVTwl6NbLXfnR7BR1xmZdPjcXO9Wgtk2TaKMOq2iVRhTl+1lUBnW7IBqsJLA2En/k81jGjgAg== X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2470; 6:Uitl3NNXsk+0VjmL4sFJrkoGSQ+/Bzr/uYRwZpUjYD6TnM4fkEfhDzpat0P3PQJLgt9BklDAfN2BzE1FM3zbj719mspqPbF9Kgo3p9UDWqs2LcvWsdnNggj6pklcGvni9yh7R5zyHDmMJhv6lAOclVxhHrvxA83cj3bbbaeX3hmNVG3LECIdu6dowdnR+75uZkPit+ARX/nr/KkUCQspzeSIgPS4WfZfBlnVofCAOagjFfLo0c06hKWEpsbUKUe+sOCLnMK4dYsTDpfkbDWoAyUx/mD2owSgo0CtOpZr0Cac6HTEQBAo2IQoch0+HIRdky+s/LvusGevnC5g0BRscmzpx5qGd4iYTJeId4G38YZcJzL2qtw5eOlB8cKer+RO8EZmb1mViZpVsM+orEAVd8GuMgVsfLR1BScRUwHF8f9x0arwt7iVJB+zKqMwUW26; 5:QfeA9Z5l0KMx6OtwXH0Hre5My95glGfj8CpVXsKilU3fGDnWixztpSS/he2nRYvEuNGGNu+F7vD9E3dvIJGpNcUUQ/S7RnSmu4w4nfAWQ83jwcQ06ZsjNusuifSbOdelKRhf8j8RmzbmV/IQErNrzEiQ78URjU3T5iZFD+qrD+6nxX1NGta6ohQ4zGl0mHaA; 24:6LbBtn+nkGo6YcPtHuzMRWQTcGsVb8fBCV7TBZ2u4CqMqa9WEyo6tjnbrSoY/22PBgXpnlW2Yrlh0Fs9hMuziOUv3n3Ij84ddbXOQIz3yTc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2470; 7:p/mBJkR0cd4+GTxp4brgbZV+VDp464GVryCgrEnqVuLrU7tsf8XmZCenFsmO3HA/ajJXYuwtK1X8ZuHD8rvCqMGdiJcUEVFIkP+IHQ0iNCYtgvgA5EZKpXjJcf82J10ovJJBmB2/BF/IpweYLl5cxX07aofksk8uIWDQYzPjVka/kyApD+/BOACXKCWPzG8TD8VsCAoCfiXdOt5TOFQzZQbyc+E/wqUZ4CA2l3Y3ZpPBfWnX4M3nBOIZ97ZUSDbjB09KvkfeFrBaKYOj0vQuvEQi8lGt8gJxZENL7RqsaYtX5nPM8121/82tpSfaoZlhwvILrHMRhqekYGT8ECewEFV9wWUlG7kkcWcgy65OWDlsopIAQQgQv87Ua8XJDqA6YmGEkHI/zkJhZ1J1jsbyq/ZrFcB11f1vXChj+XAqFdqfNvy6l7HwTTJ1xQvnfXhpdtpL1HoSAe7MmJ1fQITlhA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2017 13:20:38.4110 (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: CY4PR03MB2470 Subject: [dpdk-dev] [PATCHv4 26/33] net/dpaa2: rx packet parsing and packet type 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 --- 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 448aac7..cbcf806 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -311,6 +311,28 @@ 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) { @@ -518,6 +540,7 @@ .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 4b76be5..7d73bde 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 @@ static inline struct rte_mbuf *__attribute__((hot)) 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);