From patchwork Sun Apr 9 08:11:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 23378 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 DDC3168F7; Sun, 9 Apr 2017 10:09:41 +0200 (CEST) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0089.outbound.protection.outlook.com [104.47.37.89]) by dpdk.org (Postfix) with ESMTP id 9DB6A58F6 for ; Sun, 9 Apr 2017 10:09:37 +0200 (CEST) Received: from DM2PR03CA0043.namprd03.prod.outlook.com (10.141.96.42) by BY2PR03MB288.namprd03.prod.outlook.com (10.242.37.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1005.10; Sun, 9 Apr 2017 08:09:36 +0000 Received: from BN1AFFO11FD043.protection.gbl (2a01:111:f400:7c10::101) by DM2PR03CA0043.outlook.office365.com (2a01:111:e400:2428::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17 via Frontend Transport; Sun, 9 Apr 2017 08:09:35 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; caviumnetworks.com; dkim=none (message not signed) header.d=none; caviumnetworks.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD043.mail.protection.outlook.com (10.58.52.190) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1019.14 via Frontend Transport; Sun, 9 Apr 2017 08:09:34 +0000 Received: from DTS-02.ap.freescale.net (DTS-02.ap.freescale.net [10.232.132.223]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v3989Aoj015502; Sun, 9 Apr 2017 01:09:32 -0700 From: Hemant Agrawal To: CC: , , , , , Date: Sun, 9 Apr 2017 13:41:07 +0530 Message-ID: <1491725483-6619-7-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1491725483-6619-1-git-send-email-hemant.agrawal@nxp.com> References: <1490362538-20854-1-git-send-email-hemant.agrawal@nxp.com> <1491725483-6619-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131361989751251290; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39400400002)(39850400002)(39380400002)(39860400002)(39840400002)(39450400003)(39410400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(9170700003)(81166006)(8676002)(50226002)(8936002)(76176999)(50986999)(86362001)(47776003)(5003940100001)(106466001)(2351001)(105606002)(305945005)(5660300001)(4326008)(85426001)(48376002)(50466002)(356003)(54906002)(36756003)(6916009)(2950100002)(77096006)(6666003)(33646002)(8656002)(104016004)(2906002)(110136004)(38730400002)(53936002)(189998001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR03MB288; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD043; 1:ZDW6vdO6aSJ+kk8zIBlThiQNSUUG5/lNuPFBU2mSHG08g2qiht6X1nWxxoYA3TU3dfX7GvG/fHORxA16XahR6WTUGDwgHs+/q0pbQWeLcOm/z8PGzwizGbJ7X9KPRh+CSrgH7/cdo+TkMO0Yki80Jk5NHwHOaGv11/rrDFZf1g/8jV0mQCVKB2OUw7ZRSbX0qiFaUvleZUKlNifSMaxeJYuXAJ03nvOWPswglzljzpjSvkt+aUTwoC+8NVZUliIYJW10njqKcPObiTufbrRA9rEuXjjddC0bD99HfhXam+wBZyOix2nsjPua9A83d010wvvHE6U3f2QnSCBbc15MXwJKH4fmbhI4RFoDxPuHhyh6UKcoOdC8kGdU2adk1HCbc08pNREGJsIsqa7mcwxtwWiy1H5fIlT7jRbFQBRK5b4NYJ8s9srhOuwNiID1EPhOPQhNoY0OscQboG84kkrQvkQ7B1//Y0qWYUdeyGzxlvNHdDRa8XY1S4JS3jYPzpQ3htTa7zcKNoA9iPMgwMwmdis9SlB96pbyzMzEohHgRwpXXc1snXJUA4Tsn32Ibu8gC7ouemJ3y/a6vJGUVxoFcZvpz7h6lS3xbT6R8MaMluYlXo0Ubun+8ZmzJr7uC94p9IHohOgiGqNKbGEz29R5IOoaBNKnY3nDxMQBvm5tCiM= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 0aad5b44-a8a4-4528-3ff9-08d47f1fc291 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131430075)(201703131517081); SRVR:BY2PR03MB288; X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB288; 3:Q6bXfTxaHo3nDbLSOE/CMzDQb3IZzis79n+r1CopAGdaf1WjLuU2tqjdz+LrfOP48gMh5szlQiRXscWqa5pvhPj6oG7r0mEbpM7ERXeSuIunOgIHaPpw5UodO59cbaTO8/lI3dtqjHTYPhky4pHO3MPE4XCE922X1dcEgLYg2foxW/VJXNeMXA8QdYAXt7n7To4RyELMERqSAEF+Q28o0jk2xaZBt5uPu8aQjBfMJPucc5teF8TECkSss4W8kn7Rs0HLJaKAwDRsLmd1V8ravBy8P3xqra26Twez7BYCFYVvKrRU8CqpjYFyUvavoXa4wonLy1eARYjHB5BCbTCOx1CZqUM96zcV+xk5QKhe8N0hl3B7QA5vq7U05+992uZcughtIk6yc3iWW3uuS09DzR1B1mNOwkKlZ8/qc0N4ybq0GuHXciYN4n4TOOnLk0Tw; 25:GgWv1TJ2vRGtFVAe9QbFx5avfRIlIixO5tOahAgcGtwSplA++QrID3bPF4jo51Kp92QKPe/2m22m43Pfuic+FeTNRQA6+DA0Zz/Gc5J4NhPh8eEWwIIfEm9Hsu+1LGh3c4AUdnQRxUaXDvOBCYWvBvTDdDi3IihXxMRaCE1xpjf6SryFBxQQcDsHshaNPGLhMRSi2xV5RLg/YwIMiO3gTaDHjXKpAU17ZOEWhOtx/kHRt6tkbXZ66KWmcpH8G07OPKzNHsnqgNrT2bhTxzCzvGPSD/UexrNdUOkHcX3s32HVuClqj0ReidCwlUG83ve2qDgvGs2WvLYXIMEz0Z7bocYAkiWtwmbm8t72tCG8aqdNW6zVq6b5rUmS/aT5afs2K5OfKFyn6nDaXC23madW+FJzVa+j6oDHBoWqKn4gsSjlVt8kyw/lW7wpy+xTIy+Zl/23dAhkA/0Haub+Ct8IPQ== X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB288; 31:JD1RHQq1+M8X/Evx5ckIwaMvDRNjtU6/ZPrSalyOnDnrCaGXxN1Cy9DGm6FmAZxrXKnU3V5ufsr/kFrtOVqVzKAvd9toXPWycU9dbtGSKsNrg+so90NLs46yXVQVSqo4GCvUfox1uzTGzmTHlnAh2Y0FGmHMYZ/iWdrpY4mBoeEn+xjL7yjZ6Qh2m/Y1rPpk/ESPL2chg//jQ5yo++UoqrDjAVLz9aIBJIq+XOuDQ0qiysC/jcFI1JyAItXSpfZc+VKD6COg56U+WQc50K6Rzg== 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)(13018025)(13017025)(13024025)(13023025)(13015025)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(6055026)(6096035)(201703131430075)(201703131448075)(201703131433075)(201703161259075)(20161123556025)(20161123563025)(20161123565025)(20161123561025); SRVR:BY2PR03MB288; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR03MB288; X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB288; 4:eayPfyc+jgZU4hd3t2daYnhJCnG+Mh1SJMhdL3a2mLqJRWj+LQ35QcJJFqg06UCY5l5o0vEebmLuCVQTs8nNz56lHLnEOs5We1l+7GMJqgxUjfAl0sMExfJZgt7R2zjsNNgAX45A/3YVxNgZztnuToJSduQvXhZNE0z9faTINQ5u/wYnKFESJIUbS+1jTktK7krlxcSqtozmo/C9iKyw77q7F2Tu1NHzhyxycpSxQwnY4B2U9aRTD+gU9hq3jjGt2nK0F4eJPuLgwFCrsm3MbCXpl3wc+2zV8p+6TfhuH7yBS1bVhPNeEeKO6uoiqQ97szQZP8NPBdDlU17GbMS6nw9ff7A1eXeOs6DdlT22PJ4clr3uWGFyHxpXyc473dCD37HlseBGc4xuetGT4SOd7GiFWinInNc3MJTGvse7FTjX6d8jmli0eMRzKVmJ14LcJLMs4oVsNL/aKGUFgeL3unn7eyPEXvnlDX06GiE0pFy6Uw92P97lKRfgfUUQddQwo1tA/Yzs046XxrY9SxOIXUydLrG0g6442gCiMQRAPNLdiOIJ6wHj6ingczCzxATt8kFVqocWfk5ltXB4EBdGW/S/aGkS+3SxrI7WscikNpQm8olPYue4zNWrmhhcPh/MXkgTE3Ee1WvZjBFd03GoJbAb4XwZ1hG6GG49Lb+Pb16hbfswIcUU3dktpcGir0wtjSAwc/2+UWDheBPGeJijSpL9auuMUvcArgyycxjLeXs7X/Amw1NmCqL0w0wHWXT3jjhgfq2Y/4SqJT0f5cXkIXlahoziOyVgU9jLljPTpYdSt9qqD6IL9XxEEEX4fsIYb29hnz42gSP6iNlraj8rBETLJv0IgLgb3eXoxhNjFGstkGMG/Plwqv0+j039H360ceC7U5KttHYC05P0TeZSTKG05GQmeu51PMi9+urQpqg= X-Forefront-PRVS: 02723F29C4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR03MB288; 23:MrfgXvRFqrDAAjqFUI6KtfoYtE/GlByEWSANWtdr2q?= dkHrQupxNqDpa4sDksH3jx8A5ptWHXRtJWPLrUja8i463MMT4mNP+TP58jHoeli3AY/xj4OP2d+SUNjoerqR6SNON8+WA7ZGloDbVE0/0PwMfsBNRKI9nB5MZcm1bgG0XmygpZAppB0yyZLYwJjIakV5vGSN65zSQMuUDrbFE20Qc3BOsR/50i/INOAInDCiU0aQnng8+cPaCsFBqnvEnCBoieZwvHEICtoRKiWt0duRat4HrXpREJYmw+Rvt3zLusbEvYilUyDcuhE+/rXRk0l9X1hUu2BRsN18ChwIO3hirbauPQ/NPmt/3NUr+12TfU5xHicyTPKgQaDsK/ep9sZHr/yylsY4cGfInav5Qskff26sR6bciQYDeWyK0sfaN4M4M5Hd5D0+2qi+dlKEToV3P7j3ICq2NbpcxNpfP54q42q30KGr6apMWrc8urGnizMrY3ksw2jWmldZpJ1aXnxWfAWBavQjojwPlqzp/2oDQmli9dKr0sCW2EE+E6m32KhCTA0AyFiJAkqdNoYO5nTNZfNiVnP2HNN7o6BjRk+1lNVMy4/00/98Pr/8Vfk1eC1EUT/gigGk2p3r+cHoBV4dYSGKQVnlf5MjQFyFuEjz1QiQcdTxeF98hlOwpxOp4vZQbwXzVUYny5bn98B/55WoJGVREZz5F2XlWipMCyTDs4dcGckBhDcZEbwrXvpmWh5HzAG+qLnmXM48lhO0MO7vOhSjBeKg/glaQzKFVogmI5yyUJ+XN4QXOVzQmCBivAlUdkVoF36xVTd1JWHalRStyQ9MqN2q+Nh3Hym6oIOFfEhlScSZQg1dUkzTP3LYU8UJdD2/53U+BZtg1ClyJLO+ulno8qWTlV97MPJwdHomsciPZT1E1gerf066y3WgNg90B719PxBAKbTUPtrrwdXFYR6YRdsWqIJxkb3k748KmlU/luWtyrZXn8QSpAp0WRl/idPhqL2rTA1Y5YqKQy11dBYtN6Njmv0nN/HFYv8nFOFFg1UCxCKAoySeRrU8xTctWnzymfe4E4JMC99x8D00vhoz4KXlt/NJAjnw6Vg9chya0azmw4yeuMYDd6JjeAcECrFR37I3C/8pao+IeVCkw3SKTQ56S6iuCcAEemjoDcB/mNGsmSfw9PwrVKTE5eRxeXs3juDzVotaUkdMuq X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB288; 6:g2stBFjY43vdvzNNxP5sYnxEWYCT6cnmchdDXnPu92tgMvD7lydoXXWSD4gDU3BtpwrivlMOgxS+OAzU1iCDyZjyRZ2eos0VqR5sDcyrsBAg8rl/71iIlQn2/g6TRsn4xI/DpcUQBqgAYKWRORVz7wsPxq1ESvBPrXfX272emaEODFp9F7ZzGyTJ0vBnhyD37N/s1476dW683C4kCaL9TOFsulv8QoxjE8mrOmwiYEEfMkTaclD+8OjQtetjr7lhqMBvR1mcuzFXfOQR/OuKofwLkaaeK4mmASJD3r2hSlru0k6TkoB5gZFzhiumNZ/ZJSKJxuh2aav9VhT6zt3aJKd1v4HFycqlZxd7ieQl4tMiPRYcINvM0RfjzCjKQk3L0MBsSpikhg6G6daI+16Imiy0gRuqyqewmxGox5Wo8u7FucZpTo1iHoFW1R9mojYOWGBTi04ck/qhY5S4ZYVGzw==; 5:5VqCUMIVxXOC/x4XU/dnh3frUSzJNqRSqbgzZcuaHYtRptzo52y5DKmVoy/rwUWtAmKuoMeguFWMKHuX/414zzTk3JFuWnwSDODf0Fq/Fe4kEqPBFUT2rjwoCnW0zUHIRCCnhhTnVYnZ87VV+vzU33q1zYapzxDVBLkNd/O8qdIjdwU9LxwWF+X7CtcWI6MR; 24:EYUEuPVFQReeWUqTj8zIHaJzmWm7LDXEA4NM/ELvI7CuXQ/CR+Wa2f+GrfOROhd71To9rJrnt+HzBeusJJ+aFlg8rYWzVnW//EyTZl0PRJY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB288; 7:P22+IkR4iDNLB9eI1/StdpQwFc6Yvmgfpe+bJEA3YXHyxqTdGoZODDxjWA5QIf8LkcTLTXdM4ObfTAmCBZfOTmBhsB5J6Czei96HNumpYvoAN7JtKZFJzUQvb49Z5doziiTt4rFpSt/XhcRqMag43fXWsACOgeMkdpauJZmUBuYcAOYtJFntl0lOJnMnhej+1LHPFIzm17uYnYq9ibGXybdxPOPgn69VJZweKZdCq8jsOqsKV57sUEdVjtg1Tkg6NaY0fAzypR+uNzDGNcU7HHOUWc3y8z97ouEzjeIz9odg8u0hMA2iPBllpKWoEHUneyLd2tfUc4fHCiQp9afj3w== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2017 08:09:34.9379 (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: BY2PR03MB288 Subject: [dpdk-dev] [PATCH v11 06/22] 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/net/dpaa2/Makefile | 1 + drivers/net/dpaa2/dpaa2_ethdev.c | 410 ++++++++++++++++++++++++++++++++++++- drivers/net/dpaa2/dpaa2_ethdev.h | 15 ++ 4 files changed, 426 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/net/dpaa2/Makefile b/drivers/net/dpaa2/Makefile index 889181d..4350f45 100644 --- a/drivers/net/dpaa2/Makefile +++ b/drivers/net/dpaa2/Makefile @@ -49,6 +49,7 @@ CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2/mc CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc +CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/portal CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linuxapp/eal # versioning export map diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index dc3865f..030919a 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -47,32 +47,440 @@ #include #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; + + priv->hw = dpni_dev; + priv->hw_id = hw_id; + priv->flags = 0; + + /* Allocate memory for hardware structure for queues */ + 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 */