From patchwork Thu Jan 19 13:23:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 19812 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 29E4CFAD2; Thu, 19 Jan 2017 14:26:14 +0100 (CET) Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0088.outbound.protection.outlook.com [104.47.34.88]) by dpdk.org (Postfix) with ESMTP id B68F9F965 for ; Thu, 19 Jan 2017 14:25:38 +0100 (CET) Received: from BN3PR03CA0098.namprd03.prod.outlook.com (10.174.66.16) by MWHPR03MB2478.namprd03.prod.outlook.com (10.169.200.148) 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:36 +0000 Received: from BN1AFFO11FD008.protection.gbl (2a01:111:f400:7c10::103) by BN3PR03CA0098.outlook.office365.com (2603:10b6:400:4::16) 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:37 +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 BN1AFFO11FD008.mail.protection.outlook.com (10.58.52.68) 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:36 +0000 Received: from bf-netperf1.idc ([10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v0JDO4f3015351; Thu, 19 Jan 2017 06:25:33 -0700 From: Hemant Agrawal To: CC: , , , , , , Hemant Agrawal Date: Thu, 19 Jan 2017 18:53:52 +0530 Message-ID: <1484832240-2048-28-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: 131293059366432386; (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)(39410400002)(39400400002)(39380400002)(39850400002)(39860400002)(39450400003)(39840400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(5660300001)(50226002)(5003940100001)(8936002)(81166006)(53936002)(8676002)(81156014)(626004)(68736007)(48376002)(50466002)(104016004)(50986999)(105606002)(5890100001)(106466001)(76176999)(356003)(36756003)(85426001)(2351001)(305945005)(110136003)(575784001)(92566002)(189998001)(86362001)(2906002)(77096006)(38730400001)(8656002)(33646002)(4326007)(6666003)(47776003)(2950100002)(6916009)(54906002)(97736004); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR03MB2478; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD008; 1:WFYTmeP+leQSupMVinmD15BcKVsYOXR4F7qgMDZjaAfpGZNey6lFEtGcxDOAgW1cTm4X0cHisPYcGxMccfWmabe+oZs0AB9On0Z5VATVgS0I+tCir9t73mJUnOrfsAWz4Lnx9a2xZSlOMRzmstl9tGddK/HXx8AMgamM02hK2Jomrcyr7ZUKp+Wp/f/Gkv4dxEmy1o/Sk03vMGUmsQkCA2+RkXX3kfIrb+VugGoZRqprCD0ITugoP9OhhSwdallXJG29kwUCyy9aHe85JZBqVaYlS9JVEUKQT/9P9xs9plK+rS268+2VnGHMv3Dyqgkl/WlNC7HpmjONcRs3ZY6AUBIXqymWAc2heXhjdRn8G/U6rQYUwOzTysb90lBtModSnthCTGpezQSmloqky+bEulGWzO760Nos44rQ14smBVeRqZpzls/fuzw10pwnpgFTnwM9r3Q66Lo1uIjusU/R7d/Z5ybxlrh282E1EMb+h5saTIWQflHcwpto62KJl+Lr8lbWG6GsaWOe5mluioqaXatWfY1BiGFz8rR627//yU+XFLbKy4sWLHXMHeblknwun9axcHIHZnJSFaJdsQ72exFZFh2/ygtjHav4Gw5qLk0XgVdj8ToqXqKw1yg3Tyx2lrmJg98WP933beCGNtzJg8icnRLW1WEujQ/b1Boa5RRQaMXP+MVYOz8DMamevUmIy+lgRLsVR+pvXLDpT+xOTCFy+yfkBVMKY+Agj2PAxNBafWT2ewwxwo4Dt19rAmuo MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: a57029d6-f59f-490b-a39a-08d4406ea766 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:MWHPR03MB2478; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2478; 3:llUsUy26sc43t7XOiXxzBVIuEz1l7TjlJDF3BeM2CLjIcbNfkDD0grxouTYnlcYS3EN+xB73xhts1iDZFRNSN958wMMYcV1+nc/ELZZFGbSMmNn8qLtyYb4DIAwm2sooChCCMO/Fo7FhC6ZK4Ztht3YENj4Nmx7BfcT9MNgpLIj5xr6RWDHKAoGs7fqsEOcwAF3OgoWL/840w2fXOPhNQhqmcOc67N/fuEzUJDW+bSaCrB2Mp4SL1kFKDkcYA0D+MceVTc9gnbza3LKiTD9WwOPTlo0Zos7phAo5SMr6Bch23Izhf6TV1tzrMyvlMXFqKwXvGzN/tykXmjsr0CyTSgnezsw9OrkMR74hovVvtAfi/DDHjQYRvxSrJeVcRTIn X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2478; 25:i8vGfxjh0CVJgaU1tq5L3hDLER8ow8EB36oefYtBXuOR2L31qnkw7RyFdNO5sR1UICleaNTOQkt2zb9LMbvqIE/3qXfdSdLKOy1p8wHa+imIUPGA5TYw3cp53L6B5xtv8RcW/ztr0MDtqLBiCzJl9bjUnE0WoWmdhyZpWsutgKc1KlQS+1e7ddooDY21n26xWAyHHPVzM+XQGObHXGUND3ZmSXRM/52sG9jr7qmYuAKTbV3X9wyBuYxvZJh+n5F3cGLjGE6LldJTgWZWEbAKkGligKjQCy7CMtNzVamka2K7AwYIN8aDS8DTnCwJe7esyIJ+enGvw0kMpdZ2Nzt8RwtMDFuxaQ6azdGUCK6ziiGQQara4mSVZmTC5BYyIOOuhxq2fY5gp3LBreuzat9qXqWh/pGC+nnPRJSkVy+iKAF2FtxDYsejuLVKlSd89f2r24wQ42KtdJ7euGQ//lemsHIlKsgVpgJes52HkfAgcnqqYNAOmTF6TUbp8XhxTq+OvQLiFaG/GsW8F+cw2bDD8P4ELhKlQCbQUc7OiACjIKixTIJsmuUhk53jSa0jvw5Y0C2Zjw2slYyImGzxs1UPVqBIRWp0alkujXVUV6zp4BFNgOxcDjESw8p/KLePEGJ65vaK0lDqtnSwxwIxcWSFiWLwGAqd4E/Zo9n69twb3QsI6pV06NwRBZlnkTNHViv+lZvabsd5kxFLtF1BPUe8D8/5TRAUsOcNnf9lJmP8H9Qr2Pm8UvWTmWTKK+Qx+MLfNnWxhV7aygYkjKT9bcncig== X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2478; 31:q+F4G1evX4roG5DMrYQFr2ITp5kMBNhfNH9nje82Mo71cfAA3FjJlzfJ1fChJ7FlLACr75vFAvJy2jg1QbTzBOsig8K1inRGiUEaa+ta9y02fwBul5V23TEy5hOIRR6yPUyXY+bEQnXb0VP1HjWWC/aEbrrWEn7iI9GAk9A4wyuE2RiVJLQa9UEe6OBFdfNy34mO8H+gqwWx0EqwFUaacPXw8SY1pSHdFFmvLBB16fkBRujNacQojqBaIvBFYs89uvs1amFnhYEqc+EqL03LJGPudcUhkURih1haaOiQmDs= 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)(13023025)(13017025)(13015025)(13024025)(13018025)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6096035)(20161123561025)(20161123559025)(20161123556025)(20161123563025)(20161123565025); SRVR:MWHPR03MB2478; BCL:0; PCL:0; RULEID:(400006); SRVR:MWHPR03MB2478; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2478; 4:Y36U6wOd/MCpdkhqWIGCy7c3yjg/bnbQ8OYMRnKeJklASj2fLi6d3fUjcPKGHolzxybrXMmRpbdqFD9Rg0FPgzMI1rZz08v999jc8fVlgykMhuPJ9LptfpY4XnCvR1iUTodPvbQjCnSca9ACYLd9AbkEd1582VMDRgh0b7TKRjIAm1dWEMu1lJMdRuxl/ye+XeGuRz2g7Gqe2Fs1/GttXB+6t5sHVLrRyydoqvUqm14yMUC2U9L88Np5f5fBgBS+3wnOxjzHosKZ+EX608LRZYnNyxuXQ+vJPi4c4gsSA1uHr1ieBLd/3ENwU23A8RXH75dQ2hUICJPmRxqAGzthjuUrnnKXcVAgFIJQ0qW0UVIY+B+wr44ts0n1AfkaZR5MrzBqAVCuAY8iGEPnFY0trlmA8+rKay3ADLmXldT7OjlT5nhIN7SQGEZ8+t+dFEZ+NPtL7TQlXUbNKWJRQWc1Fk8Q4DcK8Y6ryYOthZ5lfDF2X4itn5X2BMU9QcSVKRQCaPD4UdEJ3HbDymjmLP2DV7BFCwXlueTwYnu0zjIFg3KkQAnq/bbpNT30KkJsMFaiQpnkJGxSnHTM71KcYhVmv//Jdoqo+dLTRRBAI7YsS7+qG9dosq8gJ3FycnGp5FtgndoTyMDw3699sMnp1RgHwXkUseoMLSSVfQRVgfQtb6uyK6OKoEKfEoNo2FUiHYZJOevnhn3oqQGwmivYXrS7LMyYJiRN3f2s9qZHjK07sHD6h5Wpc8+pcN30fR64LiftC5pa+TFucR+U+KF13qFBAA== X-Forefront-PRVS: 0192E812EC X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB2478; 23:LPrAbj/zKIZqqeGIsLBSFutBNTZkc0fCFAjH2scVO?= ILJuZM6vjd59c80ddH3Rs0j5GstkgV0NaRHryyMBkk9I8Mp8QriNkrxE7aOLbHv19PBjRm8JK9u/iAQOqz1SFDA0fKSGJwpymu8rDO1Ga5gdSd9YUN6fAcypjHBninXVGos5GfrP917gBY6sj8qs7XVAjM87Uj7fuVEY806AlG+G/332b/qivw9P5TGQ3m/fe1SQk0iAV6ohZBv3yTxmg3UST5rU+MzvnlgqFi9QXq5xuNmzRvbSHCweu3AMEgwI44LO/2SvnjdcMqpGJg6issEZlhF1bXcY1DphZczOgYCtGFTpO3DmZZpm/X4ZndBAOE6UZbl4gGvAqGdot96WoWOUZfs2U5vZN+7FW/8cJD9AXw6AoqyldSQloKSKWVcFjmCDQqC9wLzdC4q5AVbRSfV95rqWjb0mh7f2xzI3hjG2fG+3NLmfxZUUDcDANKp4vqBfGIPUWWVbqzUw0FD8CdCmqUA2BYu2xug8OGYX8Y4wfA826N8K6y6R6Dx6HuREW/XhuzJqyf2SSdJYKytxeZM5iwWYBBjpuU0JykiYfQZMmuYWLrLjaLIIioSc3f/XTpR2graQ8mt30sxmoJ2QtQjLgsvlRIHlySVFtFsfHW6durpkJ+44EdrEHcMbvbnnnHxiIFjdEbXpvBcBy1Z9/QTWP+i6cmwdGzPaSH52Jbje0Di9mri5vahMFIgiRwAbXa7XnRakfedzNOtMP+Awp3nDxv6v2xcZ3Imsa96rm0lQAJdr4UwqcbIpcTriQiHnen/I3mvBDtVhN+60FLHivTagqwmpCkksPncaQXxz/4psHzE/iKqZEbaJu2QGBITbBBcOFAwjfbpS4l1waSIGsiMg74s4xz+Mz8eFb2dldBPfVmv3EsxQBe2nXAB0/bBYZP5kjrW/Jj36nwtecgF5ntTJT1INYYI8ZN9Da/P+tFtAOtVO5kROrvsyFkbfL99xYn5b1ATLWs+u/lZHZMnDn/G8Lh/gD4X5DFdF17avo6fazftJSwYf0HOLDpmp3/amyhkpJPm/8Bg3X5NZdRxJObYxKIUK1Kd+eKveA/PPiLJHbdt/apRhz4iZGbc8natqw9bqBIiXM+9l8VtYaJsb4fCmRJy9Qjxca77jqrKw+s3yVY4es+ODjHsRy4jmSvF9YWajv7RZQb4vWan0hHtWt4sWr4LYy7XZDRSRxEqsINmOsu1QxLW/k4D7T03ER9qC+Ey6Gzdk/iai/+eSBH7jbgFhrSDbd1MeLiL+8FkFqCmweL0IOGm0tzUfhhWxbGAhDT/D3dsdJCfp+paiom0CqHJfHlrPFiEQKqGZXdq0Mbj6w== X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2478; 6:ZmA6isjZr+ZSbukryH2mTP3QSVY6hhMFoeGkFu0OvmkHarYEtec0nfBQyOwp42rsngUc/yF3E2dymmA3NhSrRtBOB1tTJ0YgT9y0cBj2TyyPvp3ZKzipCGwAiiTy7QTFnKaypfiorUqAy7eOhgRITOSG+tHz7pNws8Mf0Kp63UwUmwPpdvIJ170w1/JYpg6HNON7S4DFve/bka+LD0gDZNwC8Q2OgWpjmyU7S39ewckzEMqGCTECFwkk4cjdwyq7SnRC7CkRxP+ghWRFVEaZZ4WtwU4Muhcsf4Lonnl8C3db0Q0vui0F266WR7aMaCICYZ9jOqw6QKClyKaXzFA0+21VajDJ4DG59EfckiSq/Q8eG658UkxsqvJ0UDcNKzp2UXn9f+3DWE4OXOPgwtKx8mIFvpr9sr1B3lQ9on/NgOmY1VPf3oneS+vCf2FKSdBs; 5:tIYhJekN0NND6HLjpTEFYiqMOT4GhbtDjzBDjtcw+lrXhOv0Bii70cjbT7eCKzASVEuNskmJU+Y0MCoOLSy2dKUk4wHnllc3ByWCJO4qXR8PaPjK8eLDkI2F2+pZzs1v9DIQCC5Z3EosG0SPg6KY4znHfv5JMencp6Wzfxq1totfivdN5GDvxbU003qelC39; 24:NdgTEg0mCX59G2kCNhRYCv/03hlpTMGbNvTGLfZ/KyRwwTsGvh4C7eBfUmBzsf8jBkc481QkQYdfwO3qyPdvkwA/zbMrigklpt6/XURKDTI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2478; 7:zxtge/KMEX27fRzzyrpJTZBz6fRk13B3RsdfgaBCT11AbKLB/QjL8p/rHaCjlNolpC/SJ47Mqn+mmTghT8XU3e7K3lPETbpPfY+JocDj9IJYn7g6ZdsNMMsNP4ElDKLe7xWOKZ46f8/jLaTindaYLcqEnkn5aeEWAFKv80hJuQp9weXvkywVd7Huj8/FdwMAgxZzM4KVPFlrgnaElhf1re5pT3C6+LQFpwuFFjn64emF7ZLLa+1aYvCbgTTuGnqj0PPss/4fNph609nI2SkfzQFbjS2xhXJiqwUBHeXhv28Lh17/CXQdVQDUQixWWMOG9lQkWekhASqrlbstIP8c5BBwVQVZ9xFkRfEKexQM/SXr5UK9Jhm8CAx5IKI/C5jAr3KZ+Vzh0fUXZ2bVbgsiSKppeimyr4Xuq2Qd+GZdqY87J3YtZz0JCzvqQy8meK04umHQdaoDcYRvcW3tvkgEMw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2017 13:25:36.3156 (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: MWHPR03MB2478 Subject: [dpdk-dev] [PATCHv5 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; +}