From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0050.outbound.protection.outlook.com [104.47.37.50]) by dpdk.org (Postfix) with ESMTP id E324FF91B for ; Thu, 29 Dec 2016 06:15:12 +0100 (CET) Received: from BN6PR03CA0072.namprd03.prod.outlook.com (10.173.137.34) by DM2PR0301MB0752.namprd03.prod.outlook.com (10.160.97.148) 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:09 +0000 Received: from BN1AFFO11FD031.protection.gbl (2a01:111:f400:7c10::182) by BN6PR03CA0072.outlook.office365.com (2603:10b6:404:4c::34) 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:09 +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 BN1AFFO11FD031.mail.protection.outlook.com (10.58.52.185) 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:09 +0000 Received: from Tophie.ap.freescale.net ([10.232.14.87]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id uBT5DOHw010218; Wed, 28 Dec 2016 22:15:05 -0700 From: Shreyansh Jain To: CC: , , , , , Hemant Agrawal Date: Thu, 29 Dec 2016 10:46:35 +0530 Message-ID: <1482988612-6638-17-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: 131274621096152100; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(7916002)(39450400003)(39840400002)(39860400002)(39400400002)(39410400002)(39850400002)(39380400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(105606002)(50466002)(36756003)(356003)(626004)(48376002)(104016004)(189998001)(68736007)(85426001)(97736004)(5660300001)(110136003)(4326007)(33646002)(2906002)(6666003)(575784001)(6916009)(106466001)(2950100002)(50226002)(5003940100001)(69596002)(92566002)(47776003)(8656002)(76176999)(2351001)(86362001)(305945005)(38730400001)(8936002)(81156014)(8676002)(77096006)(50986999)(81166006)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0301MB0752; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD031; 1:ZyBL3LthfF4wKrL77RhBVE7h7XAyfdeDRp7uo6bip0kg3YQGIUUPmceGfXWTWFcOmApfcF6ccpjrnvhfWrVOiGVvfHec1nJJRYr1Knncu0tZCjezoiIqCOuZIjW4hI3tiZGbDqqwZfJW0aA++liCyHo7cE3wNokKGq/qnse3iotk0K2zOPT0eZqFgZrk0wlV09VU9VSICedf5GmVETU7ymqgPDzX1gcuPXZQDEvOQCOkTKgL8RjGc/XPI+j/jfZvnLIKhtPKOXwiIblXIjDKQoZrfvZMSck6RmRs6C/RySpYgFO+reK8bxc6lBibaS0gBWVdb1s09Bxj9qieJl+t3rr3WNS+mdfH9MGjEdswNjv/Wfo6qzveK8WL2DZhDbLAJRy0mN5LkrKGgNaCbl0JLoWRwX5HaD+pKzmLsNmmr0Mdu5ZggXWqt9jTSicgGXiw+aR/HyHDALaqMTCC3QHznwjbmueXC+2cu21sCWg44C28gMuWaU3tHiOScRgnt8YSn2p889Q6vJSOD8IDIDHZ97M0LBIGyqO4IBcAWnbEHNiQt1j0o7STJeG9M/iLKXR9OkgekO0KK+bQBqqoGIGR4vsZwkk2kRXSwjpHA75YtQR7ZdSmX0/rOk0wk4OB8oxG4qSIMrWnv3ZS4rnKlxuwrvGAdMgQ0AO41pITi71bhOV9dBQulsDjHY6hcuLtGNPg8B8JejQnrU2eNDzQveyIvHqOtoRylaN7nn5J4ijeBmGkA8UXAzN1pkK8apFhg2K3KICCUe8JeLKwOsmenaLxkg== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: db88cb91-6acc-45a5-c12c-08d42fa9a8d9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM2PR0301MB0752; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0752; 3:fGfFzXI7j6lRdwwLevKSmABf3XkxYT9GrRDdwDrvbZoTmhaaoGD/ArA/CUlQ4yllKhOxNi2ghVcLSugAavRLCdGdQYXklCBaOfd1y9q2vBP1xfq/FjD0+B7/lEK0ZFtjchIMbx5IvlRqEAf3EhS4aDYRBitVoA86SPUT8PjiEfMj/mwZ7KagAzEu1cvCDjf175OkJN6JxIj8kPwji5O7mfzYN4/rxLBwpbmj0k8v2yBWXXa9lXfZ5cuCvoFtWKVi2j+Qo9LzEwWgYMD26KZBTmVSgBmXWE/G2v5LK79Y3LTvI1ynej475W630yNykRqJhjGICrmA7s5UoaWgh2kA3X9j5QbqylOyXAOSMAhaSXM= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0752; 25:CX2KoeYgJuAVPZ9QPlRqplWdG8/dyhubo31mrMZ18xcKiu/pfZMxkN07sYLT70MktYSfmBL6flMZI48nC6f1y208iN2p0iTThRdrRpAOqTS69VDsT2N99nHgvX/PaeV3TFi5GZVxs50gDiOYugJd8BY0xka4qXvOePB7qmIn3Rav3RGdr2N3CMqk+rlfv7C6ZfiodBZbcGL8bgXiQS8MIR9SPF1rH4Xjb2yWonfZuaGtJpLNRaUi/1GfBvjuaowh4FWBVeHurXcOcg1QpAkJGBiElUVCCvfPeQSjlnnnRCCI1JyUGY8Nc3FCRlRNK9kcTkDcsbyShZbmJV07CwSICCAS/A+W25C6N5ux4f5tySmEeYq0GzDhQPbNV0Cabau2cVWe3/iuq+EPGuzQwvLaBZK9GEp7JW4MLRBLyEt7OaSXsQ14O3ulK3ejsH2RQClKvg/izzB13Budg2XlijCZlyaMTeI3lJICVAV21xGMd2RXoGIwLsLRIf1t7l8aFRiPOrsjkTQQOSawpuw1qG4Umx7StCSZ9fg7am+O9S12JMvwW/T7lKZhewxHjWBD6aS4wRjHeogxVAPvr7IeZYCNRuTUlKIrwVyvCrwlyqEGXHAV2o5CMWoZ20XgU/NdHUAmWGytcGoWuBsNHwPDU9rkvMglFc7UNHjFO1PqsnwvnTXCpoi4eeqKqZInBwZwfqzyMD2HzI2RqJrC77IioVXn/eHSHMB02g+PlygMbtHqz5ZwiTtP4tmqijRYmCWnJiyoP2GiyHd68G96vY4hg5ivLw== X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0752; 31:G5sG3h6cWz9lzLbGAhHj5hND7d8mfTqolzOUbHnMd1lTkqC3R9pDbaUuzdoaNo0ZJASgLQA5byKnOpwkxNtFoJrXngxN0RbpA7RFV3HLIxohwNwz0Wl0Y/bVrA1hIbattMcR2iS5ALRck+CnboiaphlSTBGXH3vwcJuoh9wiCRTwsfRdXmOYQ4xICt6cBwXfFPUEaXQ9IEPOMOwR0/waN6c4rJhVSiPGwTE/G8hdPINw0WXZqwmGAp9/5JwSbl4Q2N5CtNQ8wjKu29qK3Ikbdg== 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)(13017025)(13024025)(13023025)(13015025)(13018025)(5005006)(8121501046)(10201501046)(3002001)(6055026)(6096035)(20161123561025)(20161123559025)(20161123556025)(20161123563025)(20161123565025); SRVR:DM2PR0301MB0752; BCL:0; PCL:0; RULEID:(400006); SRVR:DM2PR0301MB0752; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0752; 4:bLn0knM6JnYnfBLe7y2BMPxLsegq7ft+X+HxyCUL4d3CAL7nOp+eGXmTRD5AoHz/4hNCZlai6FHBSMgiRzIUq6j3S0JD8REtq0RR7WK6mjorQ7M0pnlJ1BhnipB4sQ5SfUsoEfz6W9PxblqDpfMyeoQE07Grk5KWpqY/Cv7Dp3vUl93S8N8yw9hHyfHjEC2SrhKIf4RWGRu5LvN3yow0dVwyF8CiHTjDRdm/0+ptE8mjnn3aSQ9RIDXIPm/tNfWRAxxR4hmV8vK5iwP3j7+KRriWdkVCJG4KcwWqcBMi3ZRm2UbpqIrhO68gTRC0JT5/my/hBUh982ZzjETXHUMJR/Q3fEQU313p72/BJWTtFTp0t8V+tTObcGiRdOrh6Rr6im5wutYrjeue1S68Et0f0PzQ5XhC3i5gZJ9q7l0YEdg8Emh2CREZ9EnTvYyzqVI3I9QLaSGDxsKajzkVjHYgZeC2oOKc2nfoTLhJ87hKjdc36uJJMIYFuidJbImy/dtM1BMKa8ln/03szfjKlFf2qCQU8JbTgbu9lYlU5zkKAjfcO1xGbaWod0cgvAi1+jYX00JEHVWkqhoB8Yyhn9bQ+F571qchK0f/bryzrTc3O91g6JczJ6sem5OB53Rlu6utVkcUYPa0XEEmUGROfoBxk4bJMjAfsCfGNuT1Ew8bB3O9uyJYl30kb/We1JqeOegKv92HKyVu+A3mLwXPeFq4EilH03XUj0uiTjp3spQqsTgObv5JJWuisuCCU9lp+m3IPWRiR6nv0wsuikaUIVyZvQ== X-Forefront-PRVS: 01713B2841 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB0752; 23:JYdj/ioaB4aUjfwXPQSRmQcGpEcLSReqMGTfx8X?= =?us-ascii?Q?MaH4CZ0uKhGkzBus6XDKYUfk/klWiACuYR2JebgcAOUdWjCGaxqPYs8iyfI5?= =?us-ascii?Q?B1eUhw+A0SrlEmYwC+O6WgrL2wl+C7TYXX8X+6VTe3QRqywdlKvF91YaUofb?= =?us-ascii?Q?MFM1xLGrDemHajLHyEJqBu6EIsIaFT3oAWIxFG84wHvYq1BGlUH8aST4MRMV?= =?us-ascii?Q?9LZY4/bjJfBf847yXU15uMZFdkCO1Xa0kz2oq7UF6ySvzvA4+X1/aP0vhm5G?= =?us-ascii?Q?iGkBxAtyFpvnxD/LmzQXmXPpxVtgvbjDBAgCVtwBIhpU2btY+MqQVgywdHkE?= =?us-ascii?Q?Z7jEUbGEmWhaS12OawCMEtG/O5ROyHEsK2StOb/uv9p6z/8NDF01+KeZE/qk?= =?us-ascii?Q?TH+7ImGvhnl4ULAkXUqH/GdgWFzVhtW6O4puDahNCgvZWqhPhpoq7ujZR+Zz?= =?us-ascii?Q?2TbyBwhNEhV583jlXQAyFUl9acuwEsiDlSQctF3F82x0eeWLJ+1viPrfD0co?= =?us-ascii?Q?chABSG09ySpXDQi+qbnnZqedplHqp18BIiM2g3AbiPX6/4g4t2LXQIHGlPLS?= =?us-ascii?Q?8zs5KsK83ArSgruahBiLzEg+nySSWtYKaY76f34f5D58w1MvI5CHRtXqsK0Z?= =?us-ascii?Q?r9+dAeSizCa7DpdlFyw5v+5F9HBa9Iz7fKbVrbvqbvApWZ4l2yTvT2B4Kh+e?= =?us-ascii?Q?MOcOUGhBT9EdptsTlAywHYL5JMmFgyizTnK0ul3rGU8zfrjtoyayD3dRN62J?= =?us-ascii?Q?3DPdKdk7sCOMuZqGQrtq7PADY+3A5TbSPPG8wv+QzCrMUXIlk008mHEvE4Ak?= =?us-ascii?Q?uwB5bRuBgyvajuB94HZOi867GfgrnmOKSUUEOayBfausyZWovAPUkTfwn6ml?= =?us-ascii?Q?2gr9hkmfduIJfgGlN83SS4TCp2NAE94puUSgQh0E8yEpjUzo9MKStCZta+bA?= =?us-ascii?Q?eJsLXuskzuNjBP1f42HKnFXBoTmEWf7pKYNxthYYnmt5jNb7cERGRb+E5IJs?= =?us-ascii?Q?ijY5S6xntdnM/gT7SO5CTkzuGTGzAIn0Qp5Ei09t8v2EmXSSzwaf1mbAHEjr?= =?us-ascii?Q?GP6LyrDddwUud+rbbsMx5cvOFVxbzTUrxlblF7RUKl62YsNBxnRoDkyymMSt?= =?us-ascii?Q?zaqtd3cNk3bqGVUs4oVYpXqWxyyOxo02Nq+lxGqv0gfwz+c/QY9lmqbCyH3S?= =?us-ascii?Q?2LOiLVqCZPj8lP85++pxoZyWr18tAG8671XxBZEavchRZg6uvbS+CWBtB60O?= =?us-ascii?Q?8Xd7q09uGsjPGuHhaRA+pxI+0Sd8T4469VAb+KHnTOBZwi0cajLb8xicQN9w?= =?us-ascii?Q?8Jbuf29EQ/A9ycEDvQ9LPIVHfW+j6yZJgITHGQveczzFY?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0752; 6:7Y5aYVlFiNbdVrMygtpohBCk5UfX6Kb9uGyR4EnHdRtMH45gpezX4U5x8uYgc9RqHxST7613NRHiqBqMbGhgEsksx5c6iXbCWmasQ0VatQgNAeL+a0dR/h3cybo1+EO+eAHl4hTgXHvwBmJ4TRgCpdvzMUHXJnN/U965p5MesnpJ1eJMziAeuuiGL+kQmGjg6Scbd5zgCjyKwEkBv9xXPI6sud8zu7Qv/v/DWZ8FdE+wuFZlF9CD7YHWxzCVdRTLXQVQttYg6m+YF8O2wEk2QnLiJdYvPyh9jmx3gn9bdWLcpG0TAE+E2yJe1cqrECjbkjSsZAwslBsRGD0rPPpOrx1X8VoDGZSURgdXhC4xvlQOavF9y7DmUDcGywXhB4GBqwhBbxozU62eFd/YXGum7uFfO30q8GKe5THdk53FJE5Q7ITRs6ygJgmRCY7fndmc; 5:/Dg9C8zx/iNPsy49mwUArDMhFk1wt+FN1imc/ogRgqds5KcmYdDneL6PqgSCmgNY2gJ+3F6U4hHbmIgR+I0CYBa0b6CW1jNg0hH9ICD0T21MtOF9LU8jBPjefzT2Ul7ehS+8UO6/W2gCDOgvwZYa4kUmzRFEwZ25CPnrUX/bIJM+mmYcyDuePUdSPFXk5mZK; 24:i3bTlqZcaBFvE9THpIK3MUjBQ7u34HFmsO5geAjGXHb2CI8CC/1DxgF32DcSzdqNifJiHC6gx/QmJNj3TEfM6XKTwzYeaX5uvqU8gMdqMGE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0752; 7:2a+gw9GK0JuxP6DCt6ZnJEsmv+7WN8kwCuPr48v1NSJU2zo2klRWQl6ObufyBeQL26AoNW31bxMayIbpdhDiksyYpL8WmcKc4mldHEykpDQzFrjjrZpi6j6zwAdTo+GU+l6jH2iIiaYIVlzLLuRofTvDJHNTbt2Jn4rTcgb15knLpY93JeNyT/DTPQh3R7sbokpYRB7+PY4IEMC72jVI32gT3dAgarSLVCv5910Y4Lv0jkEq/bcfkbgLdVc+0w361A92ucWsdRwCclgoF4x/kDF05jNPjbLoWgg3HNc9c1JZ3UQtW5fHfejE10n/xv4COu9kb6Jsqwt51C14OPpM2jzgce4AZYFwyr05g/CiEiAW1GwwDLTCWzgVffRZ/fMAG2ksHJP6eQEwpA78EpjrG/xxh7RnGQ2t2WysnUEhYsEMyMU98bpvL6esFfOZf49m7sQdQ1WwgqgOSs3lC1pUJA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Dec 2016 05:15:09.2564 (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: DM2PR0301MB0752 Subject: [dpdk-dev] [PATCH v3 16/33] drivers/pool/dpaa2: adding hw 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: Thu, 29 Dec 2016 05:15:13 -0000 From: Hemant Agrawal Adding NXP DPAA2 architecture specific mempool support Each mempool instance is represented by a DPBP object from the FSL-MC bus. This patch also registers a dpaa2 type MEMPOOL OPS Signed-off-by: Hemant Agrawal --- config/common_base | 1 + config/defconfig_arm64-dpaa2-linuxapp-gcc | 4 + drivers/Makefile | 1 + drivers/bus/fslmc/Makefile | 2 + drivers/bus/fslmc/fslmc_vfio.c | 9 +- drivers/bus/fslmc/fslmc_vfio.h | 2 + drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c | 137 +++++++++ drivers/bus/fslmc/portal/dpaa2_hw_pvt.h | 19 ++ drivers/bus/fslmc/rte_pmd_fslmcbus_version.map | 2 + drivers/common/Makefile | 3 + drivers/pool/Makefile | 38 +++ drivers/pool/dpaa2/Makefile | 67 +++++ drivers/pool/dpaa2/dpaa2_hw_mempool.c | 339 ++++++++++++++++++++++ drivers/pool/dpaa2/dpaa2_hw_mempool.h | 95 ++++++ drivers/pool/dpaa2/rte_pmd_dpaa2_pool_version.map | 8 + mk/rte.app.mk | 1 + 16 files changed, 727 insertions(+), 1 deletion(-) create mode 100644 drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c 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_pmd_dpaa2_pool_version.map diff --git a/config/common_base b/config/common_base index d605e85..493811f 100644 --- a/config/common_base +++ b/config/common_base @@ -276,6 +276,7 @@ CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_MBOX=n # Compile Support Libraries for NXP DPAA2 # CONFIG_RTE_LIBRTE_DPAA2_COMMON=n +CONFIG_RTE_LIBRTE_DPAA2_POOL=n # # Compile NXP DPAA2 FSL-MC Bus diff --git a/config/defconfig_arm64-dpaa2-linuxapp-gcc b/config/defconfig_arm64-dpaa2-linuxapp-gcc index d3bc9d8..7665912 100644 --- a/config/defconfig_arm64-dpaa2-linuxapp-gcc +++ b/config/defconfig_arm64-dpaa2-linuxapp-gcc @@ -42,10 +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_COMMON=y +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 bdae63b..9fd268e 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -33,6 +33,7 @@ include $(RTE_SDK)/mk/rte.vars.mk DIRS-y += common DIRS-y += bus +DIRS-y += pool DIRS-y += net DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += crypto diff --git a/drivers/bus/fslmc/Makefile b/drivers/bus/fslmc/Makefile index 1b815dd..35f30ad 100644 --- a/drivers/bus/fslmc/Makefile +++ b/drivers/bus/fslmc/Makefile @@ -47,6 +47,7 @@ CFLAGS += "-Wno-strict-aliasing" CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc CFLAGS += -I$(RTE_SDK)/drivers/common/dpaa2/qbman/include +CFLAGS += -I$(RTE_SDK)/drivers/pool/dpaa2 CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linuxapp/eal # versioning export map @@ -63,6 +64,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += \ mc/mc_sys.c SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += portal/dpaa2_hw_dpio.c +SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += portal/dpaa2_hw_dpbp.c SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc_vfio.c SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc_bus.c diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c index ed0a8b9..4e47ec8 100644 --- a/drivers/bus/fslmc/fslmc_vfio.c +++ b/drivers/bus/fslmc/fslmc_vfio.c @@ -268,7 +268,7 @@ int fslmc_vfio_process_group(struct rte_bus *bus) char path[PATH_MAX]; int64_t v_addr; int ndev_count; - int dpio_count = 0; + int dpio_count = 0, dpbp_count = 0; struct fslmc_vfio_group *group = &vfio_groups[0]; static int process_once; @@ -418,6 +418,11 @@ int fslmc_vfio_process_group(struct rte_bus *bus) if (!ret) dpio_count++; } + if (!strcmp(object_type, "dpbp")) { + ret = dpaa2_create_dpbp_device(object_id); + if (!ret) + dpbp_count++; + } } closedir(d); @@ -425,6 +430,8 @@ int fslmc_vfio_process_group(struct rte_bus *bus) if (ret) FSLMC_VFIO_LOG(DEBUG, "Error in affining qbman swp %d", ret); + FSLMC_VFIO_LOG(DEBUG, "DPAA2: Added dpbp_count = %d dpio_count=%d\n", + dpbp_count, dpio_count); return 0; FAILURE: diff --git a/drivers/bus/fslmc/fslmc_vfio.h b/drivers/bus/fslmc/fslmc_vfio.h index e89d980..9bf69d4 100644 --- a/drivers/bus/fslmc/fslmc_vfio.h +++ b/drivers/bus/fslmc/fslmc_vfio.h @@ -76,4 +76,6 @@ int dpaa2_create_dpio_device(struct fslmc_vfio_device *vdev, struct vfio_device_info *obj_info, int object_id); +int dpaa2_create_dpbp_device(int dpbp_id); + #endif /* _FSLMC_VFIO_H_ */ diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c new file mode 100644 index 0000000..16d5b24 --- /dev/null +++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c @@ -0,0 +1,137 @@ +/*- + * 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 "portal/dpaa2_hw_pvt.h" +#include "portal/dpaa2_hw_dpio.h" + +TAILQ_HEAD(dpbp_device_list, dpaa2_dpbp_dev); +static struct dpbp_device_list *dpbp_dev_list; /*!< DPBP device list */ + +int +dpaa2_create_dpbp_device( + int dpbp_id) +{ + struct dpaa2_dpbp_dev *dpbp_node; + int ret; + + if (!dpbp_dev_list) { + dpbp_dev_list = malloc(sizeof(struct dpbp_device_list)); + if (!dpbp_dev_list) { + PMD_INIT_LOG(ERR, "Memory alloc failed in DPBP list\n"); + return -1; + } + /* Initialize the DPBP List */ + TAILQ_INIT(dpbp_dev_list); + } + + /* Allocate DPAA2 dpbp handle */ + dpbp_node = (struct dpaa2_dpbp_dev *) + malloc(sizeof(struct dpaa2_dpbp_dev)); + if (!dpbp_node) { + PMD_INIT_LOG(ERR, "Memory allocation failed for DPBP Device"); + return -1; + } + + /* Open the dpbp object */ + dpbp_node->dpbp.regs = mcp_ptr_list[MC_PORTAL_INDEX]; + ret = dpbp_open(&dpbp_node->dpbp, + CMD_PRI_LOW, dpbp_id, &dpbp_node->token); + if (ret) { + PMD_INIT_LOG(ERR, "Resource alloc failure with err code: %d", + ret); + free(dpbp_node); + return -1; + } + + /* Clean the device first */ + ret = dpbp_reset(&dpbp_node->dpbp, CMD_PRI_LOW, dpbp_node->token); + if (ret) { + PMD_INIT_LOG(ERR, "Failure cleaning dpbp device with" + " error code %d\n", ret); + return -1; + } + + dpbp_node->dpbp_id = dpbp_id; + rte_atomic16_init(&dpbp_node->in_use); + + TAILQ_INSERT_HEAD(dpbp_dev_list, dpbp_node, next); + + PMD_INIT_LOG(DEBUG, "Buffer pool resource initialized %d", dpbp_id); + + return 0; +} + +struct dpaa2_dpbp_dev *dpaa2_alloc_dpbp_dev(void) +{ + struct dpaa2_dpbp_dev *dpbp_dev = NULL; + + /* Get DPBP dev handle from list using index */ + TAILQ_FOREACH(dpbp_dev, dpbp_dev_list, next) { + if (dpbp_dev && rte_atomic16_test_and_set(&dpbp_dev->in_use)) + break; + } + + return dpbp_dev; +} + +void dpaa2_free_dpbp_dev(struct dpaa2_dpbp_dev *dpbp) +{ + struct dpaa2_dpbp_dev *dpbp_dev = NULL; + + /* Match DPBP handle and mark it free */ + TAILQ_FOREACH(dpbp_dev, dpbp_dev_list, next) { + if (dpbp_dev == dpbp) { + rte_atomic16_dec(&dpbp_dev->in_use); + return; + } + } +} diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h index ef3eb71..3b846a0 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h +++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h @@ -41,6 +41,13 @@ #define MC_PORTAL_INDEX 0 #define NUM_DPIO_REGIONS 2 +#define MEMPOOL_F_HW_PKT_POOL 0x8000 /**< mpool flag to check offloaded pool */ + +/* Maximum release/acquire from QBMAN */ +#define DPAA2_MBUF_MAX_ACQ_REL 7 + +#define MAX_BPID 256 + struct dpaa2_dpio_dev { TAILQ_ENTRY(dpaa2_dpio_dev) next; /**< Pointer to Next device instance */ @@ -63,6 +70,18 @@ struct dpaa2_dpio_dev { int32_t hw_id; /**< An unique ID of this DPIO device instance */ }; +struct dpaa2_dpbp_dev { + TAILQ_ENTRY(dpaa2_dpbp_dev) next; + /**< Pointer to Next device instance */ + struct fsl_mc_io dpbp; /** handle to DPBP portal object */ + uint16_t token; + rte_atomic16_t in_use; + uint32_t dpbp_id; /*HW ID for DPBP object */ +}; + /*! Global MCP list */ extern void *(*mcp_ptr_list); +struct dpaa2_dpbp_dev *dpaa2_alloc_dpbp_dev(void); +void dpaa2_free_dpbp_dev(struct dpaa2_dpbp_dev *dpbp); + #endif diff --git a/drivers/bus/fslmc/rte_pmd_fslmcbus_version.map b/drivers/bus/fslmc/rte_pmd_fslmcbus_version.map index 4236377..76029b9 100644 --- a/drivers/bus/fslmc/rte_pmd_fslmcbus_version.map +++ b/drivers/bus/fslmc/rte_pmd_fslmcbus_version.map @@ -2,6 +2,8 @@ DPDK_17.02 { global: dpaa2_affine_qbman_swp; + dpaa2_alloc_dpbp_dev; + dpaa2_free_dpbp_dev; dpbp_disable; dpbp_enable; dpbp_get_attributes; diff --git a/drivers/common/Makefile b/drivers/common/Makefile index 434280f..0a6d8db 100644 --- a/drivers/common/Makefile +++ b/drivers/common/Makefile @@ -34,6 +34,9 @@ include $(RTE_SDK)/mk/rte.vars.mk CONFIG_RTE_LIBRTE_DPAA2_COMMON = $(CONFIG_RTE_LIBRTE_DPAA2_PMD) ifneq ($(CONFIG_RTE_LIBRTE_DPAA2_COMMON),y) +CONFIG_RTE_LIBRTE_DPAA2_COMMON = $(CONFIG_RTE_LIBRTE_DPAA2_POOL) +endif +ifneq ($(CONFIG_RTE_LIBRTE_DPAA2_COMMON),y) CONFIG_RTE_LIBRTE_DPAA2_COMMON = $(CONFIG_RTE_LIBRTE_FSLMC_BUS) endif diff --git a/drivers/pool/Makefile b/drivers/pool/Makefile new file mode 100644 index 0000000..4325edd --- /dev/null +++ b/drivers/pool/Makefile @@ -0,0 +1,38 @@ +# 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 + +CONFIG_RTE_LIBRTE_DPAA2_POOL = $(CONFIG_RTE_LIBRTE_DPAA2_PMD) + +DIRS-$(CONFIG_RTE_LIBRTE_DPAA2_COMMON) += 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..9494756 --- /dev/null +++ b/drivers/pool/dpaa2/Makefile @@ -0,0 +1,67 @@ +# 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_pmd_dpaa2_pool.a + +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/common/dpaa2/qbman/include +CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linuxapp/eal + +# versioning export map +EXPORT_MAP := rte_pmd_dpaa2_pool_version.map + +# Lbrary version +LIBABIVER := 1 + +# all source are stored in SRCS-y +# +SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_COMMON) += dpaa2_hw_mempool.c + +# library dependencies +DEPDIRS-$(CONFIG_RTE_LIBRTE_DPAA2_COMMON) += lib/librte_eal +DEPDIRS-$(CONFIG_RTE_LIBRTE_DPAA2_COMMON) += lib/librte_mempool +DEPDIRS-$(CONFIG_RTE_LIBRTE_DPAA2_COMMON) += lib/librte_pmd_dpaa2_qbman +DEPDIRS-$(CONFIG_RTE_LIBRTE_DPAA2_COMMON) += lib/librte_pmd_fslmcbus + +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..f36e909 --- /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 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; + + + bpid_info[bpid].meta_data_size = sizeof(struct rte_mbuf) + + rte_pktmbuf_priv_size(mp); + bpid_info[bpid].bp_list = bp_list; + bpid_info[bpid].bpid = bpid; + + mp->pool_data = (void *)&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 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 hw_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 */ + 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; + } + 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 = hw_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..2cd2564 --- /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 bpid_info[MAX_BPID]; + +int hw_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_pmd_dpaa2_pool_version.map b/drivers/pool/dpaa2/rte_pmd_dpaa2_pool_version.map new file mode 100644 index 0000000..289ab10 --- /dev/null +++ b/drivers/pool/dpaa2/rte_pmd_dpaa2_pool_version.map @@ -0,0 +1,8 @@ +DPDK_17.02 { + global: + + bpid_info; + hw_mbuf_alloc_bulk; + + local: *; +}; diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 438fa2c..1bfb804 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -112,6 +112,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += -lrte_pmd_cxgbe ifeq ($(CONFIG_RTE_LIBRTE_DPAA2_COMMON),y) _LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += -lrte_pmd_dpaa2 _LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += -lrte_pmd_dpaa2_qbman +_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += -lrte_pmd_dpaa2_pool _LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += -lrte_pmd_fslmcbus endif _LDLIBS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += -lrte_pmd_e1000 -- 2.7.4