From patchwork Mon Dec 19 20:53:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 18179 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 A4553FAE7; Mon, 19 Dec 2016 16:22:03 +0100 (CET) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0077.outbound.protection.outlook.com [104.47.37.77]) by dpdk.org (Postfix) with ESMTP id 94244FA4F for ; Mon, 19 Dec 2016 16:21:39 +0100 (CET) Received: from BN3PR0301CA0017.namprd03.prod.outlook.com (10.160.180.155) by DM2PR0301MB0751.namprd03.prod.outlook.com (10.160.97.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.771.8; Mon, 19 Dec 2016 15:21:38 +0000 Received: from BN1AFFO11FD048.protection.gbl (2a01:111:f400:7c10::188) by BN3PR0301CA0017.outlook.office365.com (2a01:111:e400:4000::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.789.14 via Frontend Transport; Mon, 19 Dec 2016 15:21:38 +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 BN1AFFO11FD048.mail.protection.outlook.com (10.58.53.63) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.789.10 via Frontend Transport; Mon, 19 Dec 2016 15:21:37 +0000 Received: from bf-netperf1.idc ([10.232.134.28]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id uBJFKMhi029110; Mon, 19 Dec 2016 08:21:34 -0700 From: Hemant Agrawal To: CC: , , , , , , Hemant Agrawal Date: Tue, 20 Dec 2016 02:23:58 +0530 Message-ID: <1482180853-18823-20-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1482180853-18823-1-git-send-email-hemant.agrawal@nxp.com> References: <1480875447-23680-1-git-send-email-hemant.agrawal@nxp.com> <1482180853-18823-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131266344981503799; (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)(39400400002)(39850400002)(39840400002)(39410400002)(39860400002)(39380400002)(39450400003)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(77096006)(575784001)(86362001)(92566002)(38730400001)(110136003)(47776003)(50226002)(8936002)(68736007)(81156014)(81166006)(8676002)(5660300001)(85426001)(189998001)(6916009)(2950100002)(6666003)(97736004)(5003940100001)(48376002)(76176999)(50986999)(33646002)(36756003)(626004)(50466002)(69596002)(305945005)(8666005)(356003)(104016004)(106466001)(105606002)(2906002)(2351001)(4326007)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0301MB0751; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD048; 1:bPcci2NsNTqDNLdS3o8qGDI5PipC7eVkY5vtKusF4sV2RpPkCx9JzQg0/l+XtXx1yg82dDUVcOlnPX9u46YM6spjHzvlcSX4EMs1Ixoc4RDHSiwwfDzp/6yWqINGXtGxzkFd4oaPE6h/O+meELU2sTEwgY6dv0iQ9s4OvBueSzUgGpsswj27gq1HxWWkmAHaKVC8WSFExXOcS4diFovhmz5XxOJrBPIkbWgiNUmRT4uP3rTNf+rKkVG+oHX5vkwVsJwlY+luqq/2vcd9cqdH+g3rtIX0wurXYheKWcjbyM0q4XVK2Hxf0hBIix+/JEHpRV6L28xdIMAlmsuN97IV0uMgIjzMIQqWqce+y7nOEbANsmKkoiPZZLldRNcQKOyLNhoz7H09Sz595Wzvk7/Dmvv7GTKSI6RnXJlxQ40PvdCknKrLD0NMSh2LnmfCE3ea+3Cd1StEBQybIL2vcpmDW58RwC43qQEsFHi/G0LrGeipIsRJmXH5xbLx0DJNPv1eKWR2jeErQFtrWgU/bHVkXSaC7UM5PrrviGbYtIUgeC/JjVg0vmySrikKqLUHpeBPgrejiyuiNK8JAxzxDmeCjiSYmnlF7AkpQp0Kz1Ir3RqtxEp8E34ArGCPxu7UN6LS25JoeXHgOPou+l+pcmQlAxjhyqXEuKPdXG3SSazlPpJk1iB1TqfPgJ85/1tLzBYM69h32s2uTIPCWcssaoRJKwjh14yYI6kXEP6HTGT+L4S3yzk4GeXb45FNrrFcJN1DOBa0HsRJBky5IliQkR62JA== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 4bfd8d03-7cab-44e5-bdd9-08d42822ba0a X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM2PR0301MB0751; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0751; 3:HFyjPezye4XVkeutyezrEJDhmjAmmj2h65H5xRSqbo0XcjwLGUUXbLMAXFkFM40pGW3PGWaWu5K1dJsXGst2AdfsyPIbcUlYi4iaDtKstBQe8x4VFKFfKRnihRi9OqLqLakZG4bVcbs1mdwmkuWEwK9IYZJG+r5lCR8DhekPD1h8hXCyUqGyTpZqhd9lGi4G40BFYqz0WXtHXI4l4qwkXjA/Rx85JseXAOWter2ebZvamTD8i0Vr6q2rj9QA5r/JSC3eobvcUgzSl/uN3GgcYFtOI+D7OOT9q6oskkxC1pGK1wJcy+4fRzSV0RowkO7NLN/ksSuATg9+/a8KzBmduxlEZiDDeztwaYvTdYn7hBSMsd6B2BDSI+ohM2i0V0N9 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0751; 25:mX9BL9uXoKFNR9wVPOyd+pMQ0zy5mskzSGg4zVdvkzQZnbjofcMz0I4h7bgFtl+mK72msqGF7JE+s73AC2c98HKVY9/yD+iLSTq90KSx9u+e6Lxad8K36RjXEwXrVdLaXuH2f63Y4UyQjbfIL0jwUDtJbvaNK3RfjtkAPQVPqKAB54rUkHnVfW1y04iRSxNAzg7y87t5PSdrauBZegEnAaXk+kS9mhaICqV+NSgU3y1lBzkzkiVX4gSJl/cknY2dcidHzHcWGoo5ut/dwLrj3RoJjH/DdksdzV7WrLVNaMjgSVU301TyvTPkd7Y4pb0dFGqXa2UZhYxrr57wezTPoa6rb44Rl1mAghssw7B20wG/AqTovLJfG/UGmlD4Sz0J2M3CJFYj5sFJvy3LLqQRqbxK8w1smeWSlYejvjOfZogJn8VdycAWK+6NuLAQQ799gEpfS72vf9+Q2P6qhQvA+QBpRBtOXRxjwruKd1wXAOFLFAUhU9bcmrXrvOIvvGninFuhgIfb5VU5Mb7kWXqv/WXTl3XNrLqKXNhtAk/blmrLw3XqRswDLK7wMtuCUqMF/XKl9qe82MXcJXEMOYGZD/M9hRxrpA3Fon/jUl3K6JKJloLGbug8Y4FB5/vnW4zBONYF8caFSKTR4qnJtWkzRYqLSNSFM2zmiURIt46jt/ZvYJJzMyIhvEogoYI9OJvsM7jnA9948AH14cijeuuKC/lhuEyTl3vPk1imLMgC9C1QT1xxfRDgOzurt/Wa2vNqZ8w5BpRFGghtzvSU94fJbyKnnLMkeqN+cOYH7i5GbG2ud1GqtjnW6JpUyt6sDPhY X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0751; 31:DwUAvk75+FgJIzEUYFA3FouR9xve2DK3bhxkM6SPs0afUYhCaTqpzNe3b5Hz0IKeRBzcSiWdn0DF2Ue+IaT46ULMcTB2KTGa1mdjNplg79iDCOXvC2LfyLMoFzTWvFq46a/wohSNg50UR0aM5NRo21ehC2TKZPXqxnkyUe5YgNgxfDpdblWWxL656cM9RIYVTmDtglo60lCgM1GkzxVczvP/H0c5oI6VER5sMaG9Of0PRIGmqfThqOr7gCbllrJfl/IRzDZxfxtGJ41OJHX63w== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13023025)(13017025)(13015025)(13018025)(13024025)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6096035)(20161123563025)(20161123561025)(20161123559025)(20161123565025)(20161123556025); SRVR:DM2PR0301MB0751; BCL:0; PCL:0; RULEID:(400006); SRVR:DM2PR0301MB0751; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0751; 4:mOB1KT+1MCpNZ0DuM2K/ul5ee1594Mw/zO+to6XmY45Plh01gLztbaUSeIIJR55Mv4dga1VW8KYlUB+cL1tYBzsGc9bo0rdNsdfBGNS/94geoaBgYcQ3RMsv0T3Z4TRW2hoW05HnPcUYGeMxS3MJHBK0sJL3vinDsywWpkkbGJeFu9U9cv1Y2uHkC+v/W4kU8tobMrmHA10i5SvRABz37SNP2PMKWfteK4LngwcYQBOZyCSVp4+Wvmdv0sy0GxrV+IMbaYB5NN5hYrdjj8RjA4d41uycE4kOTlDy6EzxZofsVzmqjaeJSqv182gb3jTp5KC5WCQFPJlSJwHdq3zJuOYn/yO+MFDrIYJUmzH7Bo7ESIjVsJi4Bqrv3ZTU4HFAHLoYsC4KHihu9M1/TCuIsi08NDC41GaDnRkdWPO/ux8xJ/hCIVb2b+qeBSFWey4+E4jNQy4XZtjvr5JQjd/mog4YBXQs+rlFwP/hPKqk+z+tAdpmGBCf9QIv7CyKGcyMU4hFISx3TdQIJr3Rq204UJwNFAI4hPl3t2Nuz3VkUSDEhM8TY5BJRmV2Q5AvsO2YyjCbXNuiqIr5rmf1ZpMe4N3m5fk051E6Yd9HO3dDFpTVvpZfGMlVmGq3v+OkzgDoG4Ik72yWVH9RaNcnReGV2gGC5ZVsTj8TODfPuroxvPnLoaY9aBzsS+7fpoUgVNaznLhnKwCfSduFVUDfpBVCmD7ZkBEnotlD+mTtN19BORL+Mp7XfxBOMype+xzAdSH8 X-Forefront-PRVS: 01613DFDC8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB0751; 23:MKVF1JFl78gf57H8ZuY0LBoRrDqd0Ny0fAkfMbq?= 0ADlfDXgW4VoXynDlQyezE2lz3km+Lg332gHeFQt97C3lnPRJsi6c5SRPfnoRD44LHd4777cnR2UVDc6kKZOjRl1f8PZFemxn0bcWR1VLxstlRRahDUdfZWY7JM4ZWSwitzFPrO2XiVJL8ZAbLX303k1mAM5rey7XrdmQlGMyohDTCQiDNp5Foanrd/yT/3njkB66l3aPA7ABiH+EmsENuFiGBN0oDnnK41HmCLkX0wtQsN1DzddOLifx+1hluR/kUWVBG5xVfe2LOHrNkqKObnMSz6IJD1+JUNlWWpwsCH0wxNXuu2Au7BQm7kpgVH6BhQHqMbPak63jf/CWTZaqT4Ch7bC0oiIJQ1yyBUezybDvpb2dAtLkkHhJg2lFCkEsEI0YH/wi9fzI2X2kYmWfzYfvZsBX5g9cqQr9DQNU8eVtkmkV+RCfIPtzamr204tHYNupHoNdzPlznquuHrhcpDUiQ7Kez7Hnb8FZqi9pX1AvXzRP3EgAz+3M5ctOW5+c6Vj4jajOxtXkbwSmVPq7eAcRynOu1lI4REZxbfnoUSNbinBJrUybIETOTdVgubFbrV4I7mUkj9fa4mMMU3SdzIMTnBfIz3Cym3yaFciAW1uIt4oLTzGYVKi2FjboOXNYUpM09/tLoNUWwsfcEvJbfcGNFGfUYI8d4VmWZT3CE0nFPnZgwfNa80t/1oiwg58eSiY1t383ztZTzAKB3HG1yMs98oqQzCDh9LnHb9uE4xDlbj3ON0EW0PbdirhQaVN2C1Sf0Tjm0wPuR5sZMg8ycPOgwgrUHCi+bdsEJDAD5TJOH9Islj53Vkb8xFcE096WJVG6aLBSTh4Aq2vKagVZtvs3IHxWr2uz1vtV9goGuBxwSSCE62GULh/vFTDrza23cn3KShEYo18sswkbzwXW/X55zGQuw/6j9ZxhEAy+Pmtuki5Q7Q6uOTdw03C5NDVVh4mjBvphfltE/WkOJwIhdT1YQ63IPIgPuBrMYHDU9ehG87H/CeNcA9GiJqt+uxl1Y2DMGRqb5xe3M9uhZEbOFm/PGmagMRgePzN4VpCfisrFMZrJbgCVk6lBBAJMiJqLtN4+lj72B7voUFhB9438T3mLCsPLsd2u0eOeI1H0E0Pl2wikWEIDJufj0EgSPgKEO1OZ3mcbmwRUz5CRYGYPTMl1Qdtwkd2vhgmlV+/IDLZJJ8PQEd54cTMxN0BJRTPXUyfr4HqKXNCBMSX1h+mp1WQCeeH+ByzZvuUZBf3jKsNmnH7RmZwVMTsR0pmgpmHdldrtO4bvmIEE5dy+p/gLjTpX X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0751; 6:QWs8RBq6hosa290nR7CtOewq2fDJ7kUdhCyUmlvbVhLMzUfkx5ooM1jZUuJz99oc3UcPFRHsOGjB9O34AwIX7XK8KkPPRPIB765jCaV9CfyLhmd6EYMFxM85EkdnHvHbkljhFAuT5ZvZZfo8CT59rCJS9Ytwg9W5HyOU7SZPRoMDxQabJk2Xgj/qoO15UyvE8krJBFhrBJ7h2iikM7IxX4yD/8vGfugJlxVwM5iwfcFRR7iVE3QilK9O4BmmIHmJ2+bTM6A9588FUGoNMBg6/ftn/u8ChPFvbK2kG3kEcnmWADDgC+7ZqVSZokPsXMdu3p5jOWlyf5fvN8aaV6nvfdX12Qzn9nE4awxMrrXsasg0zyN9d8Box7GMlx31tbx2lw9URsERbLLWRyidvYbmDHxFqwfLXAv0thnZeZsupoY6Jcrq/0QIbF3rOwm7B/Lw; 5:8b8wJoWrq/D9L/EI4zVQOac1qNkROmrRkpu6882k1a0Ahb7J31eAbfVAPZMYKHNKe2fGifGSS632pReROCbN3ciqzqYUrimhMtsVQx0XKDKKGAekHk304i9ZAaQBKsgEep00IzVeEL8otmk6ZoWfTd5CFPuuaogmVC5SJ0npbPOEHnCkDW5D3ZCQEYHyfeBb; 24:6WwFzbZlgfpOVmjVPcQi3QzxYHe6y4K79TpOQV6fgwrtjzY8EzbnE+Qq9ELMgQSBHk1wMFuDkdLP1ClGTecXNEVN8pkiWj3Wl693zzhrAJs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0751; 7:GDtWmGRk+WEOwHkbfdWVPY0u2iWev/99TiOpx4/C2r4XzKlPk6vcQ2RD6/gd31BVuDeXRrI41KDlbO7nNXMYOmfKkmHNPkzOpBYlngrTxa/XVs7kkIlb6zrp0RcOGXRRd51Yen6wakO33RRjfgm/Sgy7/U/aaY1CdfA9e3E3xTCwlScE2tgVE1SGUnSzGM2r1yiOP7BPur+CugSc6O1+dDVeXRYAwN+sQzbXLECKdg+rUYqmmrgQddIV+48VzykCKVA+RlO+O7X+YdyKF1B7oUQ2vhmrteNPXrawI/ORooyxzMvMsFtDGBcecuSTojabP2Dt6KuipR1xvBbfc97VNkB4hnrVtiCyYLzRDqBveM4LC1nU8Cn5NtOo1gSuP0W0K8EVXx64ljIrPNYU/59AO15Hh8BVCmkgYUM4LHpcjmkZ0KTRreivK7+MJ8rK7mx/qlaF0GExbmX+U6C//T+Wig== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Dec 2016 15:21:37.8851 (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: DM2PR0301MB0751 Subject: [dpdk-dev] [PATCHv2 19/34] net/dpaa2: add queue configuration support 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" DPAA2 provide supports for HW queues. Each DPNI contains a pre-configured number of RX and TX queues. This patch reads the DPNI attributes, create the dpaa2_queue to be used for RX and TX. Signed-off-by: Hemant Agrawal --- doc/guides/nics/features/dpaa2.ini | 1 + drivers/common/dpaa2/dpio/dpaa2_hw_pvt.h | 20 +++ drivers/net/dpaa2/dpaa2_ethdev.c | 293 ++++++++++++++++++++++++++++++- drivers/net/dpaa2/dpaa2_ethdev.h | 12 ++ 4 files changed, 324 insertions(+), 2 deletions(-) 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/common/dpaa2/dpio/dpaa2_hw_pvt.h b/drivers/common/dpaa2/dpio/dpaa2_hw_pvt.h index dda6243..08be96c 100644 --- a/drivers/common/dpaa2/dpio/dpaa2_hw_pvt.h +++ b/drivers/common/dpaa2/dpio/dpaa2_hw_pvt.h @@ -37,9 +37,12 @@ #include #include +#define DPAA2_DQRR_RING_SIZE 16 + /** 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) { @@ -73,15 +156,134 @@ return 0; } +/* Function to setup RX flow information. It contains traffic class ID, + * flow ID, destination configuration etc. + */ static int -dpaa2_dev_start(struct rte_eth_dev *dev) +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", @@ -89,6 +291,27 @@ 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; } @@ -136,6 +359,11 @@ .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 @@ -144,6 +372,7 @@ 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; @@ -179,8 +408,30 @@ 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 = drivername; @@ -188,13 +439,51 @@ } 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 840b688..5f599a7 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.h +++ b/drivers/net/dpaa2/dpaa2_ethdev.h @@ -37,11 +37,23 @@ #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 */