From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0053.outbound.protection.outlook.com [104.47.36.53]) by dpdk.org (Postfix) with ESMTP id 33CD6D0A5 for ; Tue, 11 Apr 2017 15:50:12 +0200 (CEST) Received: from CY1PR03CA0027.namprd03.prod.outlook.com (10.174.128.37) by BY1PR0301MB1288.namprd03.prod.outlook.com (10.161.206.146) 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:50:10 +0000 Received: from BN1AFFO11OLC004.protection.gbl (2a01:111:f400:7c10::138) by CY1PR03CA0027.outlook.office365.com (2603:10b6:600::37) 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:50:09 +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 BN1AFFO11OLC004.mail.protection.outlook.com (10.58.53.75) 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:50:09 +0000 Received: from bf-netperf1.ap.freescale.net (bf-netperf1.ap.freescale.net [10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v3BDnjFt000706; Tue, 11 Apr 2017 06:50:06 -0700 From: Hemant Agrawal To: CC: , , , , , Date: Tue, 11 Apr 2017 19:19:22 +0530 Message-ID: <1491918578-4902-7-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1491918578-4902-1-git-send-email-hemant.agrawal@nxp.com> References: <1491725483-6619-1-git-send-email-hemant.agrawal@nxp.com> <1491918578-4902-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131363922101695964; (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)(39840400002)(39450400003)(39400400002)(39850400002)(39860400002)(39410400002)(39380400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(9170700003)(2950100002)(36756003)(50466002)(6666003)(2351001)(48376002)(6916009)(106466001)(33646002)(2906002)(5003940100001)(189998001)(356003)(105606002)(86362001)(53936002)(77096006)(8656002)(54906002)(97736004)(305945005)(4326008)(50226002)(104016004)(8936002)(5660300001)(76176999)(8676002)(85426001)(50986999)(47776003)(38730400002)(81166006)(110136004); DIR:OUT; SFP:1101; SCL:1; SRVR:BY1PR0301MB1288; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11OLC004; 1:E4XeFjg0k59mabVq71Vib3/hq8/GN9ui7YtM4QzzffxrrlBgaJreeskbtojrdScyop2CtnBK3hNImIl4BNuxErGSZjX72Y4YU6IHEtTpGwss0DPx3Xhr+OaeU4vRCL3FrdOLP27Zs1zARBga28VwPbZb8G6zCcI8lQHjlegrHQQ6NkUUD0PI9ZS3s/agLumNJocZ1MZ/rEfPAcdlFaB3SXkx8GW4mbrZxBK0ujFfOIuByCjsmod6CPl745NIXBD44grdLa+WxMUM/nt2OBn/E7sxZt7ybJWzeapkkTFfyFIPqCpH84smaZIxfJf1gQUbXT5wwm4lQNgrfHpC+2QXITuA61mxnWHEZDWo4vxzusgGmlLpo7Ki5BbnvSqUOHFiplJlx40anhZGyDREH+zxI2jj6jGTgPJ0WDt3zas/Wk63c6bYt4PXcqmflxm5Xf7Em7FyKpXuaSUAcnLOtCRgxrZX3tTArJ3GIM5OcuuRQ3+ov5f6EXzToT5YMuO/KjTzikjSWh7kmtWwF0g4aYxLywxaVJB6OanKIg6vM0i+W1Mrp4axmSyKCgZSd4cdHGLhroRoekHe9Or3h9jUKNQUrDFml5OGGCmPwCyGia4elkzqYE7ORO6lPqeDslpM1hOWcAO6tzBH0UN1h1ItHG9N/iqmv1bONqfpyZxKdDz2Yos= MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 6a4001c9-e641-43c3-147f-08d480e1aba1 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030255120)(201703131430075)(201703131517081); SRVR:BY1PR0301MB1288; X-Microsoft-Exchange-Diagnostics: 1; BY1PR0301MB1288; 3:geC3yVRf6QboBqYsOUpxr0lADkEpu2BmjlZa6wcjNV7PWC4HeWgqNUewNjxgIzttYei8t3rZ0DxE5ho1AuupphTXzLpbsZIDxyskS7Ln6E2RCBJxvdyp2WpyjCYvpVv72jWb1/pBUa64UBeb7bSynE4HrE3J4gDW9/2u1cROA+aiDRPFNlwSXvPHo+y2ai/8NrgKhuJr5+eBs46MQQ0NVg8QIhfUsKAxjH7xBvL0/JOM0McbVHiX7KTpr0sBTqSMiG0ai5hd/V90qN0DRy0ESdJ/C/b4hL5VHsv2YlmF7GMNbgXQqQCwmH17J8acVWd9DNUksSKwG93zQIPKjZRdlNejC88LirRfXo2DAI/rB/CVoysMHm8bE4tpdbzMz0mc3wKAHIieBVrm0H0vCCVXOOuVAYxE7yCtnUmIYtht/pnuZx/voEEHrrRwVw9+aD5IlbrwkOSNTYo2GCia2Uittw== X-Microsoft-Exchange-Diagnostics: 1; BY1PR0301MB1288; 25:mfcaKpCQw3/9QdYi+832QjLFzwaBRmyjcN1aVBSRSfbH4BwpRGwZsJcAAMrSKrzK2px4S8b93ujeCHdDVNWSZqkmruwmiRSRvfCYBP47kAaD8IJL9QE0Om6TjE9px0MQ2461TZ/akaAA0IL1QYUy62/e/fO5ZbhztrtadVWnF3CVRBYzRYhKergp2VwaMZo5c8hvqkbNahAFiZeDR5GDLsoDGo/g9rjLlCbrHyp6089M8I9Yt5mz2DTNqX341Hj+A3P20OKoPcVEG7BSa5KX6zpEVfoCiCZC0skk+luU+bTA/aXAHrSdhop0rIyj5b0iEsl+t/RwCTrMe8ee3P4aojqy4Jr2f6nu3zIt7iZ4hbR1231DhogF7VkYXDtm4tLjTzuQ2lfkepN+ERau+CqM8V3OnADLMlKlVRV2dP/VBaUK4GEe+J+a4lPbyYTCCnghqweQJRx19EcGikbdkp+8PQ==; 31:br9YSxrpzrufXwjiMnVaBVpMnP7MSml7GC2/wQpcXxWOxNou9U/q0R2xOTkfh815FbKy5a4xaV9Mmi3p3nO4FGbjmlgbMNr5hLvhOMl+vp+D3C/THJ0IHX29Tp1Y4kJzoBgF9oWDz9gBl0mp0NfISxzgO2NNAS4vMw9sP7bH5s3FG5mXfwcnvEW2w/OwPNmtEYpGCdR9Dh46YuDLEPB1R+PoJJbRqcVxSIW3cdLv4fzmnr/JHq2incQ+og51aYHJSR8chQRaZx4nTaPUR/SZUs1yWOgPmFqzGoKBotRL9zA= 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)(13015025)(8121501046)(5005006)(13017025)(13018025)(13024025)(13023025)(3002001)(93006095)(93001095)(10201501046)(6055026)(6096035)(20161123563025)(20161123565025)(20161123561025)(20161123556025)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259108); SRVR:BY1PR0301MB1288; BCL:0; PCL:0; RULEID:(400006); SRVR:BY1PR0301MB1288; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR0301MB1288; 4:R91YDd7dw2y6Ya8jUplNwCRUFEMmFY0OJ6KWExHZ?= =?us-ascii?Q?SiMFwAvzNzgpPqoS5jCIZtdPYhRh5r44hyN+Aopdt4YVEbh437g3wKYmwJ+e?= =?us-ascii?Q?HiFU+rky3i5yLscWjHYETSgqMGMyNks7QwqU5ps+kW7oiMXdncIXyxePgX1v?= =?us-ascii?Q?qBiT0cwRBXS15loK/ge2bZUsP7X2pOkr339uaz+Az7etaxH6LNvPFKqtMCxP?= =?us-ascii?Q?mLFz+FlztVRGbaPHuXBUKKOuRUNtiwT5xIqpDyzZHzismMhb77UQ7yvwi3/3?= =?us-ascii?Q?vU5QFfjWkoiQBEEDPAYjZNcCT+x5+rMMmiIoKAoS10jl+U6G/cgmLnUe/aqC?= =?us-ascii?Q?RJHHrfY0NkfeUxEwfmFw4qfNiZLNcUUt87PM2CbZN4xxuTm7RjYhO5Zenv4Y?= =?us-ascii?Q?2tBYzIBcj4hl00w1ncGVbqTVGxg0uycRW+TugcFkzifjvIZFjlVCEBQkdhPt?= =?us-ascii?Q?/KhK4FQEcxUkjizDIMbB/H+2C1EOVdbGxv9092Wbg/ajfiZoY0mBYERBmZjS?= =?us-ascii?Q?fqM7J05mYlPLwRiasdfjej7ExRHcMxPgcoqKD43d5cyrn+GypwvAuyJP7WSN?= =?us-ascii?Q?Hi7Zg0pZ6Q0rgZR5D7BnZQrwopkOfdqMUotuZun7dwXSTAv334D6gKUhNIql?= =?us-ascii?Q?3iYvS5u6GAy/ip/KVT591cMwISs45yZwoy65eKQpEuKJSda5j0oWX7fvlruK?= =?us-ascii?Q?RQeT48ERl76qenDxvxHz7y3CUXjXZRMotf9D+gzVGMwgOf+R/uhp2Fe/x8Jc?= =?us-ascii?Q?rpcpqjDYwgUS4hvO/BxJCjGcXlnmNOZxJF/BbCLIch68J1oh5/0gjlPATQpG?= =?us-ascii?Q?2ZFH2ZMDy6oMmKxkEf0uhF+59Ymg1EAulk896Zn9nlKI/aN8RWmQNGdNrO/k?= =?us-ascii?Q?gRrdS8PzFUREsRHvOvuF2QQPGN+jDTZtXsG2CeouaVuN21290EuNL94Sdxxr?= =?us-ascii?Q?0y7ahe48TjB0LrQwPni1zl/ra0BwADhEPqSdNCGNMw=3D=3D?= X-Forefront-PRVS: 0274272F87 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR0301MB1288; 23:WgE8pGMU2h9Nv4xfzX5288BCP5OnWJrzuh2K9Xb?= =?us-ascii?Q?cZVt+VEB5Uh2jWYhq+nt8VIEWTKmLDFTJ1R5ONIuLyHm6O+O6awB9Bxrg4Uv?= =?us-ascii?Q?6kjrCJ9lQkQMm4gi9dGrC6c1pNJg3vhgOS44QPNaO/n+ctoM2zNddQSx0axg?= =?us-ascii?Q?WSzTohN6wuPRwsalDeZuHtJp8SCaRteAvD+fWZCLpSUqH9qjQIDCs1TVFO+a?= =?us-ascii?Q?dDIx+mp8T8Y8MjNulaked32KvRcVHseTt1kq6GClJd85bhGVxkd/0lMPSw5h?= =?us-ascii?Q?PVLMEhyHZWOq1rmll58hGQ/OEHP44fN8ArStb+69ORXQOzTBFEE5ITO/GL1E?= =?us-ascii?Q?qt1kMkREGKQOXpmHxLGaIyzFQKU90xWncvQL3JMe4Wd4t83xz4f9SvgcncEJ?= =?us-ascii?Q?uBojria+2o/cMsW2+g61eNcqF6gIBhhSREHTTz/8IJk/hEWfl7Jg7kQD8MaM?= =?us-ascii?Q?8OS0ppx4IKMHAIlUIhegIA7ksv3FDFGLdX64KfLvQhmIA0gKx5TAiTUmXbCG?= =?us-ascii?Q?Viv3yeh9PlFnAng38TzGnOPRey989RJSPtZGhVFrfQ9zmfBaSZFE6sn0PXUw?= =?us-ascii?Q?sgdaTf1E/BTR282ruS73CXsVK4y94IPowgD/psE6qohKFUzTMtdKCuIbQsNw?= =?us-ascii?Q?kDZYC0ufZUyv7PCOK05v7jHSO+QArtE3qAfHRPbH5psHM1PyFqjZYxgdT8Kd?= =?us-ascii?Q?p4wei232H7f170emGzM/8dqL1cI/XrIm9s+LoSY/Q6FrvBMYjqgI+MIaBK+0?= =?us-ascii?Q?wAw3mlQjTfwqwc3CVk3RUwFSq3XdOmh8NkymBbn9u7X2T67poBlfc6Pxh1Nk?= =?us-ascii?Q?qnYQjIHIBoiC5+sdpr9oizLW+zD7XuRki27KXkHd+4kBwbgH+gTz3cjCIcES?= =?us-ascii?Q?yMHjtn43hODf0SOqWRIjjqJh7BO5niMAgOdimRVCjhcSkkEI4d3aH7n6SEGM?= =?us-ascii?Q?hGoTkLdFVNqS5EGRBM1kppzthofL47b42AM02H49X5JN9nPrH1I+B9co+L8i?= =?us-ascii?Q?FxVUEzfmDpcxS8KFiw+rPPhkY2eubDFZPhaztlUzgYM235iGkFPD6AClnQl4?= =?us-ascii?Q?28uT8fkAWWopZLiqYGItqhfTvE5/dVx63Jm2RX8yl1How9BTwJGHdNSPKdV0?= =?us-ascii?Q?fvJ456FTejaobEIhUrl8XYk/lAObYyPGnsoNBTiu+dMYj8WHrQ2cOGKrJhGh?= =?us-ascii?Q?Eh3SJhLM95e1QLFVFQerc/DVLsrgy0NgWqHi3DYIVFy5/3M9n9olWUt8Hvw?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY1PR0301MB1288; 6:bfKpkU+QFpS2ct3m9oMuU29OIe8pKTrBuakaR/rxCod/hIc1OkS0NSPpNzyiH0BELz9DOWJoLiWVNql89/aw62aFznkoZITGBymHyNePj5eG++/WBSplcVS5DpmyGadgROHkQdeZ/9tm01yEV6B6FyLlT/YEmnmPevVCXr2NAx3Y/9mplk+wuwRZetIfnwn8BJRDS413YH3dbBLAPCbkElJAJVD+aj5y6UnnTmsRvu01bhPTJHI7JBtolrm8KIJkxwkNBCXelYEaXNRgcfiN965G2it21sRpaWd003rd3K3d9M+z9E6R9A37cGaZ4Ix9huo/PnXKLAN7jhhGajrwf+qrREYhMSMfE5swnpiIBd8wO7KCgr6CmYS744Iq3RvyB8DaO+f/R/eed4Uv+Ck4tUmqJMNQIpmzzbXYMtd5vtkhlbCiqf13qXZMvrXkGp/DcD5HdzeqcP4ShQNtsNYOUQ==; 5:G3mytff29uCYB+bGrtOWWWAx+0Nf9WyIFs/XpW46Yv/2w/ZnYNdDldBZw+vRZAbzIHDP9YhoQMlTcvXITjRlH7AErt7oLDeccZd/ONZhMgzvoq5p7C4ustkxkgGpn0yOuGJ7sc1dgYsLN76Dyt7jBCf/U25S7gWWsJJFfbF6tIqU7tmN9YRBnQHTaLmYEJhh; 24:qrwinMJe0LuYKho70MVdpVhFvy+ba3GKtL0+p52PMfGWlzvAhLCmlLwA9OUfwUjIrdFpoHaJk6uLfn3zyqS4ov3Lt0pJsH2TK0z9FkQilG0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY1PR0301MB1288; 7:ik8XfcAc//fZPbp2yXT6cLYXqbGYpM3sbuMhjXnPs1OfOGdj8tmY5m/K1wJFdL0WJA002W7cPgYoVe8bQ2p+bWtHrp9DWyaYE+/hXwgBspLwr3mw3e04TE3KhVgbAS2JG00xk64cSTc0EEEhAzmstRqwzb1SWoFBmdnkxQZip8MqBGApp2E2y88oL6ug7GBlXZEhv/9tyoUTE8AqacolqlBVagUHvvUdTHOUn+Mf3+9WPPftro5vwwIWozcRDbYRxerwbeT8LCt2iBUt7Lsh4LvxR5BPH2/2jfcSERO2irHYlcz/0/xp6dx7SWHdwiWDNwt/AqKxejgfvzZP61steA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2017 13:50:09.9824 (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: BY1PR0301MB1288 Subject: [dpdk-dev] [PATCH v12 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: , X-List-Received-Date: Tue, 11 Apr 2017 13:50:13 -0000 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 0b3dd67..5618feb 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 */ -- 1.9.1