From patchwork Tue Jan 17 18:52:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 19591 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 31C5C4CC5; Tue, 17 Jan 2017 14:20:46 +0100 (CET) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0041.outbound.protection.outlook.com [104.47.37.41]) by dpdk.org (Postfix) with ESMTP id B443DFA7E for ; Tue, 17 Jan 2017 14:20:40 +0100 (CET) Received: from DM2PR03CA0024.namprd03.prod.outlook.com (10.141.96.23) by BN6PR03MB2465.namprd03.prod.outlook.com (10.168.223.19) 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:38 +0000 Received: from BN1BFFO11FD008.protection.gbl (2a01:111:f400:7c10::1:166) by DM2PR03CA0024.outlook.office365.com (2a01:111:e400:2428::23) 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; 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 BN1BFFO11FD008.mail.protection.outlook.com (10.58.144.71) 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:35 +0000 Received: from bf-netperf1.idc ([10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v0HDJ8mW021741; Tue, 17 Jan 2017 06:20:32 -0700 From: Hemant Agrawal To: CC: , , , , , , Hemant Agrawal Date: Wed, 18 Jan 2017 00:22:46 +0530 Message-ID: <1484679174-4174-26-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: 131291328384086796; (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)(39840400002)(39860400002)(39410400002)(39380400002)(39450400003)(39850400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(8936002)(189998001)(33646002)(2906002)(4326007)(76176999)(86362001)(575784001)(106466001)(81166006)(50986999)(626004)(105606002)(104016004)(30001)(2351001)(81156014)(8676002)(2950100002)(5003940100001)(6666003)(47776003)(97736004)(92566002)(6916009)(68736007)(36756003)(54906002)(50226002)(5660300001)(77096006)(5890100001)(48376002)(38730400001)(50466002)(356003)(85426001)(8656002)(305945005)(110136003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR03MB2465; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD008; 1:p5D8R4/KUrM+OBsG6FOhR/YlLuoDtby1rsC24/N8/cZK3gpvnUgF5v8bIeDpwh1FkTATgxOuV2b19PvGpRPMSGHZp4YckcomxHfHb515y77yylFSTjvRZdbX1+Lz37grgpR4IWgroQLIW5P1dVtCPhT9iKQXiLsobPPRx9CXlHZclLgCo09ni2RZ/8ERxiIjFl29fFBFJfiNmV1TSmf0vNidswuCgN8TChHqaXY9w5SCXILr5OBuFR0LF3Qh2leeJdujDmz9rypmhCHLR3/pbF8ejqJPfu8xM72OZFY5tmYkspSkD3cONcalMyB8NLTIO/PgLdVi2UO04Hjv/49JppfNhtxibN1h8zj0FSpzPXqsQKeptsDG0FXbJZcvpPQzXrHNnPKu82b55tEAvlNEs7gdKzrKp70x6EKrNh4G1PEb8SFaIg2DQFbERvJnYN6OUcA/7BmFpd973NnIzEisSUf9WLhKH+Jvw1K8quiJAuzuZ+h1jOGQCtnJHHGIQDE+vVnab9LuDcCkEez/hNgOJXEskhtE2AtSCZaTP+AGw/uHOKHxyyJc9Ihl/ovQGkxbNzIkYKlfmj9mtSizs7uJLGRAryBoZ47sFFkoaYXgw9CT242eamHmrOJHhIE4n+3l+ozsyGoT8ZiFmcrz5ZHVSZPKA4TXNBUOH0rMJtTnrY3WhE5JChDKUYGyOng7yUKxBY4/YeEJo5nDlJ1mRAZbYBdnxCIQMc5DMFfLsWrX49J9GMT2k/0rLkEBLHWdXT/h MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: afed1b12-3556-40c8-d1b1-08d43edba0e0 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BN6PR03MB2465; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2465; 3:sRZAyem0geXmKUHd43wNw8oekVCUyFSRfD8rnfntGbFp4JI8IBPuPC+tg0hl/1js/16wRO78cZn1IE0eFe2wWmC7jwWYKXCzAoCknPOWfO2BaJLqkUQqQE6TmWQEFQM84Bh6ngg+NBknG/+d3ouh/1HBnVVc7bx3HKkBU4g2NdEsWzVQjwu7JykYGS6Gz7RS5ezeQEhe6iKPkw/KKvePToPb7AQ+Iahbm85cXa4Zndu/TAeghRGuiqwT5/Uv3Uy4p/1yx8s3A++6v8xp0hpE39S67twpgFzsI4Q6FmV8umGFx9hdqSVlQL7I12+nn0DOWxoTVWIPzl8aPFNbmT/9ukz/g4zXWKJlYUNjeMbPdcTQepn7BQV4x/t6B8G7cI9u; 25:8DlXUyMEkIMo7mCqxlRyjqPoSr41DmaBVtJNAp0N1YmWeTL3AyZy6fu6nL9ke9PWOlA2bvJbs41xi68gdEsEwFaXWcXBnRvi94qVTKeYHDVjqjprBkUx1TU1jb5J3qFWB+JLKqcW4ghB4PLXWPnXJpBD7VtgROIx+GT6rnSRMGGWujb3R+5D69j7LhzMZ9DIwcD+Bgprc2Tc5Hqg8V9Fk71oRbHNSr7oZ3ndNy0E2QBPuYy2ZqXUsB1H5cMs2J77uesJRHvVEf83yt4jWQUIqxyYhrmMpCvBKP5N9Jkp0BoGhtn1op2gWdbv6SCQKC8P+i62/HIVCWvsLT6M1ne8U3tq68mG5DRYK/vVmo0HjctfCw2LTr8ckcDZ5CwvsH7Hwa8joLzR3edz1D+M+pIWvVIRW865i/BdlCBxieT1m1xKk7trKx6c7HZ16x5ojgpwC7IshNSR041JwHctqi5uyg== X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2465; 31:JXssR99MejMMY3sJwUJM6XSOmvupyOKqy1yOCPogx0YrvydYVvjx7WJlrv0rCTq6AgJfHOSUWU98QNBjfeQ1z2zg6LZz1y/b9ieuW1v96p0rDC/9Uv4QCVykfDJLUi1IFGu2D5SG7m68Qmmk+2SXbJhOgBCVAt5XVl8e+MQcGdYqsImH3gsI11jTnUjR4afbqu9llBH7MwbZ1k3j/SN2N7WEZZ3xaj1IlkTBT6qoI8C6NavRD7/UHjZ9ktlHR6nzkrpJc5B0KsQDU5HNwnG1UQ== 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)(8121501046)(5005006)(13023025)(13017025)(13015025)(13024025)(13018025)(10201501046)(3002001)(6055026)(6096035)(20161123565025)(20161123563025)(20161123556025)(20161123559025)(20161123561025); SRVR:BN6PR03MB2465; BCL:0; PCL:0; RULEID:(400006); SRVR:BN6PR03MB2465; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2465; 4:Q+fR1ReUuFgtdfjOy1zY+1ZLCsEJQCP6PVtK5JXXL1KuYABoAITq7r4GHMmhm5GLOsxVVk5TPmM/HTYnzw67Nnq/JCHi53kXPeEJKtvhs1+3VzadzJLzfmWIxdeFoePiVVT4EX56p0l6S11DQN7hhO29WfVli/Ixh2jgnDnSrHVb49GKiwS2ABKJ/Y+zVfXAhkCp/1LPtXGPZmtmkwg8aS+gdJWlT5RZPFQpJMjAUmIep8MaGLm0ZmvE+wndcbaDLVnOed6NPvqPU7JondjuQxdowRvMlVgXSNVe+ezfhBVvCX4zmeWXUEvQArt0ubt4g5VIE60R87HSKcDMAnBTUlwWBeAVkayPUQWgCRpNdyego6ax+bd1WD3c962GqWd5jclh5XeBGLk2zSA8tLgm23xxm1Ng4gRpKtXGDBEzh9NcHX7yCd+1LM4DYw+/TF+5xnxuDnCAvDs4Uf2CeDE81tmlxwscK/bAwpLkBpqeSuWF9N6xXCI4RBryXf3UzeL6HQb8YxOe76jfYS9fmW8LMjxL8QOjQ71SGJVcw85+MrPMJcDPeCxiI+dfAvEMLw99fBRMC2LzQ+V+Fl6Jjy70h2rX6kzzspgs/CBYOHNnk0RHuy08KeyaMeCR7TK9HrpIYwOLQHX9D9nX34oVmw9HxA49CdrGsZGRWBrA/V0ZwKVaUfhO+vfCPZ0UIXJmIHoFf+oa0472Jh/iN72el5xF/Fsocu1iw1nlUpdnLSIUzJWmNkSjKPF6AkLGIxfrl5f/bzZE5Hgonzpo/s2FEjUwUg== X-Forefront-PRVS: 01901B3451 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR03MB2465; 23:HuEiCBXNYnvBPQf8zm7zECc+td8ELfOe4ij8l7/LQ?= CIWCa1vU0PerEVLddpQq0LHh9aoubFs7jxgDUoEVis7HBWXTBFfXv7vieJa9TkPpuFApLkc1T6KRekkV9ePwWcu7wdHDgFVU9eOEThp2TK91usnMY4NMqUbqslNupTNADuDShjaVR5lWYlkHU4ZvrBn5wxLO2STcqe+s6NfXewJOVHGJjs8xVdxHaS2vwTQq/JnTOlPPhnP1XPd4r9xYQEp0zbHEGsNbXLdRM7uYtzN/Q12Qr7xcM5ilWusVNchXzD3urg7RtvDzOSsJPcMAxHWJSChCVFoUv7XGHP1YGj3Dhm2GLDqJ6VOdTDRc7XveToF4JnxgCT4IwNfAFbeH2s6sWafy+wQ8BTTrwb0s9oCRwMI64BU1TKgYj9D5MfUZvEe8ukXUPNFZiGxxLwroJyLSBCmERgym7Wb3rCzKA0OlkkDkCOL0VkRGv3CRGAIFBSZ855L6Exrvc1ajP8UICvQDNPibNyW/LKsfVCLUwYoZEhEQZ2Lz/b5kPQvEFeHM2+kcilx3XQxNyiOhqKit5Dwq0U366DCtB/cPnxRVllD8n8nhEgZ+wLsoxnRQ1aBlduaitzU5X/ZVAWoi90XrSjjdf7lFqQmHySdBIx4TygWkg1vnnIRYVL2YKE9v/JBWom7uEjqVSmXpllehriT1ryjauRvmxanujUM1l5mjuo01nrFcRK05NWsT9/dp3ClmoeAI+LfbEtlFLaz7IsF9MnJhRC7wVoko41jIqFh76XLCU08Vccl39DKc+G6QENVV3qU0UU7HfUhfJ98R9YGRQo/2KQBIeIx8wwOO5mVd5O2ZzMo1ff97GSvNnaOJq9hvatfVe9X2308FMYsvz76w9rIhcD+y5TYhww9BaRjndiYU3bPPJu8CFn91A0Genjkm0ShfYqgerH8SgFMVPq+YBkQV370boOND1xQvMp73ayArwl23U/EBP3s/qQIVFGpggemuO8v0tFTM7Eijov5tySoNCJ7bMTJhucsgYcy9pTg3/PQjzZQwE+jaR6pnHeE5RGcsL+uOnQIlwa6eI+TTCuDF56IR+prrwMaat38f4s9ORhuqUdDnG59QCTdUt0SWraWQHtNtXdgGDvFJYzp+nV2tiDSgqu7ft4zAfz/BcTq+ToZvMVkR+HLdPpxQ/NMXa3BSFR5nfdEL1rJo7j/1w9M8Fmc2IZ05sGJcqPnTKsM72PEkZBh56sP8nxA3bEUXd6Mxlacacmq82roE+nL4/xrjifRft38Mfk82pmj79CFu3dRdZw0ZozPt9FANbgHhMlxcNab3V7lWltnd7SCIj8yP6U0QmFJGZM+fFglbwLFRA== X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2465; 6:ieI+KmCuw2SEPEq8m6EoA04Om2m+YkASpJpxvUfXikqEfIlaVNJaLWRiXT4KvDiTDM0vk7N1UOEw+YmuNGxGAoh8q5giV+ZUwkUsEhfqTietfw3cGj3LEO+Vohwr1lcYiD2aorMbm9p+aW4vcF1cKXjqywRFO7mqi6KMV0CDOjxjOEYtKNi+SoezkD/FrJ1amtuSEPhoCVU+zoqA81/fpP7HY94EIRjOYpohfJDbF2Mz+M0j4A0zEkluXBHxDfMrzdHNcLQLNTpMRRjYFFt6A5A1iJALmBobWu+VcCgs/YSOgY5LkeVYN43uRMX24XdWJVSAB4/Fr3z7/6CcLdWpgTcvEe2coUM6xeuJRNSi+KJe4AQO547wXgnsf5pWuU82y91uzGhUJXjcc7HlcahUjzLJ16q8QlxvEoPSp9OI3DaY3CTLFPaY/pNJQ1gA3uKF; 5:3qA56QAmM1ATrn8OGF78iew14USb3v6ATvV6kuIY9PDKFQ9ZgFd4MB8lhKymp0wZKjzXilxSL3C8oX0/UNJc6PgjOhW9YoyUnSwO3vjJyB38FkGL5CdNMWQUn6/2TGt37uNaBgHM+C50F5cxrXR5c0nSHXJM8hrqDOF9xZrdwwc6omVsA1yuhI3SmHiJWQ3G; 24:kYLbf9fq4/JiDNJ/XETHLPfyP6wN2AUnaBRzYdECGGoAR2yDCIcT7VmOYUCfNAFTIdbIBD2D3Z49HmjSnjd+4o/seJQHwqE5f7D69YBP5hA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2465; 7:CwPrEgTaGv7kSOVFxjxgtnQ8CYchR+aCfdO5Lrno72mscI0OkSTn9cf2YRbrtbqygFviLkWEjH9S/3LEAnRdcT8kCilZ+VRIL/RF2/Lbpmf8DgsgutnifE/0bV6mDpFDMLlySPrkegQ1StFPU9F8HnCml0fQC4n1qvPau5QgHrklTvNAW13RBdgZGzPtbAWhTpJmeZrmVmP0nGjhTDyBZRmYq7ZLqvR7hmPQlPv3YEhuGPBAQFQ8sHbofoj4umBM6Fkm6ARAuJja8bz2qqpfzq5k33zXeppQqXo4B8VUGRV5lCXSaJW4x5uo9bzHh4gVBXmbeMnOk1c2aicgnaSIxgfU5D2d9jbQ9Y4ItpT4ig6VhJ3UmdPYabyK6zL7jXTsgV5HcdsyKd5AOMB1i7n73yCEL6Nn2ybrYdHvZNzjS6iPyI7sQByB943jcRGf5CPyzqsdrNXIcCvGbjbvlOlGXQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2017 13:20:35.3979 (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: BN6PR03MB2465 Subject: [dpdk-dev] [PATCHv4 25/33] 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Signed-off-by: Hemant Agrawal --- drivers/bus/fslmc/portal/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/bus/fslmc/portal/dpaa2_hw_pvt.h b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h index 7c6cc7e..158dfef 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h +++ b/drivers/bus/fslmc/portal/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 + /** 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 + struct dpaa2_dpbp_dev *dpaa2_alloc_dpbp_dev(void); void dpaa2_free_dpbp_dev(struct dpaa2_dpbp_dev *dpbp); diff --git a/drivers/net/dpaa2/Makefile b/drivers/net/dpaa2/Makefile index ca51402..5e669df 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 f98e7b8..448aac7 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 +#include + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#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; +}