From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0075.outbound.protection.outlook.com [104.47.32.75]) by dpdk.org (Postfix) with ESMTP id 04EC9FA46 for ; Sun, 4 Dec 2016 13:44:46 +0100 (CET) Received: from BN6PR03CA0069.namprd03.prod.outlook.com (10.173.137.31) by BY2PR0301MB0744.namprd03.prod.outlook.com (10.160.63.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.747.13; Sun, 4 Dec 2016 12:44:44 +0000 Received: from BL2FFO11FD015.protection.gbl (2a01:111:f400:7c09::112) by BN6PR03CA0069.outlook.office365.com (2603:10b6:404:4c::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.761.9 via Frontend Transport; Sun, 4 Dec 2016 12:44:44 +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 BL2FFO11FD015.mail.protection.outlook.com (10.173.160.223) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.734.4 via Frontend Transport; Sun, 4 Dec 2016 12:44:44 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:714; Count:10 Received: from bf-netperf1.idc ([10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id uB4ChXbU032240; Sun, 4 Dec 2016 05:44:41 -0700 From: Hemant Agrawal To: CC: , , , Hemant Agrawal Date: Sun, 4 Dec 2016 23:47:22 +0530 Message-ID: <1480875447-23680-28-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1480875447-23680-1-git-send-email-hemant.agrawal@nxp.com> References: <1480875447-23680-1-git-send-email-hemant.agrawal@nxp.com> X-IncomingHeaderCount: 10 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131253290843486128; (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)(2980300002)(1110001)(1109001)(336004)(339900001)(189002)(199003)(105606002)(6666003)(97736004)(81166006)(5003940100001)(81156014)(50226002)(47776003)(8936002)(189998001)(8676002)(86362001)(575784001)(39450400002)(305945005)(39400400001)(36756003)(50466002)(39380400001)(39410400001)(92566002)(48376002)(626004)(356003)(33646002)(38730400001)(85426001)(2950100002)(77096006)(7846002)(4326007)(8666005)(76176999)(50986999)(104016004)(6916009)(2906002)(106466001)(2351001)(110136003)(68736007)(5660300001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB0744; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD015; 1:vz045P/4ihEu5SylvapNmpsSJ9guNoJiNig2WO4YgnjDxzHHq0y0mRUabkrtPewAnUqd2z7Eg3UsHzqKY0s72ZEJWoNdjAKhO85xMAUX0FlOqCbteCImd/40NsKJURXpr833DappqADB2D44z+1f0rLQ+y5Xit7iqiKof5GzXgrKJCcQ+5h0vhuHmcKDdsCLbkUTa+X36hHZBFCy6dYk3JV4rre5eFaZ3j35x8bIY7oSrTsbIV5h0xI0dbFI6IOngPysTNnHA4Cm7L38JeaS8REXs8IwCpHD6GUXJB+NEJ1gmCF+OSyZx+yOhrxCGBXu7NMktZRu8JltWcb3nu1/i32VwIYfDy+9KDtDMK+Z0yn+hHCCckfS4Vz/tFO7DM3C0M5Q2m7vsWErz8pFlbTTb3OQmLOb+oQyDKDZD3fjGUgK/Awstt0jkhb1AQCgPvh/r45C7gKMFE9gavwTyV7uxU835D5ClQB6OTBju3gyoafxc25FuIv6VEK71h9OXSahRmtU/8PRioJL433QVHtDdGFLRzfR4KexUhqvWa56ujz5lwGy0l1na9910dxRwpezkYGafOxmqc1XnAr7GQTxONbmPFZl6b2OwvRqX7NM4+W2g77V2ynLFDrHXXt2soGGZdxjXN1lmvRiadCXaOpxHPxgx4yyX5+9JV+0gi+VQe7CcQ+Gz86YeiMkEJufWT57pnA3532CinM87XZlQ6Gu6K883xk7hC1QlCRMonoNAKoEkSJo5PbdH/HHVmkTCMNU4cFBGGqdx4lNOSpza2AiIw== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 0bd2b391-6e00-4bb9-b7b0-08d41c4352ca X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BY2PR0301MB0744; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0744; 3:4Bysm/br9Q8AxcbjNGQEmOAlj1MJcHia8idRqYGGHAJ53e3nXVr1cfLgtJjil72JTcFDtCRJR3M4ZBEBc55BdkS2ew84duEIxHZ9wbeeCbeCJcyLXpq3hpgFmUukTdlgaMEwmxFbBagm5U8WFUk5aLsIocGkJgTHHqDPYnAtV2ZGkVcOk6Ag/J/dGE6QYnYAml/OQYAA0tblkSkAAkN0mJOPvAQ2SFb83+aA4+i0aOiTDoNx5RRKjVt2dMoO7dEIR7dsSzaM+Los1D1T5Rxg4h9zGrgK3o4bbR8L2xRzR94ZRwAE6B8gHPYP/Y8SA+6nA1BOvSq0X8RT/syeAmEuR2Nl91hGNARICvEXkTz1fjtd/yaRuxhfmZgcRZjuTZad X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0744; 25:cVmpdaVWb5Ylbu+K97zGCtz/47lC1322+SNf4mchxX0NhQB7HiXvru2cLQ4nPbXrX71wI49XOHf+eDSRrxR/hP9lU0D7XAfdQUHOLQSz79/lKBo8hZv5cme6qysHKHb9oW3D0klvephtZ7oESahuJcDVKYKGoPV49hrFd7KuthN3sM0KohK1itQKJaXKwTWUg3ldg7bRE5L3cXr8iXzGljQi8l7/R2mFs9wKjpKqku+No58lYjj5YCwnkPRbOzjqijQfp1vUus1XkO6AadJouuvoBjoKmYvjQaaTKIwhxt3OgWosyL9wU97Z/RP7pgFpLtglZziZJs2rAsnwPpngFRq5ntXt0jQVSHiKOdYIT3Qx10He19gV4fCS+tfbvEKXdruHaH2MVlrVY0K9AKjinThX9G1ykSuZSKqcQHIVoph7Ve1elGhDq5zjqjL5Hkg7+mcq5szST83dzWfCx380tSF+oWKEyKH4q8k8aEFYIAGnneNy6GpML+6AXcoT7pEB2X0MbtUUsPAaIW5KCE+jIuC8LP5HbRgXrQYOS7LKKyoOcH5V/wyqRIitJPj9mOOSnr0rJnsdw2H6MN/59csHxcAvrK/C8MnPDwzOMve7FMnhpeHgO+WGgDuiuXSD8UOlD1UP+AoojoEvsifRSCQV2B4jVcvFJ/wxPgvYqthnJ9CmGsahwQEXEkabcl3m6TOpwtTEjbVhXtZ0iaA0XQ7sLXDan6S9k6q0p+tQ/0twLVRjREwp2lqXHqch+BOXzTHiqFwUkUnIHNj1LtOhi9lalA== X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0744; 31:nEJ7zrPie2VuV7YNTbq5hjp45iwCN6Jh12BFdIKlHQHXpJYjACyGNEKW1uIyywMA/FpNaS2O6H7FxsYRmo7lYOc7JyILd7/A+QNHFRVtgMY7w8jIyGYkfo1o80rQOqPf272vJmwjBWHZ41wxCy7D4DdomfcVyIMWpG3nROLVhNxVFqBt6BVL0R6Z6LSbFU+Qr1OTo4mjbIliC8oZUz71ev/4mE0aVTEvDwjhWM424hXjvmam4N7NvUQObxOoDCx9knKmaTRgxLqxhk7Cow5/r6WUP3SyXjzs32QVAb8WsYc= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13017025)(13023025)(13015025)(13024025)(13018025)(8121501046)(5005006)(10201501046)(3002001)(6055026)(6096035)(20161123565025)(20161123561025)(20161123559025)(20161123556025)(20161123563025); SRVR:BY2PR0301MB0744; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR0301MB0744; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0744; 4:9epgt5sr9aGPZgLIemU+UJYqOD9l9pu6I+pApcondfW4MaZXY16W9nhvZWWyIiETTzx9ccsLHHUR6eT4KcP9qi+YXuCR7IuKGnjOiyOZwuB4eJs/kwN2806DDGy/5fl8V1fDKQ35dLhkOS1nLqfn8GxutBKhF0xturumxCljnmIQ3RcPH9QDI7tmcMm/LOMlMsGHCaQGdxc015l1b/j7GxKJmZkB/HlGjI83TmOkUhucQJ+IIkUOUDaZS8425Kjf5CxEJKkCMmVRPOLIOU7Cjp4fBsW1/uYNEuJEUGwCw1TXfkLB49/cq+ethO/uNABfyT93XwnX8hcMHFHxrPbrT+4VnaRhmJ8HcrtCtVZxExfUQTeI8rUaTjcHg9RJV3NAVwk8e0EwIBLw9QxVB5KipC2fLM+f90e5gLJowQLu6n7b4mFfi5r/Mk1qtlTd7WZrIERTwqwMGXnzjvkxLFCj56CZXjQnE/NJnydK5jzsGrQ0v3sC93teT92kXqQfDe9XTi/WJQMoHpNJr4LjKIcDWPmMg0bSxBU/VkMku2iPks/+7kD+cMxmZ15AUor2QdkY1AG68Sosc4pZqZOvhrFumxfMLI1fpYhR2eOP+zWY4e4rE+dpOMrk8CMjYogFs4SAazyf4tAqmPwayJkeTZPRqgqdrPATbdLgxc5f+9aYBcrYIYM0iRcLDu36R6+VFddefPiiuDnrkJtLhlwZxm7t5FWL/xhtaYXemmzy6qfqePofI+36LW7L26iEeVfuB/d9akxtI09O6qgNWFH9OyEWRQ== X-Forefront-PRVS: 014617085B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB0744; 23:cOhYSUXDMb+ahD1rlfR0bKwuWAD6+Mek2vhLTed?= =?us-ascii?Q?fBbOSXnmRNVGaqABEK2v01FBFDrjqBpa/XxY/V/Kmw0rEdiJ4IO797DxZ2B9?= =?us-ascii?Q?qU/L6MSd68EsNpJONA8iM5A3GqxSVamQjXmuWhXsKz0TuzTwDqrrdzg/4TBV?= =?us-ascii?Q?/2YCSZdzd25Ai4ALkxsn5w2woIYyTwLGt46FjL9yjMEpiio+hHnNn02IcKYY?= =?us-ascii?Q?2g6ufd1EFlaXY4FDGVbQue8D7d5a59Cyu46w8XFT+baCJGuSvXVNgieZXX/b?= =?us-ascii?Q?tydxiRjsqfbPbRtjN8mvbYEQ3TC1q0y0TayhoT9241Gl/I0gyD4cqZYh+5XO?= =?us-ascii?Q?ApybZWCTpHXLFzXnGdBp1lyeRHAXR2RhTqyl+itFHlCOvB5X4yhhbqP/2beH?= =?us-ascii?Q?SJELQa/FXRg2sPMAHhEI2AEl8p34uTXuetFjpY4n9aLCIMOlmDvdovyQU6qP?= =?us-ascii?Q?wUB1x5xB0UL/m1G4wrv1drk+Cxykbec5EPoB7zvfsGl05owNlEBrypIgUjT0?= =?us-ascii?Q?WUa1AkToy3HTquk23zNAxq71ATnKdWrx9aON99A12Q2Zjxy9CjK2Mb3YnhZR?= =?us-ascii?Q?JYW71/cBc2AJPEzYK8ft2wc0T8LJPo5EJXMcDRUABIwHWcmWy07FRfQVNtfi?= =?us-ascii?Q?dkJ8whr2PU3h86nOF0yioHfMcGk1UgQGXvHD5Nooua6VGU7lomkl0daWYVmA?= =?us-ascii?Q?XlF0VO6UvkgBHXR2hc+abYfVp7hRzOPndFQEWfY7DXQOBO61OCEUNBhV5ewG?= =?us-ascii?Q?7kJdHhyvXPI6JgMYsCH9a1n0ZqMM7tRIDZA4GKEv2mxMbN7jaUN8OJMmMKmu?= =?us-ascii?Q?I2zyD4fm6IxGdWUguAuJkTiy0e7Btmo/kckqWy+xPL9lmXjvS+qymK8SfZ/2?= =?us-ascii?Q?MTqR+Y2pnJBFZodzkG7/e7kqnluxsR7LgahzUCvE+kXiU90ITXhUacHHcgOl?= =?us-ascii?Q?qTrRx3SSkgaI2DJxuE8Zyf9sC0mT0Ad+GxJiR+yqYvyPlvv8zH/CQk78iJTn?= =?us-ascii?Q?y0jEvV7X0WvUhQjM2U9APwYL1dcjpedNEBCc+7YaKZVBOqD6uSLWzluvl0rO?= =?us-ascii?Q?N8vL5OJDb7xCKWh3oGRQwrDJao/26gVVVHiybkqauN+CVGNBeyrKof3FCwZn?= =?us-ascii?Q?EAb39J/tFyLzwrcx0rIbEvncwxb/aj/MrzTiS3WE3ibJfwimOf7uo0SGMhsM?= =?us-ascii?Q?R3Uo1amP+ulk4r5B06rI3k00IVMw0GremT6cpSo6x+iYpKdnpDwHiRBFeMAa?= =?us-ascii?Q?wxjSzJihD1vkNTXEWTOU=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0744; 6:CkjVRkwrAGHUUAFSchZcnZX4HhmKnKCsKV6gzx9+L0wJhZQnr3sDyzkxgg4cR5X/T78/Na7umaoyp9172W06focUGNIQp948Fe/hHrLwXqZl6+I+R61rRkPl9pWqFIz9IvJBBBgDhz4JvNzuQgCxsXJ8J1VFfEqXuWaS1B7qCeMXaepWf1OclxOju9dXKxhc7FIqFN/a3gzYgUG4MaxrcUaLuHS3swaFOZ1wKp/8XYWd5qZFKi/nN5O/EN7j12w60I6L3e6Q+psurGuzeFSh/1w30mgof1Z8nGab9wio3scEpNQ0gCpe4uD8TdZdneBefm3Nx34k1CjQvDgUYQpAoP8pD9vFNDyf/acxtew4vFW+sFBEgYcQ4ynSM+PKwJeXfxhVr2LeXymiY5ZNt34NIlqjWE3X8PKbeUBQfrr0NGkZivEq9O7ZORpP+4wJU+Io; 5:FfiLDroyVz+vxhKXuavBqLHlL0zUpK8cQC0XpC33F7FMwxPbsufgCabSUL87WF8DPoWMNVx4lneeir+/zIlhV/7MIDhXyF+9ght0wx7Jpg9KHO0m+fYMFKNX1VwnR8aojBoZrsffVzNPhNXapErsDhG2N0le5/ApiKrNYzhh1wlh5BydoNH8zPm2kxNtry6Y; 24:0VBoYUXhoc3dSFsTLTyk1JsYY//v7Q5swKQ6csKDKJ9+fuRXphsnwU0OCYcglZMjhtHDrjqeMslZVD4wRIxbBxRnIBaOCfZwshc+L8YUad0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0744; 7:ssZkt+yqo/fg81yuBnKOoKX2f3jnCVhdgwZpTCsYF2xe7V6QgkM7mH/Wcl1Iexmgg9810J/77Q3MuqrA8FdC3Re7LwnvJuvqcX4sF4ePR10SPOTT0rWk5BMzCnKWDNiLD0tfFb2dKpd9uahYeWlPC7BlVTKsIHapIzybOZbNVw+XGPvhOdCkZRj7NPLh3XG2TNIqXrpKzdKwgJDtWjJ3gvdn+vj5Bxzp0kSfTYl/kS26JOcOoBXb3lqaxlmsaDZPTOEIROVgYvBALUmknhsxLwG3lFdGuBBSJpZL8LEdMOzdxJ5+EDieSOPV7v0cjnhOU5KqcBQOPhxJDzMIO8zRJZN5nfyPj6kzaMBIIYmOJXhqxsWujUirNxu+CfsLXK1QybekCp80AcTBULCRJ6umQ2OjJsBL3v5/rd9aPB9BShx+1KyUEWjxJumjTWgYFPcxeS22cG+jdxA1PLmv/aYLZg== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Dec 2016 12:44:44.1770 (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: BY2PR0301MB0744 Subject: [dpdk-dev] [PATCH 27/32] net/dpaa2: add packet rx and tx 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: , X-List-Received-Date: Sun, 04 Dec 2016 12:44:47 -0000 Signed-off-by: Hemant Agrawal --- drivers/net/dpaa2/Makefile | 2 +- drivers/net/dpaa2/base/dpaa2_hw_pvt.h | 58 ++++++++ drivers/net/dpaa2/dpaa2_ethdev.c | 3 + drivers/net/dpaa2/dpaa2_ethdev.h | 2 + drivers/net/dpaa2/dpaa2_rxtx.c | 261 ++++++++++++++++++++++++++++++++++ 5 files changed, 325 insertions(+), 1 deletion(-) create mode 100644 drivers/net/dpaa2/dpaa2_rxtx.c diff --git a/drivers/net/dpaa2/Makefile b/drivers/net/dpaa2/Makefile index 4ed0de3..9e693cd 100644 --- a/drivers/net/dpaa2/Makefile +++ b/drivers/net/dpaa2/Makefile @@ -61,7 +61,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += base/dpaa2_hw_dpni.c SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_vfio.c SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_bus.c -# Interfaces with DPDK +SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_rxtx.c SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_ethdev.c # library dependencies diff --git a/drivers/net/dpaa2/base/dpaa2_hw_pvt.h b/drivers/net/dpaa2/base/dpaa2_hw_pvt.h index 2eaca40..d116fcd 100644 --- a/drivers/net/dpaa2/base/dpaa2_hw_pvt.h +++ b/drivers/net/dpaa2/base/dpaa2_hw_pvt.h @@ -43,10 +43,19 @@ #ifndef true #define true 1 #endif +#define lower_32_bits(x) ((uint32_t)(x)) +#define upper_32_bits(x) ((uint32_t)(((x) >> 16) >> 16)) +#ifndef ETH_ADDR_LEN +#define ETH_ADDR_LEN 6 +#endif #ifndef ETH_VLAN_HLEN #define ETH_VLAN_HLEN 4 /** < Vlan Header Length */ #endif + +#define MAX_TX_RING_SLOTS 8 + /** simple.addr_lo = lower_32_bits((uint64_t)addr); \ + fd->simple.addr_hi = upper_32_bits((uint64_t)addr); \ +} while (0) +#define DPAA2_SET_FD_LEN(fd, length) fd->simple.len = length +#define DPAA2_SET_FD_BPID(fd, bpid) (fd->simple.bpid_offset |= bpid) +#define DPAA2_SET_FD_OFFSET(fd, offset) \ + ((fd->simple.bpid_offset |= (uint32_t)(offset) << 16)) +#define DPAA2_RESET_FD_CTRL(fd) fd->simple.ctrl = 0 + +#define DPAA2_SET_FD_ASAL(fd, asal) (fd->simple.ctrl |= (asal << 16)) +#define DPAA2_SET_FD_FLC(fd, addr) do { \ + fd->simple.flc_lo = lower_32_bits((uint64_t)addr); \ + fd->simple.flc_hi = upper_32_bits((uint64_t)addr); \ +} while (0) +#define DPAA2_GET_FD_ADDR(fd) \ +((uint64_t)((((uint64_t)(fd->simple.addr_hi)) << 32) + fd->simple.addr_lo)) + +#define DPAA2_GET_FD_LEN(fd) (fd->simple.len) +#define DPAA2_GET_FD_BPID(fd) ((fd->simple.bpid_offset & 0x00003FFF)) +#define DPAA2_GET_FD_OFFSET(fd) ((fd->simple.bpid_offset & 0x0FFF0000) >> 16) +#define DPAA2_INLINE_MBUF_FROM_BUF(buf, meta_data_size) \ + ((struct rte_mbuf *)((uint64_t)buf - meta_data_size)) + +#define DPAA2_ASAL_VAL (DPAA2_MBUF_HW_ANNOTATION / 64) + +/* Only Enqueue Error responses will be + * pushed on FQID_ERR of Enqueue FQ + */ +#define DPAA2_EQ_RESP_ERR_FQ 0 +/* All Enqueue responses will be pushed on address + * set with qbman_eq_desc_set_response + */ +#define DPAA2_EQ_RESP_ALWAYS 1 + +#define DPAA2_MBUF_VADDR_TO_IOVA(mbuf) (mbuf->buf_addr) #define DPAA2_VADDR_TO_IOVA(_vaddr) (_vaddr) +#define DPAA2_IOVA_TO_VADDR(_iova) (_iova) #endif diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index f941e89..b3c2229 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -683,5 +683,8 @@ } eth_dev->dev_ops = &dpaa2_ethdev_ops; + eth_dev->rx_pkt_burst = dpaa2_dev_rx; + eth_dev->tx_pkt_burst = dpaa2_dev_tx; + return 0; } diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h index 0295868..f2d78ec 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.h +++ b/drivers/net/dpaa2/dpaa2_ethdev.h @@ -35,5 +35,7 @@ #define _DPAA2_ETHDEV_H int dpaa2_dev_init(struct rte_eth_dev *eth_dev); +uint16_t dpaa2_dev_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts); +uint16_t dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts); #endif /* _DPAA2_ETHDEV_H */ diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c new file mode 100644 index 0000000..ba002be --- /dev/null +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -0,0 +1,261 @@ +/*- + * 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. + */ + +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +/* DPAA2 Global constants */ +#include + +/* DPAA2 Base interface files */ +#include +#include +#include +#include + +/* DPDP Interfaces */ +#include + +static inline struct rte_mbuf *__attribute__((hot)) +eth_fd_to_mbuf(const struct qbman_fd *fd) +{ + struct rte_mbuf *mbuf = DPAA2_INLINE_MBUF_FROM_BUF( + DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd)), + bpid_info[DPAA2_GET_FD_BPID(fd)].meta_data_size); + + /* need to repopulated some of the fields, + as they may have changed in last transmission*/ + mbuf->nb_segs = 1; + mbuf->ol_flags = 0; + mbuf->data_off = DPAA2_GET_FD_OFFSET(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; + + mbuf->next = NULL; + rte_mbuf_refcnt_set(mbuf, 1); + + PMD_RX_LOG(DEBUG, "to mbuf - mbuf =%p, mbuf->buf_addr =%p, off = %d," + "fd_off=%d fd =%lx, meta = %d bpid =%d, len=%d\n", + mbuf, mbuf->buf_addr, mbuf->data_off, + DPAA2_GET_FD_OFFSET(fd), DPAA2_GET_FD_ADDR(fd), + bpid_info[DPAA2_GET_FD_BPID(fd)].meta_data_size, + DPAA2_GET_FD_BPID(fd), DPAA2_GET_FD_LEN(fd)); + + return mbuf; +} + +static void __attribute__ ((noinline)) __attribute__((hot)) +eth_mbuf_to_fd(struct rte_mbuf *mbuf, + struct qbman_fd *fd, uint16_t bpid) +{ + /*Resetting the buffer pool id and offset field*/ + fd->simple.bpid_offset = 0; + + DPAA2_SET_FD_ADDR(fd, DPAA2_MBUF_VADDR_TO_IOVA(mbuf)); + DPAA2_SET_FD_LEN(fd, mbuf->data_len); + DPAA2_SET_FD_BPID(fd, bpid); + DPAA2_SET_FD_OFFSET(fd, mbuf->data_off); + DPAA2_SET_FD_ASAL(fd, DPAA2_ASAL_VAL); + + PMD_TX_LOG(DEBUG, "mbuf =%p, mbuf->buf_addr =%p, off = %d," + "fd_off=%d fd =%lx, meta = %d bpid =%d, len=%d\n", + mbuf, mbuf->buf_addr, mbuf->data_off, + DPAA2_GET_FD_OFFSET(fd), DPAA2_GET_FD_ADDR(fd), + bpid_info[DPAA2_GET_FD_BPID(fd)].meta_data_size, + DPAA2_GET_FD_BPID(fd), DPAA2_GET_FD_LEN(fd)); +} + +uint16_t +dpaa2_dev_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) +{ + /* Function is responsible to receive frames for a given device and VQ*/ + struct dpaa2_queue *dpaa2_q = (struct dpaa2_queue *)queue; + struct qbman_result *dq_storage; + uint32_t fqid = dpaa2_q->fqid; + int ret, num_rx = 0; + uint8_t is_last = 0, status; + struct qbman_swp *swp; + const struct qbman_fd *fd; + struct qbman_pull_desc pulldesc; + struct rte_eth_dev *dev = dpaa2_q->dev; + + if (unlikely(!DPAA2_PER_LCORE_DPIO)) { + ret = dpaa2_affine_qbman_swp(); + if (ret) { + RTE_LOG(ERR, PMD, "Failure in affining portal\n"); + return 0; + } + } + swp = DPAA2_PER_LCORE_PORTAL; + dq_storage = dpaa2_q->q_storage->dq_storage[0]; + + qbman_pull_desc_clear(&pulldesc); + qbman_pull_desc_set_numframes(&pulldesc, + (nb_pkts > DPAA2_DQRR_RING_SIZE) ? + DPAA2_DQRR_RING_SIZE : nb_pkts); + qbman_pull_desc_set_fq(&pulldesc, fqid); + /* todo optimization - we can have dq_storage_phys available*/ + qbman_pull_desc_set_storage(&pulldesc, dq_storage, + (dma_addr_t)(DPAA2_VADDR_TO_IOVA(dq_storage)), 1); + + /*Issue a volatile dequeue command. */ + while (1) { + if (qbman_swp_pull(swp, &pulldesc)) { + PMD_RX_LOG(ERR, "VDQ command is not issued." + "QBMAN is busy\n"); + /* Portal was busy, try again */ + continue; + } + break; + }; + + /* Receive the packets till Last Dequeue entry is found with + * respect to the above issues PULL command. + */ + while (!is_last) { + struct rte_mbuf *mbuf; + /*Check if the previous issued command is completed. + *Also seems like the SWP is shared between the Ethernet Driver + *and the SEC driver.*/ + while (!qbman_check_command_complete(swp, dq_storage)) + ; + /* Loop until the dq_storage is updated with + * new token by QBMAN */ + while (!qbman_result_has_new_result(swp, dq_storage)) + ; + /* Check whether Last Pull command is Expired and + setting Condition for Loop termination */ + if (qbman_result_DQ_is_pull_complete(dq_storage)) { + is_last = 1; + /* Check for valid frame. */ + status = (uint8_t)qbman_result_DQ_flags(dq_storage); + if (unlikely((status & QBMAN_DQ_STAT_VALIDFRAME) == 0)) + continue; + } + + fd = qbman_result_DQ_fd(dq_storage); + mbuf = (struct rte_mbuf *)DPAA2_IOVA_TO_VADDR( + DPAA2_GET_FD_ADDR(fd) + - bpid_info[DPAA2_GET_FD_BPID(fd)].meta_data_size); + /* Prefeth mbuf */ + rte_prefetch0(mbuf); + /* Prefetch Annotation address for the parse results */ + rte_prefetch0((void *)((uint64_t)DPAA2_GET_FD_ADDR(fd) + + DPAA2_FD_PTA_SIZE + 16)); + + bufs[num_rx] = eth_fd_to_mbuf(fd); + bufs[num_rx]->port = dev->data->port_id; + + num_rx++; + dq_storage++; + } /* End of Packet Rx loop */ + + dpaa2_q->rx_pkts += num_rx; + + /*Return the total number of packets received to DPAA2 app*/ + return num_rx; +} + +/* + * Callback to handle sending packets through WRIOP based interface + */ +uint16_t +dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) +{ + /* Function to transmit the frames to given device and VQ*/ + uint32_t loop; + int32_t ret; + struct qbman_fd fd_arr[MAX_TX_RING_SLOTS]; + uint32_t frames_to_send; + struct rte_mempool *mp; + struct qbman_eq_desc eqdesc; + struct dpaa2_queue *dpaa2_q = (struct dpaa2_queue *)queue; + struct qbman_swp *swp; + uint16_t num_tx = 0; + uint16_t bpid; + struct rte_eth_dev *dev = dpaa2_q->dev; + struct dpaa2_dev_priv *priv = dev->data->dev_private; + + if (unlikely(!DPAA2_PER_LCORE_DPIO)) { + ret = dpaa2_affine_qbman_swp(); + if (ret) { + RTE_LOG(ERR, PMD, "Failure in affining portal\n"); + return 0; + } + } + swp = DPAA2_PER_LCORE_PORTAL; + + PMD_TX_LOG(DEBUG, "===> dev =%p, fqid =%d", dev, dpaa2_q->fqid); + + /*Prepare enqueue descriptor*/ + qbman_eq_desc_clear(&eqdesc); + qbman_eq_desc_set_no_orp(&eqdesc, DPAA2_EQ_RESP_ERR_FQ); + qbman_eq_desc_set_response(&eqdesc, 0, 0); + qbman_eq_desc_set_qd(&eqdesc, priv->qdid, + dpaa2_q->flow_id, dpaa2_q->tc_index); + + /*Clear the unused FD fields before sending*/ + while (nb_pkts) { + frames_to_send = (nb_pkts >> 3) ? MAX_TX_RING_SLOTS : nb_pkts; + + for (loop = 0; loop < frames_to_send; loop++) { + fd_arr[loop].simple.frc = 0; + DPAA2_RESET_FD_CTRL((&fd_arr[loop])); + DPAA2_SET_FD_FLC((&fd_arr[loop]), NULL); + mp = (*bufs)->pool; + bpid = mempool_to_bpid(mp); + eth_mbuf_to_fd(*bufs, &fd_arr[loop], bpid); + bufs++; + } + loop = 0; + while (loop < frames_to_send) { + loop += qbman_swp_send_multiple(swp, &eqdesc, + &fd_arr[loop], frames_to_send - loop); + } + + num_tx += frames_to_send; + dpaa2_q->tx_pkts += frames_to_send; + nb_pkts -= frames_to_send; + } + return num_tx; +} -- 1.9.1