From patchwork Mon Jan 23 11:59:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 19890 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id A924CFA47; Mon, 23 Jan 2017 13:01:45 +0100 (CET) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0069.outbound.protection.outlook.com [104.47.36.69]) by dpdk.org (Postfix) with ESMTP id 57E9AF95A for ; Mon, 23 Jan 2017 13:01:14 +0100 (CET) Received: from CY1PR03CA0013.namprd03.prod.outlook.com (10.174.128.23) by BY2PR0301MB1573.namprd03.prod.outlook.com (10.163.28.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.860.13; Mon, 23 Jan 2017 12:01:12 +0000 Received: from BY2FFO11FD028.protection.gbl (2a01:111:f400:7c0c::176) by CY1PR03CA0013.outlook.office365.com (2603:10b6:600::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.860.13 via Frontend Transport; Mon, 23 Jan 2017 12:01:12 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=fail action=none header.from=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD028.mail.protection.outlook.com (10.1.15.217) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.803.8 via Frontend Transport; Mon, 23 Jan 2017 12:01:12 +0000 Received: from bf-netperf1.idc ([10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v0NC07eg019311; Mon, 23 Jan 2017 05:01:09 -0700 From: Hemant Agrawal To: CC: , , , , , , Hemant Agrawal Date: Mon, 23 Jan 2017 17:29:48 +0530 Message-ID: <1485172803-17288-19-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1485172803-17288-1-git-send-email-hemant.agrawal@nxp.com> References: <1484832240-2048-1-git-send-email-hemant.agrawal@nxp.com> <1485172803-17288-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131296464722135840; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(336005)(39840400002)(39380400002)(39850400002)(39410400002)(39450400003)(39400400002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(305945005)(356003)(626004)(8656002)(8676002)(8936002)(189998001)(97736004)(6916009)(33646002)(2950100002)(5003940100001)(110136003)(47776003)(85426001)(76176999)(50986999)(6666003)(5660300001)(68736007)(105606002)(92566002)(4326007)(53936002)(2351001)(36756003)(106466001)(86362001)(2906002)(50466002)(81166006)(38730400001)(54906002)(77096006)(81156014)(50226002)(104016004)(48376002); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB1573; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD028; 1:LuyA6+NvzfVaBlDuOrvRHRDuTC3rbMz1WrHqJtv4MRE4/WFDxJmn83gfCHONqkOnIGKXHVz/Ok5InUCdRAyvy2cUvs5pmcyePrfSjuANQA+XPicvCFK6F8ZtduXz6vemh6ursNSDuZMRJBZqHPIzW+Bor7Jfd03Mio8yCMw2w/YgGQbWiJe4oLeQ8axtxKYAFkl5F3SxOz0kj7wg686qziYTgscjkKlfuaR/z9CZKSTS1WXSgLsOFlFgHS5ilb4RzYkqVvywMUsCPNHrH9UU7mr3HjWJMQuiODuHNnd6DIz0yQqNix/kDhIb0AGhtBwaxMBwaP9m1+7QPR9pOfP3wNCjzecODxYnxvftev14lTHoHCSaIjADYimpCkrTpGn68o7ANnw1U+5Et91nmc+v8DFQJh7IVO/lJZ0VtmZYIPbnMB8mja4e+NATuqPlOA/G4qHIWy3B/zOKkEeRcXYFGBvtLmUO+zklIkFgIzR5GFZDJUa78HAXbk8j4f9vhQhQdO0lYZFmZKKcwuO113pMKj/1R9kdfbN7+IXyj937MURWZQ4haMUaDk425g0PQPg9Q35UHwPrqkVSSzBA5f+U2oBX/4A0mLJXHYnvBT7DUrmXBkklqh3CGb+zbZqiI320d36c1l2ozEMmPpEJoU80+Vev8D8GOXy+bJ4onu7YHJYKrJtca6lxwFTl03kPlt+WAqykmFh180vlcGSAiS7T37/l8vCU8fJ7F/rUaYR3RXF+5raa8xaNh4mfBFr8SWNq MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: d1ee011d-a7ba-4e56-a9c2-08d44387867b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BY2PR0301MB1573; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB1573; 3:wkgbOg3U6HAKY02lQNZ/rMrdg0svtPFnHOJ2Rfhde1KrWqpHkI7TYfVsobLVbVPJ2c+DkdK2DMMyntDBKpkk4ThTzdW/J3o9uRSEoTpeb+gejENR+LT1mGgulSMmRKPVlNoXFLZml3mEVJl+3/n63/EvjqGfVVeDziogWAI2nJRNcR+Z8NpAuAbDj46wvaH8Fq19ScbHIy7sqpJ+gXvbsTowznJix+JO8tfewL/EEHt5Qi/54p89C6oXf9+vK/xne7J8e5HQXcqnOusLE5sStOV8+u9MGgDSXUn1vcfUUKWqGs6ywqLT2ozHFzQt93coh36aMfgrlzbKV883/cQwIlmzEDNhwrsZSCVtwGydOJ+0bGD63Xipq2A8+9lYWES4 X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB1573; 25:XcIOl70fcKSd5AslSLXfxX7PFKdj7lBeEfW6DWANKVX2gYGIk5SO68jjkgjLJmG6z6BB2P/e1BV8/azI1WOv9oac30hp5ewRp6tHA7t/2B2JHnSoHD0ZueRlQQoW6SBueYRMAll1/aTfFAJEoS55LyyJSatTu4lO2i8beChTacZTY3EcBSggLF/JHAWXnl37/z1MUaE3gDU5JLoDMFTGuTEmO82yq1ls0TJLvBzm+Upg4l6xoNK+bH0oSUlT3spqw3njmfjadr/IWLqtvsryBw6p+ozjEXG/SlZh97g/KQvXQQVu9bkQ1TVQyHcqMPLStOmA3RLEzb0++de1+S0++QN3IZr1WOcV56d5+hiHga1baLwoEmOEi+75I2joYmeXyrsxTtl0nvE4aeloyyCt7kQYR04knN9safiis2pKbYdKyFzVTlOykJuqjKBfkwIACDmo5Z5geZcJQTsiiB257OAQ62Y6nqnR7bohglc6ctYdCqAMYi/eo9f8azHJTCziZjsKdOSRLgNp920HszbWUGcJJPEpnIBcg3uMTAp1nEnSMwXd1oFrtjlFcpT8hQnQYPGo52DWWf7VFnkl740FSpJDd+a0ACKO4QN5oIYqyg9iD3YNxFgu/eRwRn2NMmD0AsJytowC/p7/hXeYI6gx1h+QR8bzGx4m+hvek5ZV5JtC3DkGNhpYYJxFpZF888JPS0mCdkQNp0kwvaw/dNCYQCQEfIDfZQejAKiFLqqnap6cItcav0lhl2m7jd5vJVmA2GS8dY4trmAryGnxjmOvgN//zgk4OHnS8kvKD5QFgB8= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB1573; 31:SXmFaD5ZU+1mHP01J8ImPjQtN4apPuZvLprLDo5JVfFVi/28DddujW0SqTnlMZdd5HvjPk3NVYk4rNmsle1CJGA7Fr8VeyInjpooa6bENJMxL2YEMcg4nhPFff5zl4JLznGetgm638D43MkbZQgYHSMtiZHB9KPpVoTz54ChUSHCnfOQ4AnFvm75VAAOt+PIaxuAkdOTM8y4ibc2s8gW5okPGTMZNoGgzEPN48z2APH0D7pvexsv4dtVSOF1WmQ483a+WM7mGeSjLMo1sXiEZQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13023025)(13017025)(13015025)(13024025)(13018025)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6096035)(20161123561025)(20161123559025)(20161123556025)(20161123563025)(20161123565025); SRVR:BY2PR0301MB1573; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR0301MB1573; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB1573; 4:7zZVoUJaWv7sCtcJOFwPMSoDjckeOI4rd0duY8LSfKgHhztpsrN1U4Pvr6a/bVkVy+ZLlBobCnzx3nW7TUn9ZgNHCrxjnaO+7yYBKfJHi4yqzVQeX3A++gTRUEazZw9/dWut6I41+mJyo5md5DmfTCcB7gbWqmJlL1P//bMLoCBxTK1Zcl8+FIP64uYnUAyrNzL8319lae0oOk/Cnvy54iPMQ4mUcPfn6BRcOSrCboWsmeQhpiHN3mYVfn58S031GkgooqqK9/FSxndbqyHNGMoEDDfOLyQSCOZgveXtPwY0UoQ0JhmXAXdZA4VbfVJDaWJMupAubse2lF9aXz4I2cVNdVfS4qdGiuzc5fmSNVWRggF6+aI9a8/ejBqFHjY7LpaJIBapdSpzorKCKxbSiv65wQDno0dk/WxtqH/RFBopNgVik1E7uXG+pKSPStq3hiumOM72pFwHXxm/yp0qiMz45SRv/lZ19uPPSRZqX+owehPsEvj2FiRiOvVwBCdLln/Cy4XTbNhK8s61mE827esWCN8OQXENygqM+QjOxcLMMmuwNiRY6B3hNgsuVqRNVOvAQJrfF3Vlc6VV2SI+nmf7G5Fm30oQSxvWDvrm9JRB+Xg8Oy2HBiACcF5xRqJV9kD2EJfZiWFV7RsrTRZOianuF4zpXx9kNjMX7lH/66zULFIgmIe8bFGbP5lMl2qBqC+oBGE2kQlBqOkZV8HemAKFZUTVFiH3a2kzucC/t01+CFNfAzZ4/zm6f6kK1w76wkDIPdKz89RQdeW9UA25ZA== X-Forefront-PRVS: 0196A226D1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB1573; 23:6suaxKJz5TWhTE5ULmfbQAzsrkG9qmitXKUYqSG?= +EqS83QVhZbEMQ8XyBSjlECH2tNQ2zG4mVgnotm4a2P1LXnanptVfIjuDu8qtahyItnFtyi40T7oM+uUkHoP1Cjfn7/cXaJTfowxzehf3cooumy832AZSpBSg2TTMgrbw9YMIWIRwKudGNyUV5AbzUIjmHdSoBfic/SNU5GMSBexujORNgGhCBDGyZvu1+koJ5T0gtTexuTH9f1Pkr8PEaJZHKddV6hcxGMFBbGswZddc4DHMHvKjTyZYQEYiLnkN0RS8iF/ppOtaeCCaDpEqEnpoZ3iU+UXYm5N6o+untKYMckvNg1McNR1pMmCpOpQzU7Gmo8phf+J0qHbzLbPsiHGWT/Al1wSD/B+6V6V/AdeX4GgXBkc6DZX31btWAONg3ADs3oVRRrJYXaxPy6C/47Dss6leFid4Cs/g2C+QxlL843IGipBxbC+zRVjgFEKCjUqONaoh3ZZ7eGggfLuvxIjDQoyyzzKlj+MfmVHK2uba0Ejji7F2AnStq4xW6KoTLn6DNr+IMA+SmYbzLc8e5WXd/6dDbu0IGd5XSRyUT/XUCnPnFlrpuKLiJ4gPnhVrDYZzGjuiBvDmr9c+Fl7J8FfGV5x9CKwfIsXFk/P0Xp6X4n/TGm+cVwLS9gyX8vFCdBejzaBtm68bwFumtA4SwAAQmKgabosDlhDi/VkDbVaCAmW3yGClfwVsJ2yf+72GRaKfyee/JEAP8WxJDTvIf9xV0yQYAEzLT19vnArEDB1L1Rzg2A5FR+wpB8mwytzv0JeM6gwuJg9g6ENKJ6IBz4X3EQsORm9zBNJr40fdk4SJC9px5u5vLsdfkTnFfpDQWYdHcx57KW0ywhSRpZRLvRR3i1H25ZcN5bxiaicITua8o00WWwmGjMgXgCEMR9KaCKdItAd82UUyopUYN4pW0TMLKjeNbU7mL2zytmVihQ+pZG0BqkLeMH+1IEbPjHs+ilxQ5+j+45uCPTmXPcEFlfgijCzex2lLKVrKyvTUlRW6PRhBuU5vEunvgzqu0GFQb+w2CwKPCZhbNJQbmakwrTKYN71tkkhZ0ZwU1e1YnP+uk1b3lTF5nYnpx9iEuKJyMsgCpYTqEp1YnjIqSwdv69DUdQx1ZA8mOu0l/oGhGZtrQa4FTZwxNtBzw7aSB9bn5F6MFQ9pnElwePfBocqnyJcsyZBxtrNcyH4Jwe0+LhTHYBaVPM3r9y/yQauqc+5Z0h+VL+4b/+jDsCGDgNLFx6Tu3zWjPYgoamgOezltfNkQRSDWSoU64b97b4SrW3D3dY8= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB1573; 6:Ze60YFTZI7ViUeQniyeSvb1MdJtYQwkuQnu2E9VZco22qIOCW9wNchlDK0nwqdIh6DWhwL8oS+K+Nan9hGwixeZFnu3Knw6G30JFuHyH54lYdIsZyesnHP9puy/oekn9mxyHqmA/jyevuLEDQFcqC+Vz3Dr0u99gWB9D2Oay9Cib0275/E7jANeF8E705uq7ckgc86MDEw1yUOHEjkbJFtGWsn8fm6nAoE301j5iYutB7yho7/BC9OjW6rJNKVh1HGtIMd7xI9j5CqTRrp85krvW+Hh+JtAxjofMPaQG3fPpXGOHiwAC3yca5VnaXcSYNjST1NS9JsFBW2HicuoovkmbiZxO9JGsab0t2NJQLYXSVCuqc4FYhy2j2IG1G41dK4M/yzO2ZAlF9IgvnuF58mygTdzxB43ELm231hpMvwrSj3jUERLxf4levKKeHsMI; 5:CWfwTXfNrC5b99Tg3BfZhDLYz3C1ss2xGnHsEY+WzftMPGwxLARN3x3y3r3j+O2Vyh2ygHxJlgXfLUIMs/cUxsxLSPyRG4zxNxoZJR5F8ZGfVM+YjzpOU9QDUmHRivah2KzCVJydVtZZgk9YLQF36SCqOTFLSQa+atkMToNoL0VwObxvnXtq4vHCwHevhg5v; 24:6jzkNQDbK93ZCO/j3wZj9AOEkSLx347Mkao7L1lSOCkoM/N8v8giujyfUI/UvKpWKYJQatynryIIFrw+aOVUpPCbPnO+szFAlkqAcJT6Rog= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB1573; 7:u54HM9cY1oq9E+6ZDhTgf/GHpfw2DzLGVtZt10dysMzEbnQuIBxMboWeb6eXyGe2oNodP9ynlcwYzexaTvR+9F4/lLr/On/1s3+XsOQzDPI7w5QkZEjIOMUIeG/SRWCLQkpcJq8/0ORi5vYI6KGOmEqRAgvDbO+O5uwAoCi6kwkBl61L6x4rfF730g9JamUgNtQhGcL13PdHXSWYW0/0hiC/C2eA/zxuAJTfQrkA8G/qq9IS5D/DgVUeZXAepOIbfG7y53HL4JFVN8faixgoSfsdkUTYQLav1wozKqa82LQbFxsfh9QfLvGOrIVnWh7i/zduQRRRbqjH0GWdzeeeSQ9AaQXV6Kp77w7TjRFkqtXmcs3z7EQ0d6I5hgI+DqKy40EQ7GPQNH+HIj/Hz363DmUTmW3FyTdwAzWe75JiDugCpWZdGdniVJJ977xbeak0IXoqfuVPcIodrN8W9sgUXw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jan 2017 12:01:12.0107 (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: BY2PR0301MB1573 Subject: [dpdk-dev] [PATCHv6 18/33] net/dpaa2: adding eth ops to dpaa2 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Signed-off-by: Hemant Agrawal --- doc/guides/nics/features/dpaa2.ini | 1 + drivers/bus/fslmc/portal/dpaa2_hw_pvt.h | 20 ++ drivers/net/dpaa2/Makefile | 3 + drivers/net/dpaa2/dpaa2_ethdev.c | 412 +++++++++++++++++++++++++++++++- drivers/net/dpaa2/dpaa2_ethdev.h | 15 ++ 5 files changed, 450 insertions(+), 1 deletion(-) diff --git a/doc/guides/nics/features/dpaa2.ini b/doc/guides/nics/features/dpaa2.ini index b176208..0b59725 100644 --- a/doc/guides/nics/features/dpaa2.ini +++ b/doc/guides/nics/features/dpaa2.ini @@ -4,6 +4,7 @@ ; Refer to default.ini for the full list of available PMD features. ; [Features] +Queue start/stop = Y Linux VFIO = Y ARMv8 = Y Usage doc = Y diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h index ad2847f..42c5517 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h +++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h @@ -37,9 +37,12 @@ #include #include +#define DPAA2_DQRR_RING_SIZE 16 + /** #include +#include + #include "dpaa2_ethdev.h" static struct rte_dpaa2_driver rte_dpaa2_pmd; +static void +dpaa2_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) +{ + struct dpaa2_dev_priv *priv = dev->data->dev_private; + + PMD_INIT_FUNC_TRACE(); + + dev_info->if_index = priv->hw_id; + + dev_info->max_rx_queues = (uint16_t)priv->nb_rx_queues; + dev_info->max_tx_queues = (uint16_t)priv->nb_tx_queues; + + dev_info->speed_capa = ETH_LINK_SPEED_1G | + ETH_LINK_SPEED_2_5G | + ETH_LINK_SPEED_10G; +} + +static int +dpaa2_alloc_rx_tx_queues(struct rte_eth_dev *dev) +{ + struct dpaa2_dev_priv *priv = dev->data->dev_private; + uint16_t dist_idx; + uint32_t vq_id; + struct dpaa2_queue *mc_q, *mcq; + uint32_t tot_queues; + int i; + struct dpaa2_queue *dpaa2_q; + + PMD_INIT_FUNC_TRACE(); + + tot_queues = priv->nb_rx_queues + priv->nb_tx_queues; + mc_q = rte_malloc(NULL, sizeof(struct dpaa2_queue) * tot_queues, + RTE_CACHE_LINE_SIZE); + if (!mc_q) { + PMD_INIT_LOG(ERR, "malloc failed for rx/tx queues\n"); + return -1; + } + + for (i = 0; i < priv->nb_rx_queues; i++) { + mc_q->dev = dev; + priv->rx_vq[i] = mc_q++; + dpaa2_q = (struct dpaa2_queue *)priv->rx_vq[i]; + dpaa2_q->q_storage = rte_malloc("dq_storage", + sizeof(struct queue_storage_info_t), + RTE_CACHE_LINE_SIZE); + if (!dpaa2_q->q_storage) + goto fail; + + memset(dpaa2_q->q_storage, 0, + sizeof(struct queue_storage_info_t)); + dpaa2_q->q_storage->dq_storage[0] = rte_malloc(NULL, + DPAA2_DQRR_RING_SIZE * sizeof(struct qbman_result), + RTE_CACHE_LINE_SIZE); + } + + for (i = 0; i < priv->nb_tx_queues; i++) { + mc_q->dev = dev; + mc_q->flow_id = DPNI_NEW_FLOW_ID; + priv->tx_vq[i] = mc_q++; + } + + vq_id = 0; + for (dist_idx = 0; dist_idx < priv->nb_rx_queues; dist_idx++) { + mcq = (struct dpaa2_queue *)priv->rx_vq[vq_id]; + mcq->tc_index = DPAA2_DEF_TC; + mcq->flow_id = dist_idx; + vq_id++; + } + + return 0; +fail: + i -= 1; + mc_q = priv->rx_vq[0]; + while (i >= 0) { + dpaa2_q = (struct dpaa2_queue *)priv->rx_vq[i]; + rte_free(dpaa2_q->q_storage->dq_storage[0]); + rte_free(dpaa2_q->q_storage); + priv->rx_vq[i--] = NULL; + } + rte_free(mc_q); + return -1; +} + +static int +dpaa2_eth_dev_configure(struct rte_eth_dev *dev) +{ + struct rte_eth_dev_data *data = dev->data; + struct rte_eth_conf *eth_conf = &data->dev_conf; + + PMD_INIT_FUNC_TRACE(); + + /* Check for correct configuration */ + if (eth_conf->rxmode.mq_mode != ETH_MQ_RX_RSS && + data->nb_rx_queues > 1) { + PMD_INIT_LOG(ERR, "Distribution is not enabled, " + "but Rx queues more than 1\n"); + return -1; + } + + return 0; +} + +/* Function to setup RX flow information. It contains traffic class ID, + * flow ID, destination configuration etc. + */ +static int +dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev, + uint16_t rx_queue_id, + uint16_t nb_rx_desc __rte_unused, + unsigned int socket_id __rte_unused, + const struct rte_eth_rxconf *rx_conf __rte_unused, + struct rte_mempool *mb_pool) +{ + struct dpaa2_dev_priv *priv = dev->data->dev_private; + struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw; + struct dpaa2_queue *dpaa2_q; + struct dpni_queue cfg; + uint8_t options = 0; + uint8_t flow_id; + int ret; + + PMD_INIT_FUNC_TRACE(); + + PMD_INIT_LOG(DEBUG, "dev =%p, queue =%d, pool = %p, conf =%p", + dev, rx_queue_id, mb_pool, rx_conf); + + dpaa2_q = (struct dpaa2_queue *)priv->rx_vq[rx_queue_id]; + dpaa2_q->mb_pool = mb_pool; /**< mbuf pool to populate RX ring. */ + + /*Get the tc id and flow id from given VQ id*/ + flow_id = rx_queue_id; + memset(&cfg, 0, sizeof(struct dpni_queue)); + + options = options | DPNI_QUEUE_OPT_USER_CTX; + cfg.user_context = (uint64_t)(dpaa2_q); + + ret = dpni_set_queue(dpni, CMD_PRI_LOW, priv->token, DPNI_QUEUE_RX, + dpaa2_q->tc_index, flow_id, options, &cfg); + if (ret) { + PMD_INIT_LOG(ERR, "Error in setting the rx flow: = %d\n", ret); + return -1; + } + + dev->data->rx_queues[rx_queue_id] = dpaa2_q; + return 0; +} + +static int +dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev, + uint16_t tx_queue_id, + uint16_t nb_tx_desc __rte_unused, + unsigned int socket_id __rte_unused, + const struct rte_eth_txconf *tx_conf __rte_unused) +{ + struct dpaa2_dev_priv *priv = dev->data->dev_private; + struct dpaa2_queue *dpaa2_q = (struct dpaa2_queue *) + priv->tx_vq[tx_queue_id]; + struct fsl_mc_io *dpni = priv->hw; + struct dpni_queue tx_conf_cfg; + struct dpni_queue tx_flow_cfg; + uint8_t options = 0, flow_id; + uint32_t tc_id; + int ret; + + PMD_INIT_FUNC_TRACE(); + + /* Return if queue already configured */ + if (dpaa2_q->flow_id != DPNI_NEW_FLOW_ID) + return 0; + + memset(&tx_conf_cfg, 0, sizeof(struct dpni_queue)); + memset(&tx_flow_cfg, 0, sizeof(struct dpni_queue)); + + tc_id = 0; + flow_id = tx_queue_id; + + ret = dpni_set_queue(dpni, CMD_PRI_LOW, priv->token, DPNI_QUEUE_TX, + tc_id, flow_id, options, &tx_flow_cfg); + if (ret) { + PMD_INIT_LOG(ERR, "Error in setting the tx flow: " + "tc_id=%d, flow =%d ErrorCode = %x\n", + tc_id, flow_id, -ret); + return -1; + } + + dpaa2_q->flow_id = flow_id; + + if (tx_queue_id == 0) { + /*Set tx-conf and error configuration*/ + ret = dpni_set_tx_confirmation_mode(dpni, CMD_PRI_LOW, + priv->token, + DPNI_CONF_DISABLE); + if (ret) { + PMD_INIT_LOG(ERR, "Error in set tx conf mode settings" + " ErrorCode = %x", ret); + return -1; + } + } + dpaa2_q->tc_index = tc_id; + + dev->data->tx_queues[tx_queue_id] = dpaa2_q; + return 0; +} + +static void +dpaa2_dev_rx_queue_release(void *q __rte_unused) +{ + PMD_INIT_FUNC_TRACE(); +} + +static void +dpaa2_dev_tx_queue_release(void *q __rte_unused) +{ + PMD_INIT_FUNC_TRACE(); +} + +static int +dpaa2_dev_start(struct rte_eth_dev *dev) +{ + struct rte_eth_dev_data *data = dev->data; + struct dpaa2_dev_priv *priv = data->dev_private; + struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw; + struct dpni_queue cfg; + uint16_t qdid; + struct dpni_queue_id qid; + struct dpaa2_queue *dpaa2_q; + int ret, i; + + PMD_INIT_FUNC_TRACE(); + + ret = dpni_enable(dpni, CMD_PRI_LOW, priv->token); + if (ret) { + PMD_INIT_LOG(ERR, "Failure %d in enabling dpni %d device\n", + ret, priv->hw_id); + return ret; + } + + ret = dpni_get_qdid(dpni, CMD_PRI_LOW, priv->token, + DPNI_QUEUE_TX, &qdid); + if (ret) { + PMD_INIT_LOG(ERR, "Error to get qdid:ErrorCode = %d\n", ret); + return ret; + } + priv->qdid = qdid; + + for (i = 0; i < data->nb_rx_queues; i++) { + dpaa2_q = (struct dpaa2_queue *)data->rx_queues[i]; + ret = dpni_get_queue(dpni, CMD_PRI_LOW, priv->token, + DPNI_QUEUE_RX, dpaa2_q->tc_index, + dpaa2_q->flow_id, &cfg, &qid); + if (ret) { + PMD_INIT_LOG(ERR, "Error to get flow " + "information Error code = %d\n", ret); + return ret; + } + dpaa2_q->fqid = qid.fqid; + } + + return 0; +} + +/** + * This routine disables all traffic on the adapter by issuing a + * global reset on the MAC. + */ +static void +dpaa2_dev_stop(struct rte_eth_dev *dev) +{ + struct dpaa2_dev_priv *priv = dev->data->dev_private; + struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw; + int ret; + + PMD_INIT_FUNC_TRACE(); + + ret = dpni_disable(dpni, CMD_PRI_LOW, priv->token); + if (ret) { + PMD_INIT_LOG(ERR, "Failure (ret %d) in disabling dpni %d dev\n", + ret, priv->hw_id); + return; + } +} + +static void +dpaa2_dev_close(struct rte_eth_dev *dev) +{ + struct dpaa2_dev_priv *priv = dev->data->dev_private; + struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw; + int ret; + + PMD_INIT_FUNC_TRACE(); + + /* Clean the device first */ + ret = dpni_reset(dpni, CMD_PRI_LOW, priv->token); + if (ret) { + PMD_INIT_LOG(ERR, "Failure cleaning dpni device with" + " error code %d\n", ret); + return; + } +} + +static struct eth_dev_ops dpaa2_ethdev_ops = { + .dev_configure = dpaa2_eth_dev_configure, + .dev_start = dpaa2_dev_start, + .dev_stop = dpaa2_dev_stop, + .dev_close = dpaa2_dev_close, + .dev_infos_get = dpaa2_dev_info_get, + .rx_queue_setup = dpaa2_dev_rx_queue_setup, + .rx_queue_release = dpaa2_dev_rx_queue_release, + .tx_queue_setup = dpaa2_dev_tx_queue_setup, + .tx_queue_release = dpaa2_dev_tx_queue_release, +}; + static int dpaa2_dev_init(struct rte_eth_dev *eth_dev) { + struct rte_device *dev = eth_dev->device; + struct rte_dpaa2_device *dpaa2_dev; + struct fsl_mc_io *dpni_dev; + struct dpni_attr attr; + struct dpaa2_dev_priv *priv = eth_dev->data->dev_private; + int ret, hw_id; + PMD_INIT_FUNC_TRACE(); /* For secondary processes, the primary has done all the work */ if (rte_eal_process_type() != RTE_PROC_PRIMARY) return 0; + dpaa2_dev = container_of(dev, struct rte_dpaa2_device, device); + + hw_id = dpaa2_dev->object_id; + + dpni_dev = (struct fsl_mc_io *)malloc(sizeof(struct fsl_mc_io)); + if (!dpni_dev) { + PMD_INIT_LOG(ERR, "malloc failed for dpni device\n"); + return -1; + } + + dpni_dev->regs = rte_mcp_ptr_list[0]; + ret = dpni_open(dpni_dev, CMD_PRI_LOW, hw_id, &priv->token); + if (ret) { + PMD_INIT_LOG(ERR, "Failure in opening dpni@%d device with" + " error code %d\n", hw_id, ret); + return -1; + } + + /* Clean the device first */ + ret = dpni_reset(dpni_dev, CMD_PRI_LOW, priv->token); + if (ret) { + PMD_INIT_LOG(ERR, "Failure cleaning dpni@%d device with" + " error code %d\n", hw_id, ret); + return -1; + } + + ret = dpni_get_attributes(dpni_dev, CMD_PRI_LOW, priv->token, &attr); + if (ret) { + PMD_INIT_LOG(ERR, "Failure in getting dpni@%d attribute, " + " error code %d\n", hw_id, ret); + return -1; + } + + priv->num_tc = attr.num_tcs; + priv->nb_rx_queues = attr.num_queues; + priv->nb_tx_queues = attr.num_queues; + + eth_dev->data->nb_rx_queues = priv->nb_rx_queues; + eth_dev->data->nb_tx_queues = priv->nb_tx_queues; + + priv->hw = dpni_dev; + priv->hw_id = hw_id; + priv->flags = 0; + + ret = dpaa2_alloc_rx_tx_queues(eth_dev); + if (ret) { + PMD_INIT_LOG(ERR, "dpaa2_alloc_rx_tx_queuesFailed\n"); + return -ret; + } + + eth_dev->dev_ops = &dpaa2_ethdev_ops; eth_dev->data->drv_name = rte_dpaa2_pmd.driver.name; return 0; } static int -dpaa2_dev_uninit(struct rte_eth_dev *eth_dev __rte_unused) +dpaa2_dev_uninit(struct rte_eth_dev *eth_dev) { + struct dpaa2_dev_priv *priv = eth_dev->data->dev_private; + struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw; + int i, ret; + struct dpaa2_queue *dpaa2_q; + PMD_INIT_FUNC_TRACE(); if (rte_eal_process_type() != RTE_PROC_PRIMARY) return -EPERM; + if (!dpni) { + PMD_INIT_LOG(WARNING, "Already closed or not started"); + return -1; + } + + dpaa2_dev_close(eth_dev); + + if (priv->rx_vq[0]) { + /* cleaning up queue storage */ + for (i = 0; i < priv->nb_rx_queues; i++) { + dpaa2_q = (struct dpaa2_queue *)priv->rx_vq[i]; + if (dpaa2_q->q_storage) + rte_free(dpaa2_q->q_storage); + } + /*free the all queue memory */ + rte_free(priv->rx_vq[0]); + priv->rx_vq[0] = NULL; + } + + + /*Close the device at underlying layer*/ + ret = dpni_close(dpni, CMD_PRI_LOW, priv->token); + if (ret) { + PMD_INIT_LOG(ERR, "Failure closing dpni device with" + " error code %d\n", ret); + } + + /*Free the allocated memory for ethernet private data and dpni*/ + priv->hw = NULL; + free(dpni); + + eth_dev->dev_ops = NULL; + return 0; } diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h index 5778780..5f599a7 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.h +++ b/drivers/net/dpaa2/dpaa2_ethdev.h @@ -34,11 +34,26 @@ #ifndef _DPAA2_ETHDEV_H #define _DPAA2_ETHDEV_H +#include +#include + +#define MAX_RX_QUEUES 16 +#define MAX_TX_QUEUES 16 + +/*default tc to be used for ,congestion, distribution etc configuration. */ +#define DPAA2_DEF_TC 0 + struct dpaa2_dev_priv { void *hw; int32_t hw_id; + int32_t qdid; uint16_t token; + uint8_t nb_tx_queues; + uint8_t nb_rx_queues; + void *rx_vq[MAX_RX_QUEUES]; + void *tx_vq[MAX_TX_QUEUES]; + uint8_t num_tc; uint8_t flags; /*dpaa2 config flags */ }; #endif /* _DPAA2_ETHDEV_H */