From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <hemant.agrawal@nxp.com>
Received: from NAM03-DM3-obe.outbound.protection.outlook.com
(mail-dm3nam03on0053.outbound.protection.outlook.com [104.47.41.53])
by dpdk.org (Postfix) with ESMTP id 2A69DFAD2
for <dev@dpdk.org>; Mon, 19 Dec 2016 16:22:05 +0100 (CET)
Received: from CY1PR03CA0034.namprd03.prod.outlook.com (10.174.128.44) by
DM5PR03MB2476.namprd03.prod.outlook.com (10.168.233.22) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id
15.1.789.14; Mon, 19 Dec 2016 15:22:02 +0000
Received: from BN1BFFO11FD048.protection.gbl (2a01:111:f400:7c10::1:199) by
CY1PR03CA0034.outlook.office365.com (2603:10b6:600::44) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id
15.1.789.14 via Frontend Transport; Mon, 19 Dec 2016 15:22:02 +0000
Authentication-Results: spf=fail (sender IP is 192.88.158.2)
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.158.2 as permitted sender) receiver=protection.outlook.com;
client-ip=192.88.158.2; helo=az84smr01.freescale.net;
Received: from az84smr01.freescale.net (192.88.158.2) by
BN1BFFO11FD048.mail.protection.outlook.com (10.58.145.3) with Microsoft SMTP
Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.789.10
via Frontend Transport; Mon, 19 Dec 2016 15:22:02 +0000
Received: from bf-netperf1.idc ([10.232.134.28])
by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id uBJFKMhp029110;
Mon, 19 Dec 2016 08:21:58 -0700
From: Hemant Agrawal <hemant.agrawal@nxp.com>
To: <dev@dpdk.org>
CC: <thomas.monjalon@6wind.com>, <bruce.richardson@intel.com>,
<shreyansh.jain@nxp.com>, <john.mcnamara@intel.com>,
<ferruh.yigit@intel.com>, <jerin.jacob@caviumnetworks.com>, Hemant Agrawal
<hemant.agrawal@nxp.com>
Date: Tue, 20 Dec 2016 02:24:05 +0530
Message-ID: <1482180853-18823-27-git-send-email-hemant.agrawal@nxp.com>
X-Mailer: git-send-email 1.9.1
In-Reply-To: <1482180853-18823-1-git-send-email-hemant.agrawal@nxp.com>
References: <1480875447-23680-1-git-send-email-hemant.agrawal@nxp.com>
<1482180853-18823-1-git-send-email-hemant.agrawal@nxp.com>
X-EOPAttributedMessage: 0
X-Matching-Connectors: 131266345224429756;
(91ab9b29-cfa4-454e-5278-08d120cd25b8); ()
X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI;
SFV:NSPM;
SFS:(10009020)(6009001)(336005)(7916002)(39410400002)(39450400003)(39840400002)(39850400002)(39860400002)(39380400002)(39400400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(92566002)(38730400001)(305945005)(2906002)(189998001)(4326007)(86362001)(575784001)(97736004)(8666005)(5890100001)(5660300001)(626004)(104016004)(356003)(68736007)(48376002)(105606002)(106466001)(50986999)(81166006)(76176999)(8676002)(81156014)(85426001)(110136003)(50466002)(8936002)(77096006)(33646002)(69596002)(5003940100001)(50226002)(2351001)(36756003)(2950100002)(47776003)(6666003)(6916009)(7059030);
DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR03MB2476; H:az84smr01.freescale.net; FPR:;
SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en;
X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD048;
1:JQIwTiqgevxVW9SmyzAF1wCahaHuxpQzaD8WtIk6e7kQ5ietYJkPYhGnbius71r5UD5f2IHlnTy1QOyOQUprJPmrdkdnNQSZrrY9dhFUbhbkK0hkjOhoBx47hAvjmTQywXjO5mZGHkbXxp10Y/9RRwN6m0pgWBmAOs5COE0qmt6fkgRyFMZdJWUV9zlmk6aihxHPdQpZQ+NBL0Vq2qExHB4poUuK4HDH7fcwPgaNuE68+H1PPfF8HlN/C6TdmBudnyG/msLOKVb8ch0P6+Utc6CK4k5FjF9qlkFuuG4JbU+rhhiGG94bVbLLouxoaB8V93QTBE06wBBLXwiwrm19GiNSlWT5eo2l2jJ5tEwcSXSvhMQ+AjMwdoiAVG2O0R5CvvzyuzAoUFWgSFRwmUexXnk7OeCZfsCWeWq4xWzpz45Mfog9l32VPa8CPn6NiDqb1u9eP/zVqA6iRskz9wasiyx2VWS7c1F36Pm+vibIx5SnW1jN5K/MEWXrfjX04W1aOxNOhQTNygWdoql+EVPKd1ELyJCFKezEd9S0Xxo0sLgZNiim9O4F4aw+C/VWJ9tPEqKp9tvg+ZQ0799AmrhB2+LWYvTu6ZwbdJJ8yHsZSYpVsurN3NJ83Q/FUNbgkJ773Mn3CxqJj7aqq+NtUqDgkyroS4xhFEl6XR16jP5GuxSoq98QvzcE24DbyNV0tauz9AXj/ejms4tlRyKB8oc/Y30t0rvNhcDXVviay8xMf55Ru1Fv18IyQYj7reQUWKY/aEROJqYXPHJD1h3Mc6gAmw==
MIME-Version: 1.0
Content-Type: text/plain
X-MS-Office365-Filtering-Correlation-Id: 5ddc9b56-ecb6-4c63-7f5f-08d42822c885
X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:DM5PR03MB2476;
X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2476;
3:ayERfF7MUaENa8cSbHXUrw0EhNm/kztTZPRQ4rQoanxdDzSRBK09ODZos722SoupX8LiU2S2TaWLpZXdvRJjno/v81Gs/d7YpkVAHCbJFinFp7PZFHdZKS0bVLiGW/Pjt3DbywlkieDkKRij8AXGX6V4EXgqVqh1iB+cUhzkB0XfyaMbuE1TcvkPvkFvVUDfB70V46IYeuLhNtsgSKEHiX4+VbiDi+wys4NRAbdTlVEizOXMrTazLNxK7tslF5uk+uLTKHWhZHLjrdQHcWunXAVEU1Mr6zzTZE8yOP0Us+4Wm6f/xngz3KueY5NQ3+xhpxLHBqOC579VpHdvJk96o/JI7uj1NHZk9dOGc8dcrvp49h1iG+q6KVeT3fWT/pOT;
25:WBMMI9dv6QcySQeqwzMDHx1cniiAR5XIA9XD38xNUsZFw3skuayNyZKYEM8jRo2UYXMzPL4uzuR4Ixh2oOfgZbUTWq7E4QNuHEpbI3teJAH+avbtKSFVefd4QYCTz71C3Flqoi+Af4j6l0Wi/DAAoP5Sqhz0bpOBkHydvFTktrzDeYZIfTxuaerz7RukdO/aeSUIZzarFKyKwmojuTYP5Gvrt9n1d3zG6sx6Z3mfFmi7qI6MitUPiGpMVO1+vtXSJnCQBmAQSxOWwfhbccWSDIjLM594uLEnJsUVYowc6Srkae90cjL+NQRobCmYo5IPMCGyTuDbZRORJE2boKjNPTfAyrSCJTBcFEWIYd4YafJOg+JT/BTlczYrihVyaP8A6V7yRAofHcC7GNScH554dzvjGMZl4Fag5+RaPViKEFNnEruhCEjeh6Pnhge0qA5PsEZU5pWxczSnURBAIwWSLw==
X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2476;
31:KAOoq8n99veBEB9eQ9QwdcS+SeTRwAytHOqFZ5iazzGQiciP+Tbz2B8X7Tc/QIyPOihrvkMJ6Tc1tlnZCUbZOErAOf2y3+7m6HOyZ9JwczIcXZzmw3JJ9ExsUeQbq7f3rj/gtzoYpoYxZ2TccwnQAq+x4m78pwp3xshhT3tFH96Blt7ymd+mHHeOBLyuyTfo/Xd2pM3pPgAxRa4WpVHGSh3L7csxceKniarkxdCcfiwkSweOu5sPfsjuO8RyGiY+nClgAYtwE/LFh0qQUJxVSs+Jwqcv9g+NYPCIvooG7NM=
X-Microsoft-Antispam-PRVS: <DM5PR03MB2476B1E807242851458BF5D989910@DM5PR03MB2476.namprd03.prod.outlook.com>
X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684);
X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0;
RULEID:(6095060)(601004)(2401047)(5005006)(8121501046)(13023025)(13024025)(13015025)(13017025)(13018025)(3002001)(10201501046)(6055026)(6096035)(20161123563025)(20161123561025)(20161123556025)(20161123565025)(20161123559025);
SRVR:DM5PR03MB2476; BCL:0; PCL:0; RULEID:(400006); SRVR:DM5PR03MB2476;
X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2476;
4:3VJTOsvZoPNR4fVTbTSGlVHQBvtTERmHZC9g98xu2yyLtgfsBps1nwbgWsjE+0cTV9eUafTbGnJkpKST6pdYSCbUfrzr1KQkrYrUUT3AHhP/4PdVIEUc4DPafPxxMiRh/AysaUA5drfi1oiT6o6PT6Xl5eW2jHc4YSb+45hSZTJfMcfA0KLUCuAjiO7VgPRiNWXv3HowDMBlWX7kRg8t5CCvEzQJ6FuaZ+FNJ2dzHIDuSfCfJrrVKzxyH8uDoEcFulzRWlgaUORpqEpBUVa7nzpwJCF1v2xPtTT9aeIvRtGLDJgtOBlztGwytp0wC6p5b41inIFhhCW5vM2J6vf4W54gS8RdJY5xS2QDWV4JnW6bbURYwh6KFqkitk96RnyG0ngRGCv7lj/aQdFj2Vm3Xn0DSEveEA+jlpf8+CKhfANhit+lFHEWrOE+LmBCyYJZrv/HL3VlBzoykFCIz2ANMqqHFJv0dRPUinTui8lARiTS7x5PeKdOW7IyJdjdYifhPqe1hGiQlcSJUoVNi+XnHKAmIBjgzLxPjXmIKtiiMtgn1Av4uPVr71MjtHAmAiP5nhUpCcD60WtJuaxmWW4IOnwbFkpkmJp0U5Dd6G6BPw1VowwGMKRtDdCHgPNEsGu+wN3Dhb4owdEcLhi4iQyvO09RZhvw8HuyQKjC2yLJ3HiNsWH2uOFpKAzw1G/i+R/5Qa8xQ0mcTOs83tcBB2Yjz6/cnF0yKpdLcBa1b+sl+6fxyz8fEuEkq35KV+N0TkZ+ipSjQi5XTjfDEH5IoW+9Sg==
X-Forefront-PRVS: 01613DFDC8
X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR03MB2476;
23:PLIb9wPtMq9RvteW1YH73VjGFWE8rTBkdg9tpckpZ?=
=?us-ascii?Q?D4E55xOgrPLYmHFK2O5lnPzkxdIOWr7gWO6K2dWODot7H+vaGmC5mrSGVaon?=
=?us-ascii?Q?oV3hEJrnYkBZmlFuzhclbIb8dnemJPO6AE/rtRy3hNeM8IC6eRDkkyvOwx4i?=
=?us-ascii?Q?K1oKP/ojoe03qqMQOv1VzzC9xtZCg4niGzD2uVAvoTnlGNGxbqGIlPnYJKi1?=
=?us-ascii?Q?ruFqE35HT0pJ73bVswVH+EtHufKdcUycw8vEAX9xHd3EhWH0/ScKj0eKszg8?=
=?us-ascii?Q?TPZOf+vVOAkslroXb+mHrLztt3Qgmj7Q9IVVASexUVv3lRnYBe7K+/7JsR5n?=
=?us-ascii?Q?I944UZm160/9P3b7RIT8MJQzuGddGvR28GgzL3TRNuPqqjSqsmhupp8eiMJm?=
=?us-ascii?Q?kap68AivMB9AIPNt/YXZ/aEH3R9DMZ3hNZIX0d9IVjtN59QTTLnw3wjP/0+7?=
=?us-ascii?Q?JR8LKin3HsRCb784YFu7Svl7a3h4j8Rd9sD3gaWVxhqX2yL6OnEU4DzyH/W4?=
=?us-ascii?Q?wnXOag8862G7KJ2suhLxhvFfVN1XiEv3GkRkzvsuxJfZxSFUVWiXEI3vek4+?=
=?us-ascii?Q?xAmbTyUkLLdaIUwnPs4OiKUwNU+fQ3DGISk+4Wqrk+xMFuZj1H1YEAmlrbWB?=
=?us-ascii?Q?G0aU1OVcnVUazfEFN8O3DILcviU7d7VgaX8xnbv3yB2+oUJW0DM8LI6DsnEO?=
=?us-ascii?Q?q7NaC46xruAzNFcHTwXgkgM7e6Zk0lipXnUjStFwwbnxCBQu8PiBNCCOUTiG?=
=?us-ascii?Q?OuX8wRtgGj0EiqyP2fhLOs61KyuCIdEnkhzdl1VKpo700joTwStEhnl9YWJK?=
=?us-ascii?Q?YSPtZI7ve/KPfugLxXFhGJhC8Fu3Mk2q2ExxYVwrtu0KlycuK29Xyomdr11b?=
=?us-ascii?Q?8O/AZbLDUO8QqBHytxoprNClOEbd7khGRu8PXPJqWbfUp4+pKzIPeR+YQ3NJ?=
=?us-ascii?Q?ktRmKM1/rgWbpJlMiZ2M6M+oFa/9ZQBKx2XcWsr57lNAwOrWd57tDvWw4JkP?=
=?us-ascii?Q?LH3IbHDbg0yuJJqZ11IyoTjlg3ucLFz/1T/YGoBtOc9HsU82ZGM8XhwIVhSU?=
=?us-ascii?Q?fJroWrKgOnUhrxrbpluWknHeaWoT/iOfrgwWIqVGLA+y4pW9Pkcqpf+aQaJz?=
=?us-ascii?Q?ui2EeUduaCjRRZMiHuHtT19FDvShqLpUtlgUGBdmW3qBy2+BAf/EK2Nqd1HZ?=
=?us-ascii?Q?/T+K8UD+f8hZA6/cHbM9g0X8XCV/tupZa2E496931nlWBcDaJL2n/wc32Giw?=
=?us-ascii?Q?MvU58jzIfs55PeoJ8EVk764yd6C0Got2xccxqlLthapI0nQMIp82185jkFim?=
=?us-ascii?Q?x5QdimWk8tRlwtL7N4JoaMbVKP1o+aLKKqPMSvdR2UwYK9Mxx/0x3eMk2AH5?=
=?us-ascii?Q?wrwWQ=3D=3D?=
X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2476;
6:JiXNJavCJuYYHZDKeU6CABccreHGlrKAdw1rkIn9hXwRintncASrto3cwZC9aJ2oYKUEixzUnGK1+yMYGuO+1JVp/NT1In81UZ7Wu9Ma6YrRreaZK4kJcKLdttHkepyfVAL6O6SFdkf92E/1xLoDu9DETzNedqWUIO/CNNzDPzPrWoch6UAJGyiThYK9YDygTiyspWtALXv+OWtnshXY2aa3K+svZV0ppcapY0W5oZx2vewtxD3q4X/3AX8vb0DwJtRcdxAVVhGC02Qizblv3C8oOvNxouvKX5YCkxvBkTvfTu+qgvV/7JTaGEXNkfh92HsoWq00+GteDrPZKQH2MTC6YLESAs5OWCgOdm7uzV3A4S+7spxxYVdrEuENpF9Z+kBUcN6hYs7oRwzo3hWJydjVkoUfoJ1VAVGRmaM6eN6jAEqHeP/L058HD/2xG5z8;
5:EqntULCK1NRe3LQv44zDFV3MbqkTy5wdhU003gXeyZpqIAMPzeIGutn+W2ba+uy52hYwSUCW3fVRH5+qaGDWlqyhnEhGl2wg4a1fsB285hOpbGpnyHpHO1RY9JFITP8bYGv4kLtal19r7jzFS1kiyIC3llzeVL79vqn20B47kS3Ju/LsORzQnly0xkfhnMEV;
24:C719w9UV9W2AB35GUi9vsgCFbtRfzyfq/Wtaty9CL5gdMy/QwAWCrf7CPFiJI1TSgDhdCytyL3209l58zbs0SD7WnMJ25opKkpHaB6OKQbM=
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2476;
7:tnaikfyaolWJuDrxwh9+84nYdB9US6Ywyg3TNlorOAOcDiI2hLFd14bHq1DC4hj8O9wN5twSq1hcQY1/Ch0sCSY18E7J50YdGJ7OJzJgRSbthoRnJzSoY+6CG2j8g47HeqD3e1ifZJBjCL40dJR9k+UR6I4imE1TsXhiGY0fsC7wcskH6jibeTzy69wFXerdgK8bnjCwWXxXBKBQvUpM7AU2UpQjedSCuoNGSzXGIs+3WGqybrrHMBJIusdbwzm4GnOJ7ILpGfnT4d29w1iGuFpE3GxWAQKGIxEmzwR8HYLgGO07bsVAVVXryUq7h2V3+C91nHhZTsEQBEYb7DsaUnOQT8KktsCDdt9e2TO5VuybOSp5zZlLSHf9ZWwRTKlZpuKeU6IjkKbBt/yVeOii1GZKVXTWzmvh9q1NFG7D2crJOg7wNXLi4QPPoHzB0HJ7HlZG4IuDUN+IK2V/YOgC1A==
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Dec 2016 15:22:02.1933 (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.158.2];
Helo=[az84smr01.freescale.net]
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR03MB2476
Subject: [dpdk-dev] [PATCHv2 26/34] 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 <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Dec 2016 15:22:06 -0000
Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
drivers/common/dpaa2/dpio/dpaa2_hw_pvt.h | 54 +++++++
drivers/net/dpaa2/Makefile | 1 +
drivers/net/dpaa2/dpaa2_ethdev.c | 4 +
drivers/net/dpaa2/dpaa2_ethdev.h | 3 +
drivers/net/dpaa2/dpaa2_rxtx.c | 260 +++++++++++++++++++++++++++++++
5 files changed, 322 insertions(+)
create mode 100644 drivers/net/dpaa2/dpaa2_rxtx.c
diff --git a/drivers/common/dpaa2/dpio/dpaa2_hw_pvt.h b/drivers/common/dpaa2/dpio/dpaa2_hw_pvt.h
index 2dc0fd5..378d591 100644
--- a/drivers/common/dpaa2/dpio/dpaa2_hw_pvt.h
+++ b/drivers/common/dpaa2/dpio/dpaa2_hw_pvt.h
@@ -43,10 +43,16 @@
#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_VLAN_HLEN
#define ETH_VLAN_HLEN 4 /** < Vlan Header Length */
#endif
+
+#define MAX_TX_RING_SLOTS 8
+ /** <Maximum number of slots available in TX ring*/
+
#define DPAA2_DQRR_RING_SIZE 16
/** <Maximum number of slots available in RX ring*/
@@ -112,4 +118,52 @@ struct dpaa2_queue {
/*! Global MCP list */
extern void *(*mcp_ptr_list);
+
+/* Refer to Table 7-3 in SEC BG */
+struct qbman_fle {
+ uint32_t addr_lo;
+ uint32_t addr_hi;
+ uint32_t length;
+ /* FMT must be 00, MSB is final bit */
+ uint32_t fin_bpid_offset;
+ uint32_t frc;
+ uint32_t reserved[3]; /* Not used currently */
+};
+
+/*Macros to define operations on FD*/
+#define DPAA2_SET_FD_ADDR(fd, addr) do { \
+ fd->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
+
#endif
diff --git a/drivers/net/dpaa2/Makefile b/drivers/net/dpaa2/Makefile
index 0e8095a..0d299d9 100644
--- a/drivers/net/dpaa2/Makefile
+++ b/drivers/net/dpaa2/Makefile
@@ -59,6 +59,7 @@ EXPORT_MAP := rte_pmd_dpaa2_version.map
LIBABIVER := 1
SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += base/dpaa2_hw_dpni.c
+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/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index 3264bbe..3c4ca28 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -682,6 +682,8 @@
eth_dev->dev_ops = &dpaa2_ethdev_ops;
eth_dev->data->drv_name = drivername;
+ eth_dev->rx_pkt_burst = dpaa2_dev_rx;
+ eth_dev->tx_pkt_burst = dpaa2_dev_tx;
return 0;
}
@@ -735,6 +737,8 @@
free(dpni);
eth_dev->dev_ops = NULL;
+ eth_dev->rx_pkt_burst = NULL;
+ eth_dev->tx_pkt_burst = NULL;
return 0;
}
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h
index a56b525..7196398 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.h
+++ b/drivers/net/dpaa2/dpaa2_ethdev.h
@@ -77,4 +77,7 @@ int dpaa2_remove_flow_dist(struct rte_eth_dev *eth_dev,
int dpaa2_attach_bp_list(struct dpaa2_dev_priv *priv, void *blist);
+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..4b76be5
--- /dev/null
+++ b/drivers/net/dpaa2/dpaa2_rxtx.c
@@ -0,0 +1,260 @@
+/*-
+ * 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 <time.h>
+#include <net/if.h>
+
+#include <rte_mbuf.h>
+#include <rte_ethdev.h>
+#include <rte_malloc.h>
+#include <rte_memcpy.h>
+#include <rte_string_fns.h>
+#include <rte_dev.h>
+#include <rte_ethdev.h>
+
+#include <fslmc_logs.h>
+#include <fslmc_vfio.h>
+#include <dpaa2_hw_pvt.h>
+#include <dpaa2_hw_dpio.h>
+#include <dpaa2_hw_mempool.h>
+
+#include "dpaa2_ethdev.h"
+
+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_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, (mbuf->buf_addr));
+ 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)(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_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