From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0057.outbound.protection.outlook.com [104.47.40.57]) by dpdk.org (Postfix) with ESMTP id 93FA6F94C for ; Fri, 3 Mar 2017 08:14:09 +0100 (CET) Received: from BN3PR0301CA0046.namprd03.prod.outlook.com (10.160.152.142) by DM5PR03MB2954.namprd03.prod.outlook.com (10.175.106.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.947.12; Fri, 3 Mar 2017 07:14:07 +0000 Received: from BL2FFO11FD027.protection.gbl (2a01:111:f400:7c09::158) by BN3PR0301CA0046.outlook.office365.com (2a01:111:e400:401e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.947.12 via Frontend Transport; Fri, 3 Mar 2017 07:14:07 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; caviumnetworks.com; dkim=none (message not signed) header.d=none; caviumnetworks.com; dmarc=fail action=none header.from=nxp.com; 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 BL2FFO11FD027.mail.protection.outlook.com (10.173.161.106) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.933.11 via Frontend Transport; Fri, 3 Mar 2017 07:14:06 +0000 Received: from bf-netperf1.idc ([10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v237D50M005035; Fri, 3 Mar 2017 00:14:03 -0700 From: Hemant Agrawal To: CC: , , , , , Date: Fri, 3 Mar 2017 18:16:36 +0530 Message-ID: <1488545223-25739-20-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1488545223-25739-1-git-send-email-hemant.agrawal@nxp.com> References: <1487205586-6785-1-git-send-email-hemant.agrawal@nxp.com> <1488545223-25739-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131329988468845533; (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)(336005)(7916002)(39400400002)(39450400003)(39860400002)(39410400002)(39840400002)(39380400002)(39850400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(9170700003)(76176999)(305945005)(53936002)(38730400002)(47776003)(92566002)(48376002)(50986999)(110136004)(8676002)(50466002)(36756003)(81166006)(50226002)(105606002)(8936002)(2906002)(2351001)(106466001)(33646002)(626004)(86362001)(356003)(189998001)(2950100002)(54906002)(6916009)(6666003)(77096006)(104016004)(85426001)(5003940100001)(4326008)(8656002)(5660300001)(575784001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR03MB2954; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD027; 1:SgINkMBtRBWoxpn4dVc3O370s/iG5XBia8ZAnhHkWbLZ/ue4Msiv8gjDXk8hOM3gvUyMC73Ilsrt6g2JYZD2/5Fycurtt2EJ3UXoz4ByjgycS9SXcy9D1I+FN7JVeRzdbJM9s/+WGrscSZYgYWi3nG4v8Hza3d6a4smZ0k9WJYjOE8RPW/jcOdeDuhs7ZapsSR9uo8Y6bn869NMc4oTxddeySowmPpVWXHXYH7tvCuDxU2K/X1In9Uhp44NmilB/A3OF2upE/vigv36/02seO4gqAm25wcpIWxzIgezKzvNdGRbu6z0gNqW8ab0GUlljlvA4+Ubcm/V1Ij2z4vESHSyaPA0PL2B9min+xpP3bihRlK9Y4+Uy7guR/4UD1f17IJi9dYeI0r2ix1H2bHfizs5G4gPfneeduyCSW2LqL3evyzGfbAeflfPHi90KDLGVHtkEQ+NCxfaVv6HsSE6QEiRhikscL3OKB9PkZDwSFr2jkq/hMgQ5rVH3XaXkrSfoPsdXrnc0dhHzDchClEHlzWmyiaG2Yd8gMWmLDbRfmsDahoBWErEadJ1DA1gVMyfDZ1IFIx+xrn4QXFEGd3tPonegbdWykvlyF1qQt0p0ux5G6k+gQz4yVgwp7xu1Vw1KeBTJ3n2UXH/jphiIZ6fW9g== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: bb22ed8a-2121-45ba-abdd-08d46204e181 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:DM5PR03MB2954; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2954; 3:+X1IsIKxSia/XZ6T1j8iOJpJOrZLV6kCCPuHAEZFvktVPbz0Im90RpLJiR3f+OCOlOyRFhPM3IXMvHiDUUpe7xV1Tsbc7r95I7jfdea9Bc/Ra2JJs6phnR7C+0NxWP/Mq/1i6Hq7ETWJOOckhTEhrFINiVFx+bnNgVvx6DPKyTOzbRC5Em4e2XzaSSo37h379xkm9G/ucc8l7FLojENINNk3Xn+PnYGGDuePmlX/8SYLX1wiTEW6oxz43cLn2i74I8aXawKZssDU+FHYcGYlQJRWaZCotGL+XygTgGx+RZQWr/p8VAPMs9pm4/5y2xUgWK9adtQp34GixcV8LPONsP/0MBYnJ9KdpBbYjdvJFD34sxUq4vaJRQXDF880fed5; 25:glqlaGwIBdf3nKDb1w4j0qYS516n/1eQtRHhLddqUg+50oEQQ+FSF4bCOEiG/LHtFrsXomWpiH7Gf76CpX9u8/HHWtECeqM2pDL6kN0dXRV8nKPNYW9O7suftW118G8XJJRnvjgQzt0kfIWDfOPTGl0bXpVTniwDLNk8GOchPaEG9WvnvZT+3xsKS6JdOrj7BxdRUwMXYzN+w21ah6ZDwKu17thgwKQatlb3LHLaB21GgBHAiY4eeotKhnWwU62u1iJxwlwe0tobG9BBv0yd0Kmr0nW1yyJ+hC4tIJzkVYYN+Z+eFxm68zNQrysTb5MdujcXPvqIwMBSUZya1D/ENRYup21oDHQjfIdUy7fsP2Jk6KTipi3oiDMXoAlqZs2k+BXDZO9bXCsLkJVgTbH6LNYsx4CcANpostafZeD5Nyw9/+KejpmH+jDcYYno1GwsHXJdJ4rBMOm6oBXoFAw6PA== X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2954; 31:cr2tXyiVDCPp2UFnr6Q0zi7W0XQjaJ6cq5+Fpn6iqQk+a4T2lsyq1RE/B1WwDK49IYxUWumTXkkZHSnQ0vxJ9A/K3fPK9C7yA5AkRVbXXzY87jYERahYuyu1SOVN5sk0Wd0i1EZhzLtNcZfN5KOhATM7o1nYzn9LKVerHjvhJdwDklDY+KrYC8arq3WXhBjBJT42HTYuRoHEgfLX+W4w86XzVVbaUq9LqFFwJOSgKMltgs6Eto4KhbXOKICmYKrh85ZKL83bO0huTHPojwMxBg== 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)(5005006)(8121501046)(13018025)(13015025)(13017025)(13023025)(13024025)(10201501046)(3002001)(6055026)(6096035)(20161123559025)(20161123565025)(20161123556025)(20161123563025)(20161123561025); SRVR:DM5PR03MB2954; BCL:0; PCL:0; RULEID:(400006); SRVR:DM5PR03MB2954; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2954; 4:g1ICO+s6qTBpv7jxeTxsuYD5MyDgp3SgJn8ye9GfhUC2KdmkavqI+eg3RnLm8fDIMUPXoJ8er1YUSg3E6eooliztvw/A4J2zLAEFj2NFHUdNg7yDPJZl+ZP5ir5y2KH9sxwzbCbCwIBGvkN+z9YredQT+nNsthZPqCE7SMFlZDgRJ9o9kK3Xofp/7pSbCTTVSOuoBot1oAShThjBN2uMMT7QV4ZeVgP8Ti3ujbcFC0EKhMX26fXDx3WW7rxLw+eG0S3q1h7OoNEiNoVdBJfB97hMoMSKAv7UKFpNA2kbFJD+SUNdbBfjnNr6NDzrPPkP860TORIOBHz7iYIadRHgNUZqIs3fO26q0lIdYDX0SZcO2PSdI7IuiTus5xgwpTkjCk2FcdtQCjS9vv6hp43WdIC5nqORcJImgDXhyEKK4OlBMFcbW+VFHCrrODY2NDb643VjOOLlTzlTbLKjpria2q7GU+QODAZlIchpcRjzTSaGAhE9SfxyeE+0hQl9LjZvAPlSXpeW+Qc8oOyw7a7XPOl5eCW0xtpQvLJcX20y+QU6tEK1SLI/eHF1hHDq/Xd/iTBgAtOo7tUQJ7cvn5jIR8f5bSYOHfVntyqXAXu3F89jEUT5VcQQYF3IgJxaFJHn1BMUDyzb46+HkJB8r+qAUHPfAzcNDFSjxyNUI+n8OdnX/3HCezjqXzoFMUkJtTDBMWp331x2aAz42cuJIwQBhu6oxe0j/jgU3fJss+QgqvO3qL16lT/nF29afsKMsX4b/JvlVSGepsvSp+wzzpkGHQ== X-Forefront-PRVS: 0235CBE7D0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR03MB2954; 23:JdDp90lmRYhQEQ3mZxQxiHFZw9a0O8lld7QTEjBIh?= =?us-ascii?Q?AymcXerjodlhiDoAYoKx85sf10xfA3s8vQ2G9PSkgKukUjafqF3ok7QJioiy?= =?us-ascii?Q?51qIXe3Sh3FFckO4jO5in0b52p6eMMGFCqBXGaO9rZqMiaC7zU0UqKMCgUyU?= =?us-ascii?Q?gH42fNnlIUCFxejyH/9+AgbpX3JSIH4/qPMpf2cFKqKRPMPkTgJ3SXedlrv6?= =?us-ascii?Q?8QKpUvCfZ6HTp+IRwZBrXYhWQncpF+5yKolWGn1nFZdFAHPcvSEXwTj+8T2y?= =?us-ascii?Q?hgNEQLsxOLmCquIQ0PjrMwqa8cNZwiO79butMbmzsaT0/WaO9cw9Mj1u4jeP?= =?us-ascii?Q?KX3vADlWJJuDFpdpTB3EJLJrv0jHaFXtdJ8KalyNVCAt3s1NlRKxKCBY/2Zc?= =?us-ascii?Q?0qJLBrjSzl8X6y2M0zI4Z3kU1ZJxCAWLD4TW8+iqKtQ5peK4Gl5RMNAPhZyF?= =?us-ascii?Q?CqBYZTkj5A4hzbwo9DhOceIepM9R9MnlbsIdegsIoNREtvwZNWRaL9qm4Olt?= =?us-ascii?Q?G66wtOHiLRGbBhsVbyGZhkMnnQzcK6I+nXDv5nypG94DXu2CZQ04onzm6wKi?= =?us-ascii?Q?mLuQLYdFSR3hUyBQVJHczgHqxZtDjZvHKrcpTdVto3arzOQq8yOIOEkVrltQ?= =?us-ascii?Q?fPMUQzs+NOMWdsIowjBfrreyh9XktWrzOO2Ej+LxDDmL/QEiRKnlZS7vVYlJ?= =?us-ascii?Q?pgKwo7I6XdQ8PQjin3suzUgWnMAnfdtbExaUoebw/lYT0ynQpmcwvuRcZ8YD?= =?us-ascii?Q?bKgltRdd9Dl173TmLQy7jDv4H1p3rqURgaAziBPbOhdHRPzTuFOIi7LeilKP?= =?us-ascii?Q?KV3Ikncij+dvUX9NLqTHNwsshQE0Rnda3Nifd1rK6QZeB8hIxeg/zm65iCdu?= =?us-ascii?Q?A3VUEd57o7nENgnyvyG/XCkKojDCX/ZQ8oFKlZqOZtoiYaFTwBgnoYg0O7Dm?= =?us-ascii?Q?UxdC/eI5VZCZ7/bkheolJr95ihXMdWe8BmwO+/B8fpGgLvaf4DNr9K5TG9vx?= =?us-ascii?Q?TmPXFR9x8wnRzapDr0dpD/0uHhd7GRm1LQ7HZOI7su5IzWrna9ax+Y85Ls8b?= =?us-ascii?Q?bzYTima4jbng7Y+QkTIpAWvnSA8dU/GrtHHhw34UBNW8c4ebdAPWDWyk7JTD?= =?us-ascii?Q?+tNYF+nhVCpcAUGI4GPwTVFn7i5ZzcLkS1aJW1BhtbXGTGQ1eC5ykINYz/iO?= =?us-ascii?Q?FYHNzQ19Odr4NdR8jOnZujsZA6eOXulhEd3VpYMcIhHXfy+CT2JpYEBSPIbP?= =?us-ascii?Q?aY8TKmzbOewE0t7ULPbMZb/f0Iqo/MOBfcOsop1qe9faQ95Bt/lwMsy0NPG3?= =?us-ascii?B?QT09?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2954; 6:CHHWqsbFO824nVSJySJV9kz/jGhIJqN2XNarMg/XW1x5oFRLhb8gHS3O9CSHygDeMvkZdBXp+FUDi8bfqI5+gek/jUlQw0zX7FUtb8gsC4AOM2ko9zGgiqwh5+FXyifaZKz1QAez4HZC1diT21T6FlI5o+RRyNs2FUbU1NOjX7fo/CSeQPIGQ0lqmUoZspmLVRNXCSZ8FPRS3XRre7gx3cvaYf8WRYfPChkuN6n4kzMqq9LeTEDG56z6or5m/tLhiVhGnWvzpwWgD3rdpoVkA/WUCqmY7Gimx3cRNlhIq1WiXTkvxDKUZDrNSy8vLZMYGhC+tI8gIvbVaHtO+GoHCea2N3Xu0KEDPzkps+NFilrgDjrwC1XTdA45S5qcXWpoTrttUg87mXvKjTTxq3Q4t88v3bQNELSZNfl0Kwhnjpg=; 5:rNf3TCDOhhkER1sRo3IOE+BlmI/OM3L0OQAu7NV5n1W78hDk5KZJ8Me2EzV7U8SUje0xg6EFbEdT9yhH4urFux4htriDdo8ORMNdoQDAxxQ2Qse1cOrWmORjSCyDVFIcbmpDTzFsffvc3Gj0tEBaG8E7LCPIuur0xPcpxRlryiWxUgxYAL9xGaGNmRlTk7sK; 24:qyl/Ap8v3P2Iaoi0lVPah7KkgPoyN1oObk2ulHD9jKLGM+RllnANJkV3IgYncwKHQAdOepGb83Ebi4g+Cr8hMtSIQz9pgyH8oUb4qNZRl5M= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2954; 7:ntoKcl8feXPfOLbgSF2s24CNrp7MIRF0QBypuCoYb3MKjS7rSqP67y5qybXnM1kD0gdLd/bMNvkeWis9CulO+KV9UI1LZlv+B50DNSse+eyjepZgFmbkD2CBPkfBFkLtZdRLWRXcPjVU2Cx447xKCFIdlHWELPjl2MvawmjxJthbsENXPX5kQ3eWTTnmfnjRc2TLc5HB1ZziayiqBKeGRGH4LB7K//qc4m/+/lmNzxg3QcJBqCykp3Vk9pOs8hyoZIAR0iXNAsLxG+8b1X9NglqerAIHdIsGyFmozqjhmSGujUDGBwQE5cANbT6r4CyNhgOA1VGk+QKkQpd3iHje3g== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2017 07:14:06.6973 (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: DM5PR03MB2954 Subject: [dpdk-dev] [PATCHv8 19/46] pool/dpaa2: add DPAA2 hardware offloaded mempool X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 07:14:10 -0000 Adding NXP DPAA2 architecture specific mempool support. This patch also registers a dpaa2 type MEMPOOL OPS Signed-off-by: Hemant Agrawal --- MAINTAINERS | 1 + config/common_base | 5 + config/defconfig_arm64-dpaa2-linuxapp-gcc | 8 + drivers/Makefile | 1 + drivers/pool/Makefile | 40 +++ drivers/pool/dpaa2/Makefile | 72 ++++++ drivers/pool/dpaa2/dpaa2_hw_mempool.c | 339 ++++++++++++++++++++++++++ drivers/pool/dpaa2/dpaa2_hw_mempool.h | 95 ++++++++ drivers/pool/dpaa2/rte_pool_dpaa2_version.map | 8 + mk/rte.app.mk | 1 + 10 files changed, 570 insertions(+) create mode 100644 drivers/pool/Makefile create mode 100644 drivers/pool/dpaa2/Makefile create mode 100644 drivers/pool/dpaa2/dpaa2_hw_mempool.c create mode 100644 drivers/pool/dpaa2/dpaa2_hw_mempool.h create mode 100644 drivers/pool/dpaa2/rte_pool_dpaa2_version.map diff --git a/MAINTAINERS b/MAINTAINERS index 3fdcf77..ca86dd7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -361,6 +361,7 @@ M: Hemant Agrawal M: Shreyansh Jain F: drivers/bus/fslmc/ F: drivers/net/dpaa2/ +F: drivers/pool/dpaa2/ F: doc/guides/nics/dpaa2.rst QLogic bnx2x diff --git a/config/common_base b/config/common_base index e8299d3..c07a95e 100644 --- a/config/common_base +++ b/config/common_base @@ -287,6 +287,11 @@ CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_DRIVER=n CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_MBOX=n # +# Compile Support Libraries for NXP DPAA2 +# +CONFIG_RTE_LIBRTE_DPAA2_POOL=n + +# # Compile NXP DPAA2 FSL-MC Bus # CONFIG_RTE_LIBRTE_FSLMC_BUS=n diff --git a/config/defconfig_arm64-dpaa2-linuxapp-gcc b/config/defconfig_arm64-dpaa2-linuxapp-gcc index eb12511..3cdb31b 100644 --- a/config/defconfig_arm64-dpaa2-linuxapp-gcc +++ b/config/defconfig_arm64-dpaa2-linuxapp-gcc @@ -42,6 +42,14 @@ CONFIG_RTE_ARCH_ARM_TUNE="cortex-a57+fp+simd" CONFIG_RTE_MAX_LCORE=8 CONFIG_RTE_MAX_NUMA_NODES=1 +CONFIG_RTE_PKTMBUF_HEADROOM=256 + +# +# Compile Support Libraries for DPAA2 +# +CONFIG_RTE_LIBRTE_DPAA2_POOL=n +CONFIG_RTE_MBUF_DEFAULT_MEMPOOL_OPS="dpaa2" + # # Compile NXP DPAA2 FSL-MC Bus # diff --git a/drivers/Makefile b/drivers/Makefile index e937449..b122c14 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -32,6 +32,7 @@ include $(RTE_SDK)/mk/rte.vars.mk DIRS-y += bus +DIRS-y += pool DIRS-y += net DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += crypto diff --git a/drivers/pool/Makefile b/drivers/pool/Makefile new file mode 100644 index 0000000..3efc336 --- /dev/null +++ b/drivers/pool/Makefile @@ -0,0 +1,40 @@ +# BSD LICENSE +# +# Copyright(c) 2016 NXP. All rights reserved. +# 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 NXP 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 $(RTE_SDK)/mk/rte.vars.mk + +ifeq ($(CONFIG_RTE_LIBRTE_DPAA2_PMD),y) +CONFIG_RTE_LIBRTE_DPAA2_POOL = $(CONFIG_RTE_LIBRTE_DPAA2_PMD) +endif + +DIRS-$(CONFIG_RTE_LIBRTE_DPAA2_POOL) += dpaa2 + +include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/pool/dpaa2/Makefile b/drivers/pool/dpaa2/Makefile new file mode 100644 index 0000000..c1b15fd --- /dev/null +++ b/drivers/pool/dpaa2/Makefile @@ -0,0 +1,72 @@ +# BSD LICENSE +# +# Copyright(c) 2016 NXP. All rights reserved. +# 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 NXP 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 $(RTE_SDK)/mk/rte.vars.mk + +# +# library name +# +LIB = librte_pool_dpaa2.a + +ifeq ($(CONFIG_RTE_LIBRTE_DPAA2_PMD),y) +CONFIG_RTE_LIBRTE_DPAA2_POOL = $(CONFIG_RTE_LIBRTE_DPAA2_PMD) +endif + +ifeq ($(CONFIG_RTE_LIBRTE_DPAA2_DEBUG_INIT),y) +CFLAGS += -O0 -g +CFLAGS += "-Wno-error" +else +CFLAGS += -O3 +CFLAGS += $(WERROR_FLAGS) +endif + +CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc +CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include +CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linuxapp/eal + +# versioning export map +EXPORT_MAP := rte_pool_dpaa2_version.map + +# Lbrary version +LIBABIVER := 1 + +# all source are stored in SRCS-y +# +SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_POOL) += dpaa2_hw_mempool.c + +# library dependencies +DEPDIRS-$(CONFIG_RTE_LIBRTE_DPAA2_POOL) += lib/librte_eal +DEPDIRS-$(CONFIG_RTE_LIBRTE_DPAA2_POOL) += lib/librte_mempool +DEPDIRS-$(CONFIG_RTE_LIBRTE_DPAA2_POOL) += drivers/bus/fslmc + +LDLIBS += -lrte_bus_fslmc + +include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/pool/dpaa2/dpaa2_hw_mempool.c b/drivers/pool/dpaa2/dpaa2_hw_mempool.c new file mode 100644 index 0000000..0c8de51 --- /dev/null +++ b/drivers/pool/dpaa2/dpaa2_hw_mempool.c @@ -0,0 +1,339 @@ +/*- + * 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 +#include + +#include +#include +#include +#include +#include "dpaa2_hw_mempool.h" + +struct dpaa2_bp_info rte_dpaa2_bpid_info[MAX_BPID]; +static struct dpaa2_bp_list *h_bp_list; + +static int +hw_mbuf_create_pool(struct rte_mempool *mp) +{ + struct dpaa2_bp_list *bp_list; + struct dpaa2_dpbp_dev *avail_dpbp; + struct dpbp_attr dpbp_attr; + uint32_t bpid; + int ret; + + avail_dpbp = dpaa2_alloc_dpbp_dev(); + + if (!avail_dpbp) { + PMD_DRV_LOG(ERR, "DPAA2 resources not available"); + return -1; + } + + if (unlikely(!DPAA2_PER_LCORE_DPIO)) { + ret = dpaa2_affine_qbman_swp(); + if (ret) { + RTE_LOG(ERR, PMD, "Failure in affining portal\n"); + return 0; + } + } + + ret = dpbp_enable(&avail_dpbp->dpbp, CMD_PRI_LOW, avail_dpbp->token); + if (ret != 0) { + PMD_INIT_LOG(ERR, "Resource enable failure with" + " err code: %d\n", ret); + return -1; + } + + ret = dpbp_get_attributes(&avail_dpbp->dpbp, CMD_PRI_LOW, + avail_dpbp->token, &dpbp_attr); + if (ret != 0) { + PMD_INIT_LOG(ERR, "Resource read failure with" + " err code: %d\n", ret); + ret = dpbp_disable(&avail_dpbp->dpbp, CMD_PRI_LOW, + avail_dpbp->token); + return -1; + } + + /* Allocate the bp_list which will be added into global_bp_list */ + bp_list = (struct dpaa2_bp_list *)malloc(sizeof(struct dpaa2_bp_list)); + if (!bp_list) { + PMD_INIT_LOG(ERR, "No heap memory available"); + return -1; + } + + /* Set parameters of buffer pool list */ + bp_list->buf_pool.num_bufs = mp->size; + bp_list->buf_pool.size = mp->elt_size + - sizeof(struct rte_mbuf) - rte_pktmbuf_priv_size(mp); + bp_list->buf_pool.bpid = dpbp_attr.bpid; + bp_list->buf_pool.h_bpool_mem = NULL; + bp_list->buf_pool.mp = mp; + bp_list->buf_pool.dpbp_node = avail_dpbp; + bp_list->next = h_bp_list; + + bpid = dpbp_attr.bpid; + + + rte_dpaa2_bpid_info[bpid].meta_data_size = sizeof(struct rte_mbuf) + + rte_pktmbuf_priv_size(mp); + rte_dpaa2_bpid_info[bpid].bp_list = bp_list; + rte_dpaa2_bpid_info[bpid].bpid = bpid; + + mp->pool_data = (void *)&rte_dpaa2_bpid_info[bpid]; + + PMD_INIT_LOG(DEBUG, "BP List created for bpid =%d", dpbp_attr.bpid); + + h_bp_list = bp_list; + /* Identification for our offloaded pool_data structure + */ + mp->flags |= MEMPOOL_F_HW_PKT_POOL; + return 0; +} + +static void +hw_mbuf_free_pool(struct rte_mempool *mp) +{ + struct dpaa2_bp_info *bpinfo; + struct dpaa2_bp_list *bp; + struct dpaa2_dpbp_dev *dpbp_node; + + if (!mp->pool_data) { + PMD_DRV_LOG(ERR, "Not a valid dpaa22 pool"); + return; + } + + bpinfo = (struct dpaa2_bp_info *)mp->pool_data; + bp = bpinfo->bp_list; + dpbp_node = bp->buf_pool.dpbp_node; + + dpbp_disable(&(dpbp_node->dpbp), CMD_PRI_LOW, dpbp_node->token); + + if (h_bp_list == bp) { + h_bp_list = h_bp_list->next; + } else { /* if it is not the first node */ + struct dpaa2_bp_list *prev = h_bp_list, *temp; + temp = h_bp_list->next; + while (temp) { + if (temp == bp) { + prev->next = temp->next; + free(bp); + break; + } + prev = temp; + temp = temp->next; + } + } + + dpaa2_free_dpbp_dev(dpbp_node); +} + +static +void rte_dpaa2_mbuf_release(struct rte_mempool *pool __rte_unused, + void * const *obj_table, + uint32_t bpid, + uint32_t meta_data_size, + int count) +{ + struct qbman_release_desc releasedesc; + struct qbman_swp *swp; + int ret; + int i, n; + uint64_t bufs[DPAA2_MBUF_MAX_ACQ_REL]; + + if (unlikely(!DPAA2_PER_LCORE_DPIO)) { + ret = dpaa2_affine_qbman_swp(); + if (ret != 0) { + RTE_LOG(ERR, PMD, "Failed to allocate IO portal"); + return; + } + } + swp = DPAA2_PER_LCORE_PORTAL; + + /* Create a release descriptor required for releasing + * buffers into QBMAN + */ + qbman_release_desc_clear(&releasedesc); + qbman_release_desc_set_bpid(&releasedesc, bpid); + + n = count % DPAA2_MBUF_MAX_ACQ_REL; + + /* convert mbuf to buffers for the remainder*/ + for (i = 0; i < n ; i++) + bufs[i] = (uint64_t)obj_table[i] + meta_data_size; + + /* feed them to bman*/ + do { + ret = qbman_swp_release(swp, &releasedesc, bufs, n); + } while (ret == -EBUSY); + + /* if there are more buffers to free */ + while (n < count) { + /* convert mbuf to buffers */ + for (i = 0; i < DPAA2_MBUF_MAX_ACQ_REL; i++) + bufs[i] = (uint64_t)obj_table[n + i] + meta_data_size; + + do { + ret = qbman_swp_release(swp, &releasedesc, bufs, + DPAA2_MBUF_MAX_ACQ_REL); + } while (ret == -EBUSY); + n += DPAA2_MBUF_MAX_ACQ_REL; + } +} + +int rte_dpaa2_mbuf_alloc_bulk(struct rte_mempool *pool, + void **obj_table, unsigned int count) +{ +#ifdef RTE_LIBRTE_DPAA2_DEBUG_DRIVER + static int alloc; +#endif + struct qbman_swp *swp; + uint32_t mbuf_size; + uint16_t bpid; + uint64_t bufs[DPAA2_MBUF_MAX_ACQ_REL]; + int i, ret; + unsigned int n = 0; + struct dpaa2_bp_info *bp_info; + + bp_info = mempool_to_bpinfo(pool); + + if (!(bp_info->bp_list)) { + RTE_LOG(ERR, PMD, "DPAA2 buffer pool not configured\n"); + return -2; + } + + bpid = bp_info->bpid; + + if (unlikely(!DPAA2_PER_LCORE_DPIO)) { + ret = dpaa2_affine_qbman_swp(); + if (ret != 0) { + RTE_LOG(ERR, PMD, "Failed to allocate IO portal"); + return -1; + } + } + swp = DPAA2_PER_LCORE_PORTAL; + + mbuf_size = sizeof(struct rte_mbuf) + rte_pktmbuf_priv_size(pool); + + while (n < count) { + /* Acquire is all-or-nothing, so we drain in 7s, + * then the remainder. + */ + if ((count - n) > DPAA2_MBUF_MAX_ACQ_REL) { + ret = qbman_swp_acquire(swp, bpid, bufs, + DPAA2_MBUF_MAX_ACQ_REL); + } else { + ret = qbman_swp_acquire(swp, bpid, bufs, + count - n); + } + /* In case of less than requested number of buffers available + * in pool, qbman_swp_acquire returns 0 + */ + if (ret <= 0) { + PMD_TX_LOG(ERR, "Buffer acquire failed with" + " err code: %d", ret); + /* The API expect the exact number of requested bufs */ + /* Releasing all buffers allocated */ + rte_dpaa2_mbuf_release(pool, obj_table, bpid, + bp_info->meta_data_size, n); + return -1; + } + /* assigning mbuf from the acquired objects */ + for (i = 0; (i < ret) && bufs[i]; i++) { + /* TODO-errata - observed that bufs may be null + * i.e. first buffer is valid, + * remaining 6 buffers may be null + */ + obj_table[n] = (struct rte_mbuf *)(bufs[i] - mbuf_size); + rte_mbuf_refcnt_set((struct rte_mbuf *)obj_table[n], 0); + PMD_TX_LOG(DEBUG, "Acquired %p address %p from BMAN", + (void *)bufs[i], (void *)obj_table[n]); + n++; + } + } + +#ifdef RTE_LIBRTE_DPAA2_DEBUG_DRIVER + alloc += n; + PMD_TX_LOG(DEBUG, "Total = %d , req = %d done = %d", + alloc, count, n); +#endif + return 0; +} + +static int +hw_mbuf_free_bulk(struct rte_mempool *pool, + void * const *obj_table, unsigned int n) +{ + struct dpaa2_bp_info *bp_info; + + bp_info = mempool_to_bpinfo(pool); + if (!(bp_info->bp_list)) { + RTE_LOG(ERR, PMD, "DPAA2 buffer pool not configured"); + return -1; + } + rte_dpaa2_mbuf_release(pool, obj_table, bp_info->bpid, + bp_info->meta_data_size, n); + + return 0; +} + +static unsigned +hw_mbuf_get_count(const struct rte_mempool *mp __rte_unused) +{ + return 0; +} + +struct rte_mempool_ops dpaa2_mpool_ops = { + .name = "dpaa2", + .alloc = hw_mbuf_create_pool, + .free = hw_mbuf_free_pool, + .enqueue = hw_mbuf_free_bulk, + .dequeue = rte_dpaa2_mbuf_alloc_bulk, + .get_count = hw_mbuf_get_count, +}; + +MEMPOOL_REGISTER_OPS(dpaa2_mpool_ops); diff --git a/drivers/pool/dpaa2/dpaa2_hw_mempool.h b/drivers/pool/dpaa2/dpaa2_hw_mempool.h new file mode 100644 index 0000000..c0e2411 --- /dev/null +++ b/drivers/pool/dpaa2/dpaa2_hw_mempool.h @@ -0,0 +1,95 @@ +/*- + * 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. + */ + +#ifndef _DPAA2_HW_DPBP_H_ +#define _DPAA2_HW_DPBP_H_ + +#define DPAA2_MAX_BUF_POOLS 8 + +struct buf_pool_cfg { + void *addr; /*!< The address from where DPAA2 will carve out the + * buffers. 'addr' should be 'NULL' if user wants + * to create buffers from the memory which user + * asked DPAA2 to reserve during 'nadk init' + */ + phys_addr_t phys_addr; /*!< corresponding physical address + * of the memory provided in addr + */ + uint32_t num; /*!< number of buffers */ + uint32_t size; /*!< size of each buffer. 'size' should include + * any headroom to be reserved and alignment + */ + uint16_t align; /*!< Buffer alignment (in bytes) */ + uint16_t bpid; /*!< The buffer pool id. This will be filled + *in by DPAA2 for each buffer pool + */ +}; + +struct buf_pool { + uint32_t size; + uint32_t num_bufs; + uint16_t bpid; + uint8_t *h_bpool_mem; + struct rte_mempool *mp; + struct dpaa2_dpbp_dev *dpbp_node; +}; + +/*! + * Buffer pool list configuration structure. User need to give DPAA2 the + * valid number of 'num_buf_pools'. + */ +struct dpaa2_bp_list_cfg { + struct buf_pool_cfg buf_pool; /* Configuration of each buffer pool*/ +}; + +struct dpaa2_bp_list { + struct dpaa2_bp_list *next; + struct rte_mempool *mp; + struct buf_pool buf_pool; +}; + +struct dpaa2_bp_info { + uint32_t meta_data_size; + uint32_t bpid; + struct dpaa2_bp_list *bp_list; +}; + +#define mempool_to_bpinfo(mp) ((struct dpaa2_bp_info *)(mp)->pool_data) +#define mempool_to_bpid(mp) ((mempool_to_bpinfo(mp))->bpid) + +extern struct dpaa2_bp_info rte_dpaa2_bpid_info[MAX_BPID]; + +int rte_dpaa2_mbuf_alloc_bulk(struct rte_mempool *pool, + void **obj_table, unsigned int count); + +#endif /* _DPAA2_HW_DPBP_H_ */ diff --git a/drivers/pool/dpaa2/rte_pool_dpaa2_version.map b/drivers/pool/dpaa2/rte_pool_dpaa2_version.map new file mode 100644 index 0000000..a8aa685 --- /dev/null +++ b/drivers/pool/dpaa2/rte_pool_dpaa2_version.map @@ -0,0 +1,8 @@ +DPDK_17.05 { + global: + + rte_dpaa2_bpid_info; + rte_dpaa2_mbuf_alloc_bulk; + + local: *; +}; diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 22c22d4..db5b790 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -109,6 +109,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += -lrte_pmd_bnxt _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += -lrte_pmd_bond _LDLIBS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += -lrte_pmd_cxgbe _LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += -lrte_pmd_dpaa2 +_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += -lrte_pool_dpaa2 _LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += -lrte_bus_fslmc _LDLIBS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += -lrte_pmd_e1000 _LDLIBS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += -lrte_pmd_ena -- 1.9.1