From patchwork Thu Dec 29 05:16:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreyansh Jain X-Patchwork-Id: 18648 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 123052B95; Thu, 29 Dec 2016 06:16:36 +0100 (CET) Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0042.outbound.protection.outlook.com [104.47.40.42]) by dpdk.org (Postfix) with ESMTP id A235B592C for ; Thu, 29 Dec 2016 06:15:40 +0100 (CET) Received: from CY1PR03CA0018.namprd03.prod.outlook.com (10.174.128.28) by DM5PR03MB2473.namprd03.prod.outlook.com (10.168.233.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.803.11; Thu, 29 Dec 2016 05:15:38 +0000 Received: from BL2FFO11FD039.protection.gbl (2a01:111:f400:7c09::172) by CY1PR03CA0018.outlook.office365.com (2603:10b6:600::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.817.10 via Frontend Transport; Thu, 29 Dec 2016 05:15:38 +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 BL2FFO11FD039.mail.protection.outlook.com (10.173.161.135) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.789.10 via Frontend Transport; Thu, 29 Dec 2016 05:15:38 +0000 Received: from Tophie.ap.freescale.net ([10.232.14.87]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id uBT5DOI7010218; Wed, 28 Dec 2016 22:15:34 -0700 From: Shreyansh Jain To: CC: , , , , , Hemant Agrawal Date: Thu, 29 Dec 2016 10:46:44 +0530 Message-ID: <1482988612-6638-26-git-send-email-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482988612-6638-1-git-send-email-shreyansh.jain@nxp.com> References: <1482180853-18823-1-git-send-email-hemant.agrawal@nxp.com> <1482988612-6638-1-git-send-email-shreyansh.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131274621387359824; (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)(7916002)(336005)(39400400002)(39850400002)(39410400002)(39840400002)(39450400003)(39380400002)(39860400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(38730400001)(105606002)(48376002)(77096006)(33646002)(5003940100001)(76176999)(36756003)(106466001)(2351001)(50986999)(8656002)(47776003)(50466002)(5890100001)(85426001)(104016004)(626004)(2906002)(8676002)(68736007)(69596002)(92566002)(50226002)(5660300001)(8936002)(4326007)(189998001)(81166006)(86362001)(2950100002)(81156014)(305945005)(6666003)(97736004)(356003)(575784001)(6916009)(110136003)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR03MB2473; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD039; 1:uGU0fDOUpFlQeQazCrnb2Sh08r2YdWZee8b3KrL8oZWZ9Eu+3UIvNOk6w1gBD5TiHdnpNLyO+PeM17TehTyXKXFq99SmvSyNz+nC5NF2z3Z4AjXjfxYT22Z5f5ApkkbXrqFYK4ZTsjcmgvkEwb07YxYXFOka6SmNNNQ8cwqHmROXFmoLzfyKPaSd95Gm4bBvr2ceeqBh4twuML7OJdoMh71sjtIis92JsdcRh8nmLasjQOGJHlBQWqGdq6gbcfkUW9dHddZzg/LQWhkuiaOqROU6k+LddVQuuTcOwp8pVTEktEjxVjth0GrmDGD/8QoxrHnm7/BZaAACe8K7YGeT4+SGULkZW6XJQoK/a5N/JndmiMcckgW79MLvQQCibHSFrENmc/Hby0e/bE7BwfZNBDdtzTwLdU5j63s8q2IFOGbPtKjzg0dkDMWItaxcyz2Qxa3zJaydQxrLKk2VuFZDfC8N2AXlc6Ihn40GoILml6BmkKGtMTOogZOSTnHCvONHZusqOUD/1xtiQ3F8+x1ROJ9LTOmTQxZTM+PBzsZAmEYtadhn8FZzB4LHPzju+wv/vfm6C1nLqohGJsP39i03QwlKiGq9sXZ5tAzbtsn/PTvg3CNaQd3yd254wTB1DQ7eNgeghFhKCZegdyx1yPNmWZ5obKPJywUEUbLyc/YRxbX5g4a5lkob7l8U0sHAVDaSnbTrTgI7+ttXJA/LnHkLJhIPGW0Ha8/OruyrfNb4g0AWXbDwG9DUJGrM+ZupIUpe6Qd6DSjrURvPZ2gcc0IA1w== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 0fd363c5-cf0b-4023-d9f9-08d42fa9ba32 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM5PR03MB2473; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2473; 3:c7UN4Eg1WKtkcC+W9cTXjTpZiuvYemiZGwXs5iKYtrWv2QkQsNXXt5WYj5yLjaraX0ocZ1hE5D8QXpRSJZOHLVvk+o1mSojttVjOfMXpCqXLz5GtZz7o5piKHOWPWpWB5RnT0LKe07LPEsnr21Z+qWAa726bsny0v0l+hfoOnt0p/wKdFIln+58GnNhqnBAlibwdNJ57+BSD770AhoEoDBIK89U4JdTYeiEKcNXlV/uw6w71mlm8myEZuUJwLbK2H7kePSFdjl2iprWxPSTh6eYx+hg9ha/oGolStTEFxlKu80zrRha1biETk4aTKC17bFDyzXoAEeO2n6ZFmbYZSPP5VMcz+E8Oj6ttE1gWHHY=; 25:0H56VA4dz1x0nipNPyZns0XJvWmGygogyWdNCK+DF0awI3OFNGH7QEb3FFw7Z7J3vfc0hSDixMg5PLN2g9p8Ped6IBdEdYbOhLuvn5FrSwQyKcNaD0Ao9SVw5Ka4H9rZPiA1BMxGLhd1HaMMAj3CSDccbqjT6k9cZGPDxe+cA1A7AatAo9oqs3bAkWYYq6B403w8KeNpgQ3Bl1ToTXvxUEOUuPpVPlmOAnm60ylRXI6E3qxq4zGQS3yh+pkd7t7vl9twiGBifbNDRdESN4EElPKcvBqNF+yBINBADmczU8riLvF5IK1iBRiHJ85DbDKRiA6iay0mKy8IosX5PJrx1hZNofTYPP/7HZ+e2Oqt4Gc7+iwnfNt6lAoHlVku3R4jm7wSXXDKHVfVLaMK2jW3epatqAsFnWPqL5jBCsyZDw6NSew4bd3CmEMQaEfQKz37Soz2h3cGhy0kLk8jjCaL8Q== X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2473; 31:DjlLpmgRSIKhX7eZqSiAvQCFEyHSL93Dhd4EYBe2p+HGbhex4v2EBwapMyzKOGSHWGhdNVkaTLGS3quhfZ+LJ320FLfqLC5VSej/ohebrThUSrWZWiks7CLzMwD/1CajkARPGKd6UETwFuCY3kIBe1xK3V19McIve8oEO0U+r5kT6d3sjxnfbsjc6O7/WQubKPu99CMdchjTDZ45hVqLRrdChzgf2OupzW9j3z6La2ce5R2J9TBwFAH6o5fd9VLf0ldc97RCBNnbYLxc4Tg1cS+efj3u/rKtHeQScr1xkT2MCDMieeh+EQuDK0+PH7Q3 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)(13024025)(13023025)(13015025)(13017025)(13018025)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6096035)(20161123561025)(20161123559025)(20161123556025)(20161123565025)(20161123563025); SRVR:DM5PR03MB2473; BCL:0; PCL:0; RULEID:(400006); SRVR:DM5PR03MB2473; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2473; 4:9ZUJRHg1muHYppO1yLstezCq5ARdT/GKkjpTvJH/e4ZFu3dSMDgeyo1aP20cewVs7YhDgaMF9wY8og4Da1qD78BOC/8406lpa5w481JaKi2Ink7iKD97U1pluccsizCM02A36wLT6EYB9NMt9SF0mxfOERgegAxl5nX123Byc0s32RRtZM5aQlkT9AigR4hV/1KZiTPykEnFIiqfjf4mRYbhhkKWO7VtMtpdGQXY5gurySZomU9TbtoQIjSCU2F+E3jz5d3ZmHVtmQa2feXmrmwTeI84NrvTsAyowU3Uq02Mr0R2d7qiMwHcK4kMwvLJDQcE79f8mF1EK8SIX/CXIcu6Zkpz57rG4+/VR/AmblYVdsiribyOm8ySTacvacp6Omn2/lqhZTN54iaGBHQzTBWhfr+8VB7v3gj+h5tvA+/5/yEbkCbfDwDeVXXZHZJa0Vwsosw0ZQgoX2GsEEOxNoXq1eDXt91Vt32iZ7W6RJdD/E3oM8VC2lRk//ATCN3eTlpz0wK46sh/j9fLocRN463e2mpsswqTQBo9vFzWmn1YJQaQH7LzAoVgQcNivoeKge7eW/qudrMa+kmgBRSxNufp4ZOMJ6zos5DJHnbmPto7Hm/kBn/H+sWmjPsdmUmBBEF5rr3VRz8Hvx1JDwMMdue66Aax7gCsC4tLt2dovq/Xhqo8eVLwtqdkMTVT7lDVeOJvqw1j7Y6Lk3LFOP9wPvuYBPCs116E9qISWclHM5KXlRH6sNcU0Ps4ZF0SKlvlhNhMCrbE5YkWDlV1hdq+fQ== X-Forefront-PRVS: 01713B2841 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR03MB2473; 23:LNYXXxQrPhdenX4fhp/lASi4tRS+KPKH8RavncRCy?= GXiaCEN4kbQrsPrGpZPaI0XCB92LoqN4l8VFtyHNHLNITnsaMLwN3KfSYy7wFZ7VReU5GvV3YsHK32zZoEKdopBbJcHNm7rmyosICzV13smbl7b7wrRxCXpoTBhlme/YgRxphBx86lARYZ3P4OM2+sLOC1DXM93O4NbbO30OgoTGLzKpHOk7QlSUsPXAbFVUsUpT0uHz1C0R780E3R1rDf07XwTIwmrKcRKQ7iFQXfgzQSjdAlZF8TBjG4BBps+4F2jJW7CSTqTiM1+ZlDFCJfHS5u1eVtknt/hsav/4TD4B7FgqNKP2wQD2IVS0YDl6zhYIfuJtA6e9s1A/YLJnvIC6PotvUlUrr85gJgQ7AIGkh7BtHV5s3dKNEw5dyBHI4xovYX5LidcQPXeCYMr32Bjff/yoRbnOb2cKLIdvQ56zEPXCy9eO96e7s4h3qv6l07Aaouq9e+uLPuPdpb+zB41+q2gHlcsPAzHubf0Q4a1Jc9NHiwpvWRIu4xaCPMUadvBJyuaVkxoBS71BDvNahPXI5BpE6VvWUB4iDEgAygedUz4cN1vq8Kk/rlxqf2Ak6MwCwijgnp1o0QMVyvkyj5XB1rQoC8pusBQC94Otdwv0FXVZttYuHY8uX86gHHs4QdN4Dxn/MuE4WeD/CaU0GfZFp8N7B68hXac+a1WcntJ/YX7JG9+2EHkWGWZ1XpZDTD8hzHbFm+BzfKpxNCLG+AlnPP8fgI+DSDKgza0hCCVvCmkt8g2D3rJffeAIe4WbBvEjUKyZoheyw62sJuSIgLJ89JMue2RlDoN9Tu7BrgxAO5eThnksIzAzcOaD4BJxdVzLQYt7sn+96Yh1HbesyZG6eEYaNBSANBxWAzKDqNkMawTL8LUEAF6+VyPDmC+62Ep8Sg+hL81X+tFN2JGkGpNVeBzevpq7TfuGlFaYdOhKtfVqnHcF9R87a8Yr+RrH7Ew/Tyu1M/ef/D1ww4OFT2Munjmp8iZDCICGx0foBGoAlrrwIscirC3c1EqLgDKiBLlAoDP6YL7k2Ib8265IgS+hEq5JYqsMJhl5kGqs6B7rIhO1b0EnC3bTIFif8tGmV2wNEzYLHu95tRQuQJkVpOD7jogjZijscPCPCmklnTnWxoHLxuq5aRTZygzSAeSrQ8oTaQDtBjx8ZHTYFsLj9IGgC0x2+56fX7Uawy9G4Rnv4MkIx4kCY/lf4qv+YBFDgvRcZZPHN3+4Oixgh107rJ8dHmQr1bxMB1rYAMneP1um5TwNPVuRqll7hLsrpiz+p5+Ay1a9RzRyvRBRGQ2E7BqTe2I84KkYkYcbwRH21CTxA== X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2473; 6:8+zJB6VnyyO9YlhyNwEYljgkti+w2d89dd8Izl/l4/V3o++cXaA2lld2TTfbnbaLubXOBHc+fZG5oBSMoo+Iezf9yeNrhAzhBPLU2Pa+G02kVXNu2oQBjYuF8sTwCoBLhqyvRELB+lJdk+/z/So0aNpLtomqiNYxSALT0rgbmL/lyOF8LZui4Y4McVJiNU37Goe0LgyCfULMD+byVaKoxBrPA6hitphtMf1hOnDvN5spzsBbuhRThH53ctryZW4zKcnPN8G6ufGWQuFINX4w131ZHcd9+hyFVP+fJxcPUS/FtsOLpmmP+uSygktL+hjlROyuze8dLqlJQv75cgagEcOgRSPjR1KTICvHaE2oMFUAVIvxrTBI9rdeUnIhVrEGVAEWslJAjvRHrL5vHXR9GMPYuwRCUVwrKysR0uyYvw3Oo7mJrT0wAHpn8KsGgxvp; 5:QIilbJc9gY0vcOcuUFi83fhM17zcM7PKKlxcWPc4SUugCaTUGmgJ/ZOSIkdyeZ25KhTKCwPCmSwpa1BFal7GIcVonalyNNANnPv4shWn8QQsj28mHvyWncq9rS/sTltU+YUxyQ1wgmEoy9v5PFut5JN4jrLMeFLRK3RWA/POIP+cbjDyvlRklcmze7eSMres; 24:Joz+EmHAeyHEBzW5reqgbqJLfGl+FOcUtX0+Jw53HIWLCSBwvV5f3paVanR4iV1M6+FaeYt2hCTP8yOgasBJWEb1NeZDCa7FFI2JUq9ASOI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2473; 7:Hg/69BhfplrBdFEzSZPKWm3y+3sKl44gjrXJCpYeBs/PC9Cakr5oCAz23Oi6k8FIVsvp8+PntvATL2YsQsE39N75VU1YtA+XPn5E7Uyd2B57nF+3KKoTU+nWeCWGeDPgjYxHdicMco7+sgHBZSdsfxLwjKTOk2SL9ZsZUzsh6g1LiFu9D1oZ1UwYOVDIe/vfsBzoVPWqnca624XTh0O17Oa6wdUIr2sDjrBKRSXjXhCjQZdWePe08K4Anak1Sn5D63xblsrMAIFE/pwqsOFqYPam2TOu2C9xu3Qyc2cTqinKDnkKXoti13KkRKXaOljtjywHHanQngGwm8jq890PYUkNisguOYLYaL3auol3TmZGWTGgeAdf2wAImLWcEQ3LlCWzHrLeEU+j+fIxgI4tq9lXHFJGVN5JlWGH1WGGfi021wyjJ/FEiS53EaCIH5KRyuhcpzZhwwlZQY1MZHvfsg== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Dec 2016 05:15:38.3771 (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: DM5PR03MB2473 Subject: [dpdk-dev] [PATCH v3 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" From: Hemant Agrawal 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 3264bbe..3c4ca28 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -682,6 +682,8 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev) 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 @@ dpaa2_dev_uninit(struct rte_eth_dev *eth_dev) 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; +}