From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0055.outbound.protection.outlook.com [104.47.38.55]) by dpdk.org (Postfix) with ESMTP id 9637E567F for ; Tue, 11 Apr 2017 15:42:55 +0200 (CEST) Received: from BLUPR0301CA0005.namprd03.prod.outlook.com (10.162.113.143) by BN3PR03MB2275.namprd03.prod.outlook.com (10.166.74.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17; Tue, 11 Apr 2017 13:42:53 +0000 Received: from BY2FFO11OLC008.protection.gbl (2a01:111:f400:7c0c::165) by BLUPR0301CA0005.outlook.office365.com (2a01:111:e400:5259::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.10 via Frontend Transport; Tue, 11 Apr 2017 13:42:53 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=fail action=none header.from=nxp.com; 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 BY2FFO11OLC008.mail.protection.outlook.com (10.1.14.255) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1019.14 via Frontend Transport; Tue, 11 Apr 2017 13:42:53 +0000 Received: from bf-netperf1.ap.freescale.net (bf-netperf1.ap.freescale.net [10.232.134.28]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id v3BDgkoo027977; Tue, 11 Apr 2017 06:42:50 -0700 From: Hemant Agrawal To: , CC: , , Date: Tue, 11 Apr 2017 19:12:39 +0530 Message-ID: <1491918159-4152-2-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1491918159-4152-1-git-send-email-hemant.agrawal@nxp.com> References: <1491724786-6468-1-git-send-email-hemant.agrawal@nxp.com> <1491918159-4152-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131363917734961983; (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)(39410400002)(39400400002)(39380400002)(39860400002)(39840400002)(39450400003)(39850400002)(2980300002)(1109001)(1110001)(3190300001)(339900001)(189002)(199003)(9170700003)(6666003)(356003)(2950100002)(104016004)(47776003)(54906002)(8656002)(53936002)(48376002)(77096006)(50466002)(8936002)(2906002)(86362001)(4326008)(38730400002)(36756003)(8676002)(81166006)(97736004)(85426001)(189998001)(33646002)(50226002)(5003940100001)(50986999)(76176999)(305945005)(105606002)(106466001)(5660300001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR03MB2275; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC008; 1:3SY3cG1mR2GSLEhHGL8J1Y5XDcbPmeVM649AUtvPj3VMJK+Ed7Zq9EjXxgYZ+3HKzSX4pJCI8VZWoaLo07P7CLY/i1CEcCT8wGCEc2McPbRbPpTPOnN/3rtNb3D+h1tS56vMi6tLI/poiLzKkfqpKvioFbOX+rcCZbmsHwMxXEZlxujO9ufG6ciQRkKn5A4ClpABqoObCZuOJHWk//tMz+V0DmmfNvg1zG/8qPqWlM1oygeLYgkzeyXT6PRhtL+v2MIUIj6Zx1lZ8+X8WxX7jELcxFRmWbVj1cM0lX3UYih0c1EdDiWW2cB2Z3oSRZx5wBDl+FehDERym8M8bs+OzFvn4NRoUbNRy22bIDmM0y6lJSNBbFZ6Fzsz/56i1NZfZBBvbSfkarJv24RKEjIP6mD1Hq3iGhZeSsE5wF31fLXW/qXDcZQGRduYpEa7CbvYU/zf7Q+c1+wiEFkdvlR4l/gBJClAu9ETon4jtYGIoouuqT1JGxTdoE2l18RifM6+i5AgYjkU9Fgco+CDpdWKNXGYcSv2K0fGckxoSNOzLUaVlgFYNFDqleat1X4YW31wOYqciIhYYiNAK7s/IUex0zdhD1gLnorFmTX3gvEydS6L8SUftnYAo5Tdpa1WyH3otuGOX8DapSj97Sdn/ry5FrQ2oZ5ICg59NEoBaF8ETbh0b/ZMcvZM4tEE0lfRgv0e MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: be64221d-ad18-4037-f70c-08d480e0a746 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030255120)(201703131430075)(201703131517081); SRVR:BN3PR03MB2275; X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2275; 3:uF+N1JNPkno67orRtsmb/YuiESg7Hq/CSZUjhRxaIXSeFetIfjSY2XsDj7pmFWLoVzqnKj/dm5QkvHm++7Hh6rFSJkjg2K7affO1qZc+Hur8H6yBJ2zgw4iDVBZ0sXWlqadlY/sa88BKa993GRwQ/oHtJ7jLMD6bthoHxMqgYaO0zH6eUoV+hxhj3BbgnaejPMCKyJOwE0eoEm1upVw12Pk6DFPUUqyb2DK+zhlG3w+do/dpuYCeXLPQwFAIv3zkznbZVlVbBhUFa4KY0SagaDtu7QeFAVGMq9ROI442QhXiqkdQiiJMt9v7njwO83QO6tbEq2duSsLXonYWQ2iU0ZgAfF8rXsB2MdTGtE0cR13uLWYDfcVEFbUXCX4wMnaTTKjAvQqv7zRJOL0JqxfKEmYYezfwPmSPJ/RKMqitzyCT72Q7s+41LIGxFe1WbIoHg4nhw9hv7fEz0OwbeRDmPQ==; 25:A6DsO6FsKN34jzWD04bb9B5yzWnuJwK66hRumKqCstAjDmkkIv3bYjOv8WnGJSpvnEdlB/eTlU5AAxdff136yWumcH5K7Aqqs1w5IpDHExbWHyaCOOgHHV4QCpiDmSRzUET/IRbaE12aMNs3NqykGcudtYtChfBqn34uwWSfGa5OBCBzpAINmNjJhPmST1QF33CCbX775ZMJoTZyOdqLvba3gccL85sZaGBweA7MYk0/KCV9rYCj6Yi40UYzYxKFVFtrIEEKuIzuknSPHRL8lV8iCkDbA8UQvqB9/WiYfsSSS7SFJQ897Jm270x4bJRgKQz+JndPDoWhQihwl1XMwhGbFN40jfEHhJAea0AhqVEeWU6Va8Y34oJPMQIfEY13nIIv5aREUDpf0CnX8ihPctFMocPMb7okc9v5CVUIVWRjkzqd7ztGodvGo4o8evtgnFEym6kd6OvJBv9vg6mUAw== X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2275; 31:Qu/ESMbLtwM7PINDcRQ8OxbDXO/ar3pKjPz9dI11tCl91y9ff5KKVs344sREccXmkqoZej78qWA5MBbC8FBi6A+/YDijjGnjMnHLa8WAr5byR1ErR593mVt7J2S5hC1q5tFeJhAHzg2bS4wPw9pJhuy3uPTfWh1jDOUWZX+ffpPLqa43jLWsyhEuR4VZw3Ac5VqTob0ELmRATCiW7hT7ntSJ8Z2DFiEcRCQRmSukqfsVXPl4cB/NTF9tMnuxgKpQzq6/+S/xmO8AF0utCu34iQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(601004)(2401047)(13017025)(13023025)(13018025)(13024025)(13015025)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93001095)(6055026)(6096035)(201703131430075)(201703131448075)(201703131433075)(201703161259108)(20161123563025)(20161123561025)(20161123565025)(20161123556025); SRVR:BN3PR03MB2275; BCL:0; PCL:0; RULEID:(400006); SRVR:BN3PR03MB2275; X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2275; 4:RC2RGILwwxB5NWhXWVXnKtFdEbaDHOU6CMYlNRE1t9o3oyXbrzFU6ZUMTXqxhCcG5ILA/FdtTquaHCqHve1zG7mg8cHepwh9ejqVLTW9vnIpCEBiyKemcImu6PQpu5U1NGJ57f0c+7t0HjlUI9eRh3E3ugveh4L11ngwjpHdXGdPc0ioX+aZeiCBwlXaz4YQJmuP6f9Q8ZA+ILSrSrgcQrJ77vEi6z4ak1QC6/RNz0zd4GQO3kQbyculTNL4lD2Hb4ZTU898ijDPg2e2r7b1TT3OQAfiCZ57o9a+7pPqrqJG/XnpTWJqNGumTOX2PBOzuOFzEGUev+4rHgO6GssfngYtWyJQFdTd23evA4+e9THI+icXIzAR+RmwngqirzE6qxm3OUPYBgw8VSwcNDPBIKGyvG+E/lSmllhHlalVj8RUAzeUguPMlQShWdS6CpYGoKARiDXtmrenk6Xr15+RHgbO11gfVWtB9dTdtiCSFOLsORp1vcx95o55UWHBXzgb5RRovMOm1KE8IcOVCFIxDuTKgKcgivvzF1vG09XyxqGXYWK0FOHShgZnQlomkljWqLWmMiVhSDjz/0Ayi0GeENz9RzOcglWX449pRghPRwDC/R6fbqXGPLhceUjtbagWOGKWZxGokC2M3Nsd+tsa75rFRds0XEs7lhKGKeXltsyZQNtzUOCdbzvGAmlEl1TYMIJnnOxtZLsy3lzP9rvS/4nz4uH2GSNTu4Vue41HDHKAIiLapZqIw4q2bPSsVubQF7HgzvcS8hb7PRvPL/BO15l0dkbK3611Lhcvb5IyQeevIWleOgqzP4JkpS84DXW93S9aYdBeHLB4eabVTF54RyELKxDh9r+1a0ZSR4BNXv6CBQ25h87S8hLu9zUPTNz8a6eg0W93Zpv5zynjQXTStp5Yy5RInpnJ5NeV5QLSOAs= X-Forefront-PRVS: 0274272F87 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR03MB2275; 23:lKrrdRGzuLYbTR8lO1JPvxTRjN02hxN3Ry4xJcmTM?= =?us-ascii?Q?dj1pMsPakSUjReqAtLZ9LQVHyP5TR9XTUxTPoajK91HPiPiSshS9LX+7PYAl?= =?us-ascii?Q?GjVd/x2X/+jyXYc+KOni3nliBpUxuoBxSN0jSAnb3u0B2efYQayqRpLQG+ly?= =?us-ascii?Q?s85IoTUaocTdlOLO0JcrSX6h61eLx3rNEHTQ22Ok/HNFhaj2cbSHKhqcy+1G?= =?us-ascii?Q?2AfvPn5hfxkFPKuLxTu8kvPpIm1Fn8TwOB9wDsmxMEvRVVdOdhOxWG0cWNA7?= =?us-ascii?Q?NkSdvzNs6sZnNr+tzFfIYlYEGJYcGAfx/P1MHLGMoNVfd93QpIi7znCv7nT8?= =?us-ascii?Q?zhaGDOYa3fJrLlDNPuAkVWdCshsD2cp3shSjukysG3FprDEt5hMChN8JsJPr?= =?us-ascii?Q?7oJpmjcpI+mwNxgEO4iTbFyfIUJOHj7SsA2WoIPVQPPau1ADGgia4Eqv1dtM?= =?us-ascii?Q?CyTVHJZjs2DSeSPdqlVnldm8KvXhqO+YkoHPD5GZ54jQViZ6/2J3cE7k7q2b?= =?us-ascii?Q?j0pc1zVe3WKEJH8ht3T4DEzUbnATgY+XN/or7N6X9b4BzPcbeo1zch9Z3lNR?= =?us-ascii?Q?s9KgRCVX9ZQKk2bOOqgajsIbspo24ulgA/6L58UNN0MAdIHFRnGdDJnYLPlR?= =?us-ascii?Q?2HvsNje0ZLRLxNkZVm6li0db2I9UOkVBa2WakwTcIRtJ2draJFsgiiyov3Nw?= =?us-ascii?Q?sJI0g1A9/Sm6nohxT41zGTqGN0l3pfPNyeYlEABffBG7nAHJ3X4V79h2ghxj?= =?us-ascii?Q?mNGzPfmEUikacRqQt+JE4Wf8fmq7XAchi+vQpgWQQ2XISRV68gtN4h+xJ+JV?= =?us-ascii?Q?uQEmdqQ/wiRQKJnvNB2O8R6kUkprij2RnlTCWiFt3QW66bIqphXYoOfpQ2UI?= =?us-ascii?Q?D4WIfQ5dn1O7oWJkay6c142dQMvZfUENoJT2GqeP7866ZiN0Ubqhw3iroxWE?= =?us-ascii?Q?/Gk3SGxU6OGH1sby26ta4c5D8UCKYQMAYfjp8tLYGceGefSe1Yune4zsb6qZ?= =?us-ascii?Q?sPALaG+AUAjxzCVOc7kZRXWG6zx3a6d/+LVZ9X3tpufOdvu4j8qoYySnl39G?= =?us-ascii?Q?FozYizR/UposndRZUJTAECa7MY0WZMPogLGcSVGHTRSyo++aL+tav+CIXTRe?= =?us-ascii?Q?zKMi2WjAB+osEi62EmZGv87BWy4wZRl8vJfDMJVbZy7kSk4X5a3Z/r7BEa9D?= =?us-ascii?Q?bAYnAfGwafXL/0XpXva+Bbj8pOAaxFdZjUM?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2275; 6:HtW7u+cU/FNZorrKaV3PPmOD04euqb9NQtL+Uif8blC4aqMNTqUVyrWqiN0KAM/0joEdmbEeq/wZQgtxx7R64q/sBrjeThvO4319893jCJ3iUciegnzQjegOIr5Wx6V806Ae6IMGSSt+nKjiGa8hfwZKn0FNWZIghP6uINvHg3GEBavyVXltsaHK2QRpD14z38LzB+X2jw4GTV6Jr5+ZD1EaVsSzTZF4u/Lc09MiPHRBEUSgEde8OzLbuUmMaCNofk8h/SMcs5/eNNp9JoW5HP5VEVkiWGmcNTZnkv95ZpKxotedPdqmlTbNIlpHKM2RLpfth2rjgCgJj0A+X7YyTjnUp3ffPb99Iax95ogK1lodIAj80Y3FFur5+/yIkvJvRDjGsbSxtARj5LtrghdrB68EiFer8EuGw/3IAfMs5KC7mlOiNevaF4yZHu+6auxfW05+YjMTMnvWqMg8Bi1r5Pt8IdoljjY8gW/0pcpE9ZSrj1Gy/DRse5qzRKDK8fQY; 5:NSGCk4DRVjctGtt/skHF23D6mh3PikS0A8DwFLVE8pR7PHJa1PSAXOXF9Wm3uPQCg9GsQ7tXYLFL4ZLo9N7qGzBhfWx0YuQL1efXuiFkfMkuADXVynal1Km/xVURZ6fLMcASLW/P5vE2FLkXm77ivk+emeHOt2Jj0vK2sinFLxM6XV+6os7tYsIkjP278j1g; 24:eQ6DZ798dtP63/HItxUlR3ApH42RnPh6RL7qKn43ywtNFXDyl/nbnXNAjqf/ewEtExv7T8+ADolLH1pDtwTt0HFPU6aWs8gnizKcXrSROMo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2275; 7:9I1cK3AzuGm2npSHlSq3nWEt1XK1g9ZtkzddbVj8ZNFM8lZCMmMlaV46dKvhSS3s0o/VCEyuwlp0LV64KgEx9Zg/lUGywWxe238EBvq+7rSNmFRGuh/00i0wJ1aGPGupkXj8YOlo7Pw3QNlN4sWZDxV5EM4rzc2fH3wkl7ONlTvk0zRTavdN9460KB7I9IAyiOqeU1nsdRSlQ9E9l0W5WLuFFwfhHOpIxyAzbeCb/Ib67tyvriYvx0FOGRwBr2Xi/m/pKyO8WoRFpz5YJyZvpRFamDTl8H3p2ZgUm+q7g2edREHcAb6NbCZta8+iveREIehYt/anD4vs3G6qvuai7g== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2017 13:42:53.2622 (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: BN3PR03MB2275 Subject: [dpdk-dev] [PATCH v3] mempool/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: Tue, 11 Apr 2017 13:42:56 -0000 DPAA2 Hardware Mempool handlers allow enqueue/dequeue from NXP's QBMAN hardware block. CONFIG_RTE_MBUF_DEFAULT_MEMPOOL_OPS is set to 'dpaa2', if the pool is enabled. This memory pool currently supports packet mbuf type blocks only. Signed-off-by: Hemant Agrawal --- MAINTAINERS | 1 + config/common_base | 5 + config/defconfig_arm64-dpaa2-linuxapp-gcc | 8 + drivers/Makefile | 1 + drivers/mempool/Makefile | 2 + drivers/mempool/dpaa2/Makefile | 63 ++++ drivers/mempool/dpaa2/dpaa2_hw_mempool.c | 373 +++++++++++++++++++++ drivers/mempool/dpaa2/dpaa2_hw_mempool.h | 91 +++++ .../mempool/dpaa2/rte_mempool_dpaa2_version.map | 8 + 9 files changed, 552 insertions(+) create mode 100644 drivers/mempool/dpaa2/Makefile create mode 100644 drivers/mempool/dpaa2/dpaa2_hw_mempool.c create mode 100644 drivers/mempool/dpaa2/dpaa2_hw_mempool.h create mode 100644 drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map diff --git a/MAINTAINERS b/MAINTAINERS index 5018ae3..cd57447 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -375,6 +375,7 @@ F: doc/guides/nics/nfp.rst NXP dpaa2 M: Hemant Agrawal F: drivers/bus/fslmc/ +F: drivers/mempool/dpaa2/ QLogic bnx2x M: Harish Patil diff --git a/config/common_base b/config/common_base index 94f1a60..ab0750b 100644 --- a/config/common_base +++ b/config/common_base @@ -304,6 +304,11 @@ CONFIG_RTE_LIBRTE_LIO_DEBUG_REGS=n CONFIG_RTE_LIBRTE_FSLMC_BUS=n # +# Compile Support Libraries for NXP DPAA2 +# +CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL=n + +# # Compile burst-oriented VIRTIO PMD driver # CONFIG_RTE_LIBRTE_VIRTIO_PMD=y diff --git a/config/defconfig_arm64-dpaa2-linuxapp-gcc b/config/defconfig_arm64-dpaa2-linuxapp-gcc index 365ae5a..0c280d8 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_MEMPOOL=y +CONFIG_RTE_MBUF_DEFAULT_MEMPOOL_OPS="dpaa2" + # # Compile NXP DPAA2 FSL-MC Bus # diff --git a/drivers/Makefile b/drivers/Makefile index fbc2351..19459fd 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -33,6 +33,7 @@ include $(RTE_SDK)/mk/rte.vars.mk DIRS-y += bus DIRS-y += mempool +DEPDIRS-mempool := bus DIRS-y += net DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += crypto DIRS-$(CONFIG_RTE_LIBRTE_EVENTDEV) += event diff --git a/drivers/mempool/Makefile b/drivers/mempool/Makefile index 0c6c45c..8fd40e1 100644 --- a/drivers/mempool/Makefile +++ b/drivers/mempool/Makefile @@ -33,6 +33,8 @@ include $(RTE_SDK)/mk/rte.vars.mk core-libs := librte_eal librte_mempool librte_ring +DIRS-$(CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL) += dpaa2 +DEPDIRS-dpaa2 = $(core-libs) DIRS-$(CONFIG_RTE_DRIVER_MEMPOOL_RING) += ring DEPDIRS-ring = $(core-libs) DIRS-$(CONFIG_RTE_DRIVER_MEMPOOL_STACK) += stack diff --git a/drivers/mempool/dpaa2/Makefile b/drivers/mempool/dpaa2/Makefile new file mode 100644 index 0000000..26ccebd --- /dev/null +++ b/drivers/mempool/dpaa2/Makefile @@ -0,0 +1,63 @@ +# 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_mempool_dpaa2.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/bus/fslmc/qbman/include +CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linuxapp/eal + +# versioning export map +EXPORT_MAP := rte_mempool_dpaa2_version.map + +# Lbrary version +LIBABIVER := 1 + +# all source are stored in SRCS-y +# +SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL) += dpaa2_hw_mempool.c + +LDLIBS += -lrte_bus_fslmc + +include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c new file mode 100644 index 0000000..5a5d6aa --- /dev/null +++ b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c @@ -0,0 +1,373 @@ +/*- + * 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 +rte_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, p_ret; + + avail_dpbp = dpaa2_alloc_dpbp_dev(); + + if (!avail_dpbp) { + PMD_DRV_LOG(ERR, "DPAA2 resources not available"); + return -ENOENT; + } + + if (unlikely(!DPAA2_PER_LCORE_DPIO)) { + ret = dpaa2_affine_qbman_swp(); + if (ret) { + RTE_LOG(ERR, PMD, "Failure in affining portal\n"); + return ret; + } + } + + 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 ret; + } + + 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); + p_ret = ret; + ret = dpbp_disable(&avail_dpbp->dpbp, CMD_PRI_LOW, + avail_dpbp->token); + return p_ret; + } + + /* Allocate the bp_list which will be added into global_bp_list */ + bp_list = rte_malloc(NULL, sizeof(struct dpaa2_bp_list), + RTE_CACHE_LINE_SIZE); + if (!bp_list) { + PMD_INIT_LOG(ERR, "No heap memory available"); + return -ENOMEM; + } + + /* 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.dpbp_node = avail_dpbp; + /* Identification for our offloaded pool_data structure */ + bp_list->dpaa2_ops_index = mp->ops_index; + bp_list->next = h_bp_list; + bp_list->mp = mp; + + 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; + return 0; +} + +static void +rte_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; + if (unlikely(!n)) + goto aligned; + + /* convert mbuf to buffers for the remainder */ + for (i = 0; i < n ; i++) { +#ifdef RTE_LIBRTE_DPAA2_USE_PHYS_IOVA + bufs[i] = (uint64_t)rte_mempool_virt2phy(pool, obj_table[i]) + + meta_data_size; +#else + bufs[i] = (uint64_t)obj_table[i] + meta_data_size; +#endif + } + + /* feed them to bman */ + do { + ret = qbman_swp_release(swp, &releasedesc, bufs, n); + } while (ret == -EBUSY); + +aligned: + /* if there are more buffers to free */ + while (n < count) { + /* convert mbuf to buffers */ + for (i = 0; i < DPAA2_MBUF_MAX_ACQ_REL; i++) { +#ifdef RTE_LIBRTE_DPAA2_USE_PHYS_IOVA + bufs[i] = (uint64_t) + rte_mempool_virt2phy(pool, obj_table[n + i]) + + meta_data_size; +#else + bufs[i] = (uint64_t)obj_table[n + i] + meta_data_size; +#endif + } + + 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; + 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 -ENOENT; + } + + 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 ret; + } + } + swp = DPAA2_PER_LCORE_PORTAL; + + 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 ret; + } + /* assigning mbuf from the acquired objects */ + for (i = 0; (i < ret) && bufs[i]; i++) { + DPAA2_MODIFY_IOVA_TO_VADDR(bufs[i], uint64_t); + obj_table[n] = (struct rte_mbuf *) + (bufs[i] - bp_info->meta_data_size); + 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 +rte_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 -ENOENT; + } + rte_dpaa2_mbuf_release(pool, obj_table, bp_info->bpid, + bp_info->meta_data_size, n); + + return 0; +} + +static unsigned int +rte_hw_mbuf_get_count(const struct rte_mempool *mp) +{ + int ret; + unsigned int num_of_bufs = 0; + struct dpaa2_bp_info *bp_info; + struct dpaa2_dpbp_dev *dpbp_node; + + if (!mp || !mp->pool_data) { + RTE_LOG(ERR, PMD, "Invalid mempool provided"); + return 0; + } + + bp_info = (struct dpaa2_bp_info *)mp->pool_data; + dpbp_node = bp_info->bp_list->buf_pool.dpbp_node; + + ret = dpbp_get_num_free_bufs(&dpbp_node->dpbp, CMD_PRI_LOW, + dpbp_node->token, &num_of_bufs); + if (ret) { + RTE_LOG(ERR, PMD, "Unable to obtain free buf count (err=%d)", + ret); + return 0; + } + + RTE_LOG(DEBUG, PMD, "Free bufs = %u", num_of_bufs); + + return num_of_bufs; +} + +struct rte_mempool_ops dpaa2_mpool_ops = { + .name = "dpaa2", + .alloc = rte_hw_mbuf_create_pool, + .free = rte_hw_mbuf_free_pool, + .enqueue = rte_hw_mbuf_free_bulk, + .dequeue = rte_dpaa2_mbuf_alloc_bulk, + .get_count = rte_hw_mbuf_get_count, +}; + +MEMPOOL_REGISTER_OPS(dpaa2_mpool_ops); diff --git a/drivers/mempool/dpaa2/dpaa2_hw_mempool.h b/drivers/mempool/dpaa2/dpaa2_hw_mempool.h new file mode 100644 index 0000000..c4d7fc0 --- /dev/null +++ b/drivers/mempool/dpaa2/dpaa2_hw_mempool.h @@ -0,0 +1,91 @@ +/*- + * 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 */ + phys_addr_t phys_addr; + /**< Physical address of the memory provided in addr */ + uint32_t num; + /**< Number of buffers */ + uint32_t size; + /**< Size including headroom for each buffer */ + uint16_t align; + /**< Buffer alignment (in bytes) */ + uint16_t bpid; + /**< Autogenerated buffer pool ID for internal use */ +}; + +struct buf_pool { + uint32_t size; /**< Size of the Pool */ + uint32_t num_bufs; /**< Number of buffers in Pool */ + uint16_t bpid; /**< Pool ID, from pool configuration */ + uint8_t *h_bpool_mem; /**< Internal context data */ + struct dpaa2_dpbp_dev *dpbp_node; /**< Hardware context */ +}; + +/*! + * 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; /**< DPDK RTE EAL pool reference */ + int32_t dpaa2_ops_index; /**< Index into DPDK Mempool ops table */ + 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/mempool/dpaa2/rte_mempool_dpaa2_version.map b/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map new file mode 100644 index 0000000..a8aa685 --- /dev/null +++ b/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map @@ -0,0 +1,8 @@ +DPDK_17.05 { + global: + + rte_dpaa2_bpid_info; + rte_dpaa2_mbuf_alloc_bulk; + + local: *; +}; -- 1.9.1