From patchwork Thu Jan 19 13:23:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 19813 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 5E6C7FAE5; Thu, 19 Jan 2017 14:26:16 +0100 (CET) Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0040.outbound.protection.outlook.com [104.47.38.40]) by dpdk.org (Postfix) with ESMTP id E4283F957 for ; Thu, 19 Jan 2017 14:25:41 +0100 (CET) Received: from BN6PR03CA0045.namprd03.prod.outlook.com (10.175.124.31) by BN1PR0301MB0740.namprd03.prod.outlook.com (10.160.78.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.860.13; Thu, 19 Jan 2017 13:25:40 +0000 Received: from BY2FFO11OLC005.protection.gbl (2a01:111:f400:7c0c::130) by BN6PR03CA0045.outlook.office365.com (2603:10b6:404:10c::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.860.13 via Frontend Transport; Thu, 19 Jan 2017 13:25:40 +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 BY2FFO11OLC005.mail.protection.outlook.com (10.1.14.145) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.803.8 via Frontend Transport; Thu, 19 Jan 2017 13:25:39 +0000 Received: from bf-netperf1.idc ([10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v0JDO4f4015351; Thu, 19 Jan 2017 06:25:36 -0700 From: Hemant Agrawal To: CC: , , , , , , Hemant Agrawal Date: Thu, 19 Jan 2017 18:53:53 +0530 Message-ID: <1484832240-2048-29-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1484832240-2048-1-git-send-email-hemant.agrawal@nxp.com> References: <1484679174-4174-1-git-send-email-hemant.agrawal@nxp.com> <1484832240-2048-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131293059398497771; (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)(39410400002)(39450400003)(39850400002)(39380400002)(39840400002)(39860400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(33646002)(81156014)(105606002)(81166006)(189998001)(8936002)(8676002)(305945005)(50226002)(97736004)(86362001)(2351001)(356003)(5660300001)(68736007)(106466001)(8656002)(77096006)(53936002)(104016004)(38730400001)(54906002)(92566002)(626004)(6666003)(36756003)(4326007)(76176999)(2950100002)(6916009)(50466002)(110136003)(5003940100001)(85426001)(47776003)(2906002)(48376002)(50986999); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR0301MB0740; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC005; 1:uoUZwRarzOPq0Qeu6khSQSHTaTAgPQN9T08U8FOVsld1Oa7bW2b9cpTVQbW9lCd2pR4MB3s5f2cB9hzO6KrHFMB/b6W0ljs5VxsTDO7IBkmiF6kn4siaaaU/UjlI9fS0EaBTl6yg9LdyLS+VIyDS8euMyrX52MOE0R5Av/DvKIjLv3BY8HA/0StjlX/6RWMQRFp9GmjsB8XZeLINYADdTrhId1RIY45ngtxM3RFYvw8VMbSY94WLPIms6pEyorophT+Lrqxn9qniU2RvCd8EuJBt6znDoROLl36gGK6zLrWzKtaR/F4Nw3ORjtboPkbysnBRAGWF0njZnc0HeowADJrAxplDZPe6pTzyf/pF6ZOy5nVHk6HRtoWxQvb3KZO1tTKoXJcnleuuFBxiqABKJc1lf9MQyhiPu4iK2avfY2pYzy3v01f0qHAQOsg04f+MYHzUYlu13C3tsCEo1p42SxlliP593qw6hTTzj9KYHoTuC37/adJQwEWS6yr5JlH1+PtATjREvZ3uhtBnrAdJw+81QrqMX6P/Km1eRy6bY3ElGKf7ZUlCpuN0P3G83TzcJ6Q4RYcegYtoL2vus4uJwnvR2ehKTNfSsQS6d9WkkLiI3unJnjX05AM55pVkzWyPLTajm8TcpG8l0PHiqPt4vp8y70cDIraSoRr99l8M/jGzPOOWkU1RlImpA8u6GHQpgRo0s0GhAyuju6Lb6gWX4EaX8DSqPGbbmvmiuW/1vBrMxB1yrYzdI8SjEVOoQ+hy MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: cb2e1271-b5fc-48d3-f5eb-08d4406ea962 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BN1PR0301MB0740; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0740; 3:gcDiCb5WwvYIfUsjiHM9C+SvpNCXtOMjM/5tn+hSwB7RvOu68hMmvrFeJddc95m7PSq4gABJ4Nm8dm/R6xMn7VEyoe/oZ8pxvXG8LCS0qQh2YEKTX1FYsTQzCUMVc8uurolayuNTYS8oqRHhOa/Mh1uFB/KFpf6g928GdY7+TiCwfTalwUUv8dtL6b01NJavi+7b3widzROWUoEWpOHFK7oga2Tv1gJyACqcthl5hy1seNnC4zg8lgf+/x1pL2mCAfiYOERk+n9QkoACZkc+7z9ZS3d68Nlvd3f9JxC0cYu+4Dor/nIPx6EmCGQyLuXC+ttX39VD+YRIG+8yJ1GoxSDdiepTuh3naFXRkSYwcqftS54TlzzrN/2/bl4jsZOd; 25:zWZLvCWL5HzJJUkz3a7F5ocQ8oHNrmLd/6rH6Oa91Sj3f7QHdnGnHZuqFBZCMp3FGFn6ggRdnhPjBi3eTeIkmJg1RKk+Dw/ULCYLMEOoFp3R1JInBWTK3+SV/rXnvlGOc8hajfXYq6jGNWHykcVao6rws9TbUz+X6VfWy6MFYND/yn6fCbfwnEf9ynNWqy32e5zAKKVGt7P80KQphAlaSqmn6LNUWhc8jDKpQZtz+Fvy9NrVfSThLmOwGnZc7pPvALziPtKEljNY/XO0w1IWsg1/PmFkISAV9hqVlMBR294QEZMeKHfoB3wNvsDjWifp/eekLE7i5D1CbPiiAG4Eq2vQ7BZFU9OS+1J7dfd3c4h6/4guOwZmsn5+Qm3SirnAAYClfVYdtdXWH0ltGc4/veGn63ZH4H9LzVyGnbO7KThXwZtGx45+abgYOG/ZHKnLXmQJve+G3aVRJbsrtcbdBQ== X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0740; 31:yGGAUGBnpXDc18MNDfpV5pJJzX8L162w+s3i006rTvRsleNajoLrF3A/tb3t6dxxy+D9uvMH3KJ/AygMG7vJhXWUS/Lidm0DTXAQtuhYZZCBccPlK5GCjsmARqgERa24aqlWNK3oUT5UwN4PohugLbTkViY3oZoZZX7VqBj7wdiR0Vquer3+c2cR5i4vfIdmonAsFjyGLRuT/M1nSxW9HYSGMcWOcK267oIG2slwSpi3biob3cushi76G5LaolrLEKFMjJLowU1TvUrLWDM36idDrAXUAXmwaf+Y/iFZsTM= 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)(13023025)(13017025)(13015025)(13024025)(13018025)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6096035)(20161123561025)(20161123559025)(20161123556025)(20161123563025)(20161123565025); SRVR:BN1PR0301MB0740; BCL:0; PCL:0; RULEID:(400006); SRVR:BN1PR0301MB0740; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0740; 4:KxSyi6MMQPLe2awQY+SdFD3IHVQp5N5YBUMc5KFNtmfESunO6DDzlTQzlKLQbdPaVcZvWuu+QQO6M+g26b2aWN8KuZwfuipnWzl1/qGnikZLu5HYdWedgfCDssubh5UDXqd68AvL0t0pzoY2CMWw2v6bgbvSnfPiFJLS4EQQuAJ6LL6P5QFsZZriDYKt6HVm9xXa+kzX/oZ5Jrl1UkEYsvM4BpQasaWdrVfal3pvLb1Q0spD3PGiqcbTPoG34IuBgXHjg0bG+A669JyXzF+Q/735fNGwkVkJOXMMQwjAEjKMX/4PZtzuFnwPbwpmDe+Q63ppxPXdz4nWMHCnl1Q7iA2TZ0GEs2hrdeg9RFDU1+pyz2AYsF7/J8wRkvq0VR3/CUeV4gEq0dk3uO1m9q+cW9WeeCF0hNs0LJ8sXMfGRNDsZBcYBqn4WjL10gXuNfDCUpDhkf5ZBMtQU7IILBZw9ZglGetxYlQqIJdkzVDfPTf51eD1sRs3fhT9gMOydCQOIPrk7118HavG9P0jUCly4OIl0GXmrcZOklwprcJLN2eWLfxbdLlNewkxYnr53iEfoi3+m8WwU8vI0cy0DvoJpGuWdLyBxMY70Id2JamyTM/veUbxbBpgXckHAjfsNMJ908XVz5cup3WcapaDAf+oz2wA/Qg7Vcch+o1go5PdGRUGFnFCfF/hml/sQbX6KE/T0aT20vOchp1dyprtxwnfkljJ/NM1ImaS0Nz73g4l2OOekgYgMVVy4FfUPxBH/dS+ X-Forefront-PRVS: 0192E812EC X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR0301MB0740; 23:003hlLvdggxL+gfsG9JiBWQjMzsI0OFfkz9TxDh?= FVU3++oGnKw0xZbREKa1NK5842C07Q3B/dEKWRBYkPyKYqJQeaxVqtdTBMSaWV+ZfHMrxKrWGNFvjP0vr2ZmQ2lfJIv9ofE6vSLp9nKxlCOKIYIxo1vRwaVNn6m2OniNXrllmKP2ZAhQ+n8M0LMEBrkcvifRttKLtR/x4loeuqC2HAqglhsxK4cqbqIhbnTpyzFrEe2G4jfkyV/xci7SSrdHmaydyAuPbJFj92NBQec/e6i1zfVut1J3rzKsEsA8HGvn1DJHICt2fRaYGq+02KOkqU8suaGLDWZXsnjoKIzumKkV0mvoyjZwbuVpMF8ATUe73kw5Cd3po6Jb9by05shcon2mqufuIb3fYdRF4aKlhMWtvPje2UUjLBil9XeULn+Yuj+YPFCFQIx7Mnez+Zbe0gM58Tcs2KLtET5Kg/gHnBUtEbOFyUZmbIzGuX2ov+1DWa3tzm/+2xIiZFlZ94nIx1KqbFKU8k6ydVFzeWt4cG+hjZV0/WPYA0fHf7z3/3iEJle2ocm27/Xu2bHh0gsaXyOFn75U981a8JPX4doY7kMvwk06SPUSJrzEqlZQxhRS1GOtiDF9PHgGkaHlbjfFiNqEf26CIVyN6RczQbajRcAVZgf2UJf0JyNUeTqXBx3imx2bhZe6DOXjGPIr5iQE6zvF1Fnmd6umVN6F7F1sIFiH0DgwV6sy+6MAPAO2grfUt2gwgzx49w9UbIO2/1uKNX4gLGvDWNddq2BRxzOZkehJKTEO36VBIwG+fD2MzQPGduWphRe5aKE97IrNqoz+8xgkrQPIkVov2fEP9eInO5aXyX+wmNCCO8m1ft/2mOJqoKXNcWLREqG9bPIGOb9Nh+8FRa5v8y2qH5bZxOPy+I6G2jCNnQVLZG6iI1Bd2FxcnlqlOb1p/PmAQ6WiziToLg66l45IL4dgw4bFKjB7Q/iVJP+m7vxRQ5tHfXJnkYHzLmyOIYSVQ6Ko+Fwj7BDFf1JwkW0QmpfftH6hfD2U8pRxWjRuQ3TmCYwpyowRCU0QWB4nEFRLCSazEiauqr8oPjq+4sm1gFL/9gzm2vO/c8S8yKp2E5hwsvK9HIEGn0DTKu9xZ4VkkyjGMg82uRWFc3n4DpgbmVUziWatiPlXU/OUB1X5n6Shuq6q48c8/zeAMikhMQ9xspo16TbdXDiUodejEqlFmXvfapi83pK2Yq5Ag2vASfEhc+uA3a9UYF19xI/sWhp+k/MOBAjR1sKdsBdisoMYPpaIHOvlYy1ObWp0enjmWpo73VFzRwW6M9a8= X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0740; 6:jrU6nCcqaSHU+qHi3f5KLXKemVna4B5HpfDgGrJwPcCooLu070y2oRhNoXzQ7sacb99LPZqNPtbseu+ZYNx2KAJDHS8phSxBqFQiAHbEzycGytVnxcND7MLz4PUBe1I9dUywk7IhNkrJ9nI8dcZm41S967ybWzxxvIpoEmGq++JOMXILzNLmLpo+h19TbBx/QOjo2qCW2OYJt38y71yeUVf7bvXJPBmgPWFu8Pd3qs6pnIfefR49rSIKKW9u+pbcP8Vg1RmgWrwBaut9/SYxB+Q12srD8FLfr82bOFsqZQ4yyuTwW6JJwrj3HnK5Nrd4x2zS/Cn5n0ARlFcu8c7KzjeBZ4IhEMGRWcWDIbiVSmaw4wMXhsORq80Z8ZO5qQWRvH5BYamieS9l7M56Lj89XJ4D66Azysw2wzshS+cfQrFbETTbIbxwPYtr4sRKWTYo; 5:IEmwaBfSZGWdzx5jnRkBHR/zLq2qBd3V9cWZhw6AKLY1zGcC1fNdrt/vprhB1Ccj8dQx09WqK8F6sd0Bg6bs0ytuZFEe+pyMMSzdttaY3myw/BLIhMTR2u/ILLv9UkMSlOK3D5+GVWeO9f6QEqZqIOqUBzzCPy5URdiGA+MAdILEFqcnOe/pUASWSTiN+UUc; 24:z+XqY+35krvJLf5O6+vF+vhlgrB7TKBrtIgg5cC/1JsZ8jej0IVOQNxq/ihzhJkbLT7Qi84ZjDB5fmGy5FGKpFRrxcdn8HDblCobdkXAKkc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0740; 7:rHZeeAnuQxKpqg3uLRtoEuI2ObA0GK1a3CkYsKGs5YmyeIkiTX1txwS3SQOeW6CfD0fL/+hCHAUmGxJoajWXP/oL4HfyI93j3hr7rxoj2aT+KOFXKHO+AJnTTaZV5jCTyij9p/gaJY+ahJu9A4tgaJqWYiAyBcZgI+6Hl3ej5E4Lo+FDmdpD4fFxJDO+pH/L5+8ti+nhxsWaffGE8dPzkYVFTOUxxcK9Q/Ci7WrtJSJKN+RBUz2P9ntRLfDb8r5wSBXgFuVO/Bb/zOH9CFBrbw3PJl31jtipBkqbOQLQjMV+kHejX8k69VE4B3ZlpAL392uClhQHPHE+RODwbrUmDlRzMdXQ9WcOusdY176uoY9E5tbzRMk5iVMElbU+BBjwAIlKCtgvHholsBsuRFXrt4ECsa9QJVvxrdlrjvb3MG8Xci00FGWv0yNN5I7rVs2s0+ZU4D8osB/ANzSuFtC/iw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2017 13:25:39.6469 (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: BN1PR0301MB0740 Subject: [dpdk-dev] [PATCHv5 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);