From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0051.outbound.protection.outlook.com [104.47.34.51]) by dpdk.org (Postfix) with ESMTP id 91114F970 for ; Fri, 3 Mar 2017 08:14:18 +0100 (CET) Received: from DM5PR03CA0020.namprd03.prod.outlook.com (10.175.104.30) by BN6PR03MB2947.namprd03.prod.outlook.com (10.175.126.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.947.12; Fri, 3 Mar 2017 07:14:16 +0000 Received: from BY2FFO11FD047.protection.gbl (2a01:111:f400:7c0c::180) by DM5PR03CA0020.outlook.office365.com (2603:10b6:3:118::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.947.12 via Frontend Transport; Fri, 3 Mar 2017 07:14:16 +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 BY2FFO11FD047.mail.protection.outlook.com (10.1.15.175) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.933.11 via Frontend Transport; Fri, 3 Mar 2017 07:14:15 +0000 Received: from bf-netperf1.idc ([10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v237D50P005035; Fri, 3 Mar 2017 00:14:12 -0700 From: Hemant Agrawal To: CC: , , , , , Date: Fri, 3 Mar 2017 18:16:39 +0530 Message-ID: <1488545223-25739-23-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1488545223-25739-1-git-send-email-hemant.agrawal@nxp.com> References: <1487205586-6785-1-git-send-email-hemant.agrawal@nxp.com> <1488545223-25739-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131329988560268223; (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)(39410400002)(39850400002)(39860400002)(39400400002)(39380400002)(39840400002)(39450400003)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(9170700003)(110136004)(2906002)(38730400002)(4326008)(53936002)(5003940100001)(50466002)(48376002)(106466001)(2351001)(105606002)(54906002)(6916009)(8656002)(2950100002)(6666003)(5660300001)(104016004)(77096006)(50226002)(626004)(189998001)(356003)(8676002)(305945005)(92566002)(81166006)(50986999)(8936002)(76176999)(47776003)(33646002)(85426001)(86362001)(36756003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR03MB2947; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD047; 1:mmrWVjymYtxO2e/YH415De9mum2k43VqwfvSmbfNZqbh29ddl3/Fjx1svrC3P+K/a4yDyKhiOGmG9bIecN4JIzGhjZUuBSYLU5CR2gHgT7aAxYZ1NRmEOhHxqCsMtbTX8qoFaVy3GivQw7xJ0kglXF0aX8WLmPagEi1NGwZpAZeTnnDDWaRpe0lI1YCHuXbrFgpma3MjdmwvrvjlZijNKpx5cithjelz93OHedbfpsuCcbxjvTU7+ukDDEBCNIDq25UexTSBt8f/mv3BSwHAG6+4n6cAw8t94U/O0WDpW5cJSK9w4jLtcW1irHbQxaSZqU2A+B8/lRn9Nk+nJS9R4v6ommG1dT90Pw8P5O/WRho/BfeTubb3GKuswi4sgnaJCpj/xbp7NOV0rNvvz5sbOvp9ZqKlQ2k4fQG1VPmiDW/4EBKHbgp/QdOdsGTdpKJOxw8aDmLGMZPfwlvHprw+phXvN4wnk3t7l2Qa1JSltPxLh3PYFXuEkGP3f97fwC+NgroDGohwj5SBIKyR+fAnUC0Xvsc4BvjZ36PX0hJqLS+7RhFSKaeP2GQ68YvMS9ktdBka2kTnkZ7N3rowwjG+tbKtbisnMwtIyrucy/rx1jy/Q0ibf5fit3dptH30hQQW9/FdCVaTj7i25YIU+ZPy1w== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 295331bd-ed3a-4002-a0c7-08d46204e6e1 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:BN6PR03MB2947; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2947; 3:ORVIwa61VazEB7NPWYCYjbVyxLdEi/gGQaiq38mHd5Jz5svAT8mqYxupDuhdbJyMCkZbOFBDG7XbwmuDAIgAxY3Db3wLr1BcyHHtwCqyrsnrBDZuObtrsL/gqN0YPjTLhm4pexHZgcdnSuIUIX5z08PgjIgOQ8+mHSoWSek+f96ojZVQAquo5ZgaWfh20GmHNEtQb+N4oKQHPwQHO17/2qGL2+Hl/RGVgJaut+sX22wEeHSeLQvSqoH4xauv9oy4+W/C8r/mBariXYNOZhglkHC71OLYoEAJMjD6nT3zQftxCGPkpOgYzWThzXxJNc+nZyBqVzZVlHrn9IFyxcknqo5O26+IgYyu/I/rXGbaKIk4eaNsjRlq3mJUR4Jd3H6y; 25:EcI90yRSTJ0lG0QD8YgUYitoJANv69SoU3uYzIeSIS8aTvJGCwDgYaWgnRXjP98KxU5yASoUgg8KW6+QnWjkz3jMavh7tvfVF5FZ9EISgSOZOw7UJA+7HU/jFhxwreIwoTIYh9H0EVtWVRrEVBVmDvjzMP0Qk72iGK0d5/tr7Vwe3LG+yD2wtGuSDpjPMLDpgF0WYgj74cTnjXVtzxd48sxAlQIx3qw4Lqw3kduj+OvI2RkLgR0+oajIS24RgFwulZeSGF5yNZsrHaVuqmwPvSux6DT6GElFyXyQRx5I2aj6NQOwCGfdA4y/SmeLbSjNWvao9q1DLtd8eJHuQYctCT+Y3htr8zWDNbAGCrSSGPZALDoe8200fTF5Et1z74MiovDOD9x8/dFMg87SIUevARrVYgav/vtadPnmXsq/ZfCuYL0LF0hA+qvyJ4+UyS+9yDiYr59jQOM6VNkSAhrc0Q== X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2947; 31:A/8AuGE0lGza2iM60SlVkrNiRA7UTQTp7uSIHE/fxW6hTMPQho7X1WNat92/wout/l9sPKg2y0FcO0IhxO6oRe9Yf/BlZtdtD5EcB0UDqWnuRnOp7gE+btGU3NN89Nz7RE4FEUV0ZFhw5iS36yR1nFfeoBma9RpsBkL6PutT2F3PWRkX0wUbFM6ijes0KA50vVGluGGEXJvMCIJJPf29F2rIxOffEpGuoKj56F+Pfl/tDwg71vcLyhnkEwbDsUrTz0tp3/kJ17Bg/a29FiddAg== 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)(8121501046)(5005006)(13017025)(13015025)(13024025)(13018025)(13023025)(10201501046)(3002001)(6055026)(6096035)(20161123561025)(20161123559025)(20161123556025)(20161123565025)(20161123563025); SRVR:BN6PR03MB2947; BCL:0; PCL:0; RULEID:(400006); SRVR:BN6PR03MB2947; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2947; 4:WLrXdFiXtTPUPGDsCAIxwxqBK5vwYwSrmqjAXDPg/y9bEdTbzBXKcga9JTLc3gN357XDHDuHEZKhOBrsF2r0rrsLO9Osvi1XCORj3B8RHWz2St2uXYiERgd3NEcqcvs5Zm8A7yXhl8uM1Opr+nzeO4j3mCTX7dx+U/8GFZGvaG97Y+I4ZWcsNiMMfRD4yNfBzE1m/pbDCWowh6Ob4JHt2VKHkDU3YkjAM19Y3kFGRIB6UxoAxLbVRlpBzV6MdIUYuto+6PFVmRrHXl1OHUQ+FHqC6Sa0pk2SRy3SNWtGbDN/uuLIUVfrsdMFXb+J3+P2P/aagPLz3L+g/Aew4XsDaWDYR+RExIYhGQ0uv+mthu0ktCR8UNVt/eRo/CnNx0tMoSlJm5XIEP8H3SVNNjJulugLhqSqN/1D881jHz6sBSswZJQ1cjuEqLanozc8tJt72VAnwsoYu3RhFBP2QhjjbS/pI6ETcw/T446BWqsc4yeTZOteOKmaGEWWRfznjCxOoQ50qKVP3u3RNZ6tLN2rAyIOgPoXfuwiVAYjL+1g+dMFDzkh9E/urA11GO0mFXBgZYEVKDrq5eqy2RMB9f+0KSKYOF3dblaJq8PXtxpG73X9kw9k4DZRGxYBnzPj5iqfy3h2Y+lxQRgnqc7Tc0eJIIJuuzrzuUxIRaUBpfvuSsMTeGI1md4x9xnDy9amtS9rskJWsfGzHPNFc0ETMlE8Dz77O5Y3NvEXXV3YcxSbAbJaL2+ifGtB5PZbv7xLPUlzwT29lbBH30W8TcUTS8B3zA== X-Forefront-PRVS: 0235CBE7D0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR03MB2947; 23:cXd1WYW2RVPBN1kIvf6MsgLXNgiNR3eiC76Av2jKU?= =?us-ascii?Q?ioApKDHeKR9ngefIg1B0wj39+wNUj+7HLa+cffSoFId5OdFXMigTa9Ou5dzo?= =?us-ascii?Q?/ZOvkMX0rjxvfYmozSnzxkx4Sc0kf1h3HF97p/W5/euRzY6roBXLotbK4Hjt?= =?us-ascii?Q?uRNJGxyEwrnOl1oel9k8icbznb20Gsf5u/8a1nZObXA0sqCt7ZWDGwGlZeyL?= =?us-ascii?Q?l8UGwtkQjcRa+WP4MgXjdnWTK1m4tHrsNklcB9LqzTTD13dAAKa01f2qmEq5?= =?us-ascii?Q?2Im2ztFrhYRt0wXBivpud5wsKLl63J3Or2thb5cuFwS6f/Xh83hfCU9fQDr3?= =?us-ascii?Q?dP0pJgquDe1qXP5bYShjkFyh7ImtjrjgAONCGGY9LjjGgbL4Bv3Jww+MBWNF?= =?us-ascii?Q?xCjw64kr2rp5gJDXj+Tts3xs3dkOyiWz3vmGyx9mA428JSDd54jbsY9pm/IU?= =?us-ascii?Q?Bex88htAbmlswfkortLx0NeVqjMdCy7/a/PMdRguWmFU0VCOP4Q0vWj9dzW8?= =?us-ascii?Q?/j+l+VDUwNxp/YgB17LPCwNIEVXVlho1HINRa41pwa1FUaGFHFSLE16JfIYJ?= =?us-ascii?Q?sFsDylfJ80AKLRWg2/187OlMNvyy4jREuVaLl8BhCuix9aqyw3ttEs2s+Ag/?= =?us-ascii?Q?I2Opr4CsLVjQ9GZYBQOfmpvwy4b86LPvO7NQT0QTK3W+EqzANBkTus1WtHrE?= =?us-ascii?Q?BIpfxi4cNerXjtxlhAHC2duVggNwB8AbDv3KXRKVe7UYIcSKESo79UzUM0pr?= =?us-ascii?Q?4PR3WlzmlW+zyovC73hoV8k8IW1YIRI6n4H+R7LIaKXvUJu7twPh1NygjUHu?= =?us-ascii?Q?Svyd91dOdPtSkiJeW21VlZvZt8XfTVpizy8eRW4Y1TpE/CAneBX9YfR/oZB3?= =?us-ascii?Q?pen0DvG+sLHfprXp0zVqjFUS1CxrUQX12gd64P9uWpnBRe9Joua/aGcNNnQs?= =?us-ascii?Q?C4JUoAqPmRJ48EgrM2GyjhlTxB7LEbSIqD0ir1rdE8mUm9SUGqHPVU7HcBHw?= =?us-ascii?Q?Lx/a6P9lTlyUHmCP/NIvs+9ZlNi2+907YkeYH+XUhCYw8vqe6iWv3ofr5knJ?= =?us-ascii?Q?qXLYqkcMxLAue9fscNKxLioukBoQrhOuWiTammFRyfPUkzPyT5kPAGcYOjhF?= =?us-ascii?Q?HS3fluPKMcF3q1/wQleu+nrA2rLZKTq644hKcx+NTwc6LKyupui9N3Jmqg96?= =?us-ascii?Q?T+HnnOQrNeYoDNpikIKrzms7nsoBrE4wCdXtNtBD7kOlJ5GFHE01b7SyoJ/Y?= =?us-ascii?Q?oK/Pit2n1tKZEP1XhWGX7Lx6tE45hzozDIrXNXh?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2947; 6:bpRWjrJxkErprs2ftJLF9StHoovRX7RbQAnI6xebGRCfLTiG4ERU6Tw99+8U2uQ9snKD3kU4akCqKgU9PTooyPo6TdC9iRto5uxq/JYTeweTXmP5zCKRnJJ180SIF5gjxtslqhOsxffukrUKSrrdrtIkt185DhkFBEOhNNrwahrfMCxpyEpEljGRZlZazE7KS+Hx7oOrgE157dc+WwbEoSWkGfRW5iRkGViwB4dn+2b52f6Med25M5GWgcP+65L0QpXX0wv5DvrXUbigABo3E5o0kKgHuwMCga36CIINxRSXP2zOxNCSajR/WdZlCHRvrkjznyYX+Ocv0Bi883DGZ7d2RBJ1g5K7/lwkKjZN84y+xn1QhoJEZgur2dTRTPL006X5z/21Ma6krYBMB76+NRiQnVkURvcAkpiZbYkPURk=; 5:7pTVIkdd5+Ax9J3qA7VtVbYIwP6HZFkUYqQFJoEDZGcc8Zs7h71Xsi/7ZV6+L9SIAad82QQ0qVHH0cIfJc9rsAgRYn+//R0SF7Nh9tVXOuJeQ7fUK4uyhtUnu2Iw2liWXAnLB2MbDndDzMIuB3F0QLqxoiQRFis8LrL1sJHrrD/r9cKc4f0mji/Z8BKW2A95; 24:G7mG7nNAolZAla6EZCc4xDcyCU9jinGzWrDpv8kFW88rPE4a3BLdeUUDxICSjBLdCeoQCfkAZuadhv12IMaYOZAB95MFJixSJ/VUMMbQcUM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2947; 7:BTKoNlmrpT+6Js14wPKIBlfkHf/4Q2cYFDvzJXT1fjMldSr9H+BjoJAIrbdYzJvl4DnFFiEMAfLxtofIzPkdnPFw3u6yqg2tcbni5mIv8rajHjsFPaUnn2XtnatRVqt6G9U1YFGrGejOd7y098i7kWAIy1ym7BoFHmSqStC13xl6yxO3rOmCJsbwaotLSBpo/zqgRSqFDCKvHLffgRCr2Ct5t7ZDQsJSxLbJVCpzslrFKRCe9FakysODFj+WMkDTlq76BiNfpT//7+DglfwzHutw48XRjwaz6Dxe1Qvusnd4nftXg/W1GyL7/3J4/wdYrNcY8zali6clm03nlTXzPw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2017 07:14:15.6992 (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: BN6PR03MB2947 Subject: [dpdk-dev] [PATCHv8 22/46] 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: Fri, 03 Mar 2017 07:14:19 -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 db94b45..4f78565 100644 --- a/drivers/net/dpaa2/Makefile +++ b/drivers/net/dpaa2/Makefile @@ -50,6 +50,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 ead6a2c..934755a 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