From patchwork Tue Jan 17 18:52:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 19589 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 D2CA0F95B; Tue, 17 Jan 2017 14:20:26 +0100 (CET) Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0079.outbound.protection.outlook.com [104.47.38.79]) by dpdk.org (Postfix) with ESMTP id 4049FF969 for ; Tue, 17 Jan 2017 14:20:19 +0100 (CET) Received: from BN6PR03CA0008.namprd03.prod.outlook.com (10.168.230.146) by BY2PR0301MB0742.namprd03.prod.outlook.com (10.160.63.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12; Tue, 17 Jan 2017 13:20:17 +0000 Received: from BN1BFFO11FD040.protection.gbl (2a01:111:f400:7c10::1:137) by BN6PR03CA0008.outlook.office365.com (2603:10b6:404:23::18) 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; Tue, 17 Jan 2017 13:20:17 +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 BN1BFFO11FD040.mail.protection.outlook.com (10.58.144.103) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.803.8 via Frontend Transport; Tue, 17 Jan 2017 13:20:13 +0000 Received: from bf-netperf1.idc ([10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v0HDJ8mP021741; Tue, 17 Jan 2017 06:20:10 -0700 From: Hemant Agrawal To: CC: , , , , , , Hemant Agrawal Date: Wed, 18 Jan 2017 00:22:39 +0530 Message-ID: <1484679174-4174-19-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1484679174-4174-1-git-send-email-hemant.agrawal@nxp.com> References: <1482988612-6638-1-git-send-email-shreyansh.jain@nxp.com> <1484679174-4174-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131291328166090708; (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)(39850400002)(39450400003)(39410400002)(39860400002)(39840400002)(39380400002)(39400400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(48376002)(6916009)(6666003)(2950100002)(50466002)(38730400001)(97736004)(47776003)(104016004)(36756003)(81166006)(68736007)(8676002)(54906002)(85426001)(2906002)(4326007)(8656002)(8936002)(50226002)(77096006)(81156014)(5003940100001)(189998001)(50986999)(33646002)(76176999)(106466001)(105606002)(2351001)(86362001)(110136003)(356003)(5660300001)(305945005)(92566002)(30001)(626004); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB0742; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD040; 1:awMAqS4YCz4yDnIVgaQji9NtJOVz0otZMj+rSyLExbuB7qxTebrCXsimXBJJEhdn0SdmTUtsLdedVpirACUOjZRJAjiha+/0Pc8BaqQByGYjpMcbVJiYBewvZtaeFO1jFo60osjQexGrrfIgs+SzkqM5JnijOkCXCNkyDn7gy/29O+RI2bNmH6ZKRhQfHat8MS6hByyq1vYt9iDtM9MdBTryXyGhze/9b2cilTjj+HwEP+LiMJUN6fvUfgv9M48nAahft/uLGyE8YwSLDEjirPAwGx1Z3g2TeO9OPfXOdVtJNh0b+XCDVeVVrv6pjPqHmh8vw2Qpj3OlpzeuEmEAu1UQ7bgsBPI4LiwbJGQ+9+gvjqUgRP/qem5YkR8D5WDDEU3x+blHNkZFGjDC4+1BxSZSb0/fSDju2nThf8trk7OJDu+DgYg7XGrl+CEcrWnzMzLkgT5kxxDA8fQSGlY0yyvOk79Nb/qCZIxoke+d3OrFNMVGauNNFOEaUZkdRCNiicyPUvaAmgYRa0F3r45RAR5HEOkRfhzY+zoIOy1E2J1eA2RTxBJIOQAaFmeFDCkUzXWALqcvr1ZfX2Us9HcnrzdDudYEDsCrqzAGDjjoyDrw9Q7rRfy/FqFle3s0/3zx7ybyeJvsmdEB5aOHllJH2fGlnZY0B+Ya3T9OP86nF4m0qcoIk2Yku8Tzg7JuYIT4aw74r5IMq+lkXNiZ3ddJSosg7b51enAPX/MJM4mpCZ+dPBJM3hmbDlU2sycRFRhz MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: fa8b8743-1291-43e5-767b-08d43edb93e2 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BY2PR0301MB0742; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 3:PWbV2TzuUPE/tI7ifPRrTXMVR2Zltlr4jpuHgs0LgiIPL3PfZn02aSIz4vIaSUrCIxm2hcLszFZ3O+g4nwor4HHf1tt3gjDR+oJxVT1Cso0I/RFbi86GETvzcIOy5e0j+kQFmUVspvhsC9oxT94pjwURRc137NNlQbXfBR4cIe7rB7PmadPWE6EeQT2Ra/FQMpe0LM23pY5ZKyp37sNM7loTkMfrwuG7/IrMDZTohwdX3xh+zUeOVVJs7JJ1fH0Pxkwg9CB5a2a1FnEQXI4pEdYvgtDH/Al/IuVOSqMvxDvyHE75nqByUcV4o/pL6b/iY2r+TYMZCqNj42/lIWqiFAwCfP/FxkguteQjIpU0jgKGIeCEFT58ltZ7FR9nSaiD; 25:9FwXaaSWR9tQx2yq8yud2EEnouqWZUwdtNr+BO+XCC9DzUskKU4wK0qLmfiBu7VLXlRr4/IKHZ45u82GyLSkLVtqMEwSVE+5A/PA4rx0nyr1hKAo1IHppBGaZ4w95SN6+Ozhu0cVTDZ2yKeEe1GUzOAIOh9RoU/3jgH6u3UjiIHTl8v9/AkNr8GkznvPAbGnzLca2CX5qDgsqYNeqNV+eVP1PEwuQj0gb7F2IIYuGDi/uAwwmfRdMluK4+ndOWgakONpuTqQHMZU7lYTF3hLD2yB9fCqBssqPsSefxobf3ZrKi19zlYHc5PBHl58GMZ3WBUqhuCJe7lMWzthl292tCP77ecm/CfCV/AIUlE+2u4he299zSPY8EiRWMexUe26xdPSW8kdk3dyMkl4iJNFKAvd3Q5UFBGmPZOSCV9OlIKewAu/UiBwcONyG+JBYL0N+VOZKWYGgddOThYeDpenlw== X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 31:EuUCTOUYrpfr+Vr6WMxDpLyiv8pHN/uS0YA4OdvoMtzmnUVevehPoVjMODNnNcan/7gQvxfAsu3Rkmd7iXkqQmnC6qgnVXAsHrBEMLnQ6wXXOp8lnGzkNU9AuLB378zpBE1/njDRNqtVkC8hwiivDSbZxLu3ZRkLP50VSxLMrNsVuNJRrf/mV9IEfU2ggPqJ1MgSgeoZrNRBv5wmVdYweLBkSj6yqpQNdRLZiXAVA705s4obYtlJD8RSyaghwXkHxFslSeZ1aDZlFhSi5B+UrQ== 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:BY2PR0301MB0742; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR0301MB0742; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 4:bSGNHtCzbu8rNCi0XUNkFbFPgOwAOFIUwYBnksvLBcXLWW1Wm4/BXFIjWRRgp8L1aB3PYOUQt7rjOyM0EHodS4xwCG9U98euM1rLkqLrTWP8dUwLXiZqVL8N3cW3zIc+OQBobmmobfj7LrKFaBPhXApv1ugk0FGCViL+4g4S9WfG1rz0V/ZlnaMI7J+cZOy9wY4eIR38t4w+N8ZYIWehc6GokO9SKkZQe5ACNO6ztwxJa1HN16nmJluxfH3aN6twkgygAY8z5KFB2BQcW50ToBHkT8TGrzFBPENvrrHlw3YHGjVjpuxbgaYN8wYa7SbreUPvR+uXedVABasW/Q8HtIG4mkx6gvtOiQ6TksMu6qNY90hJ0hos0ZdpiH99ksGuuqC7b06NbFfqQha/C6ODtyHnoncKmqgjWn1wKWNJNCUS47EqydEo98YKP13cTTKWlW0yYRexaEV9P4hJOse6faSuEVa3RYn7gdrjLelr9cu3zkC/lBO1gL0x0gxfdPvb3fbID4FRst7hiXYVpRfQcb+ek39g7sHn/3ZtfnhC9YwsiLcABvwvoGyuh3Ga0Z7cJXp1w2FQizaoyduY+CSCHBDoNT8LwCO2IBbI0NvWZqdRoiToaeSe1t84N2spWuFZoSU2ith7rl3M2O4Q0+2D2QWDC5/tZeVjAk4heaKXit53CeS0f5aBE/S4n1gf4o4lVL/0P4N105sa0IL5NgDqVRO427FRMYbreBbKUt+E3E4goVZjHWFWqod6Ftulhr/KprhPtnvdBW1U3q1URheFHQ== X-Forefront-PRVS: 01901B3451 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB0742; 23:Ps8o1Vhkb4Y19FtNRpOJePfQ8E+I3YNxxZcKzQt?= kMJjQ4ihCngZuJXBEbMd7Yuzw5pOz6Qlui9k/LtUBQRbIwxpmscBykazOE3B8TnW+DM8i+ahDcDD8h1pIKHvJ054bYvaNWrBf42m+Oujk+G5PICNhm3c9lcEkhZnAmfrUgLYKMQPoaFHOjvYfmVdYSR5XGZeEl1/wydqm3jhUaVr6pWaxsDWsQ9PM5ZzgcjcjAw6q8QVBywR1axOGD5lKG4AhVkKsk6EuNyZujRv5swlEalBv1EXyTEotYLfkF+GbvUKOGj0T604muW1F1ZS9nGPBt+ZQCvQwgsJmkLoNQg9T0CP9Wa7xde5JPPvYDabh6/j2lo+3mNhmqA/LgZng5oVeOnKY+KCsqlx++F3HN6Ixq17QI5NS51BOJChCIPEjOkYLZXuaQ7Bw0+mPiwRZdH3xjtsmezuit+MwsaRAr2Uh2cTpwF+JBT29P30OOOmTDLOetvWiDoEMLHHQCOdchRfcI0s8pwR5Ul5PHa9vNE0ed5MBwHPQUehNDDW74zNlzCGY4xkcGZT7c+QYbjRq7vxdlxfrrspCnQcMGJteeZs3+pdsndzRUK0hX+nx6nONC3FjVZ/yzesX80AuWk7f0k+1Mzpq0eCk0eYqK8ZxvqT1Wv4sdTvk8F5iBjkPRuubsRmkZ3dG2/YlQlv3tjemY2y0nQ/AQSmi3ImHGKUrMzjI014ze3MQNIBbUDMaFUVUFLeLRcDbQsHyYx83UgoPu+c1zCaDd84PJQJbHGlOpEkJY39vSlH6Y53xUMzsqu0CSNXVuxFlQtVEj4NwDuJ/PrTXVc5zIFxxzYmOaSum+hF8AsKaaiyffUf6GC2e2BVilm4AXKqTeEk9ZywdVIADYM6VIHjskNnBIz7goaf1C3J4UJM02i7ZWPDJSaOhfBsvL+n0hj+4nKZpZe5mJhziSKhM6z0zyRIj0Sr3hlpixLwvksTW7w8pze0RiCx78v6YqaXYMw8Kga89vqAkcXoy/AcP9gGOxfMoEtt+9+pWMB4SCKcYSymf/PaCEfqZYr0tgJoQsmajBJT1+8Fe9PUowHZpDs6G2YDEwGJz2RXvzJcdGlLPWktLjbbBEupJn+55VQ2JVu3I3QG9Rv+TGh3eYDmSC1XL9aDwirFbhpOEM9ns586jx/tlBVQ6GAn6uS1nWFSQ/cW3huNBCxaEzxjYnQrjEes6SWf8tGO9kngd5LxJqXjFw92orOF1hSpik2ycT1SA2UFX07U86pDiGco6x1gxgGOH262CLpBTPEPGwSt+lg== X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 6:nBf1WbKnTapYCd6fz7Ek97LSW4mEbN/RWSS5EBcQIzUFHQ25OoAAT2ESGZReHZ5ABYjPlojEw7TyLnQ9dtdZv8Re5lYjKaSW1pt8DGuFkVBRWZEH9WGEJkosxoim0KJ1twgljaSQhJ4JA59CFVnDAJ9z3hZ/0cc9O0twXpAD00OQVf/Kgrl2HASBCXrJk7cIgYXnzQlDF2/v+dLS9Z37y2hkLAVGoueKO7l4H5Yv7F7UwOfV/Dlyafv4yClU5SjgYmJbj4nMOjgmcA4yz6z2NyfTxeo+NGE6FS8kIkKerICqJxW78xvsRn+TvKyNBU2/Fsdk1QpWIVSewuBo+s2kmpRI4Oqsy6YW5EYUmnxV+TneMQFndyNntUKC0afvTocv2M2OVhxxgO01JAIvgKUbGbqA6GaE6q/+UNampZ0kcJIbvzC0uUXPCRy3h8uia79B; 5:0a2OvEzUlYTvKN75RNfPJ8AKojoPZyqEh8UYFA3QIuGWEDjYeEobYWZdgzb/iesWYKez0AbZ83CM6TUDwDcnMRfj9y5CmAWQqYqjRemL3EZM96XESBBfoV7cacJdBtdFDaRhhnH4FpYmaYWZDEuUd4ccZuGktRMzSXrYr1Rc1eA83gMnNbSs/pwaJOimVkJP; 24:8N8M49mMZ7k9oxl+XQWNHI6p7QNXYi1889Rw4MNf6Tge4KNITYxYfJY7RyW5WEKq0HqD+nlR7i806LQY3MYOtgPhA9KZ5t6mMq25Mn2bDfU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 7:HyHEuRalsZTHNTnYGH00ZTk9U2ufwZPU9VO7HrTSVyXxcZcgstz/cMaykNsJc8kEIV2t4cgOhjNUCAw5WVmxdce22uC4GaSPDkhpDOCRxlyYQHIKC9HKvFV4h73xXC3t/hBr7NVUyyYUTNnCTgnjYHycaQQDD96ZZf0jLl1XIhoM1JbdQejPz5arAnMnQ7oZuvKqegBm9l6DxJpvXCMnYbrZUy0y9QVfWf4LBSUFjNZmDu9i14XJF/5VxExKrY77s9xTT//BSXa1/3j2E7Vlc9eK/NKkEQJSZrTBAG12U5qOq+hB6cgF9mmnqjXvgrY77DNFRyL8Bgp8t91OqrFmBHnDL1q04LsTrI8VTH1pDhlFu30by0+L1fSqkjt45zDMcwpzxBeSwLAQLkmOFK3DFYNsOx15EukAEjbYHQn4X8mLpet0en4yk7IJ3tvQeGP5bfO42dGLoLbJMQbh9GVBdg== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2017 13:20:13.5984 (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: BY2PR0301MB0742 Subject: [dpdk-dev] [PATCHv4 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 3b846a0..660537d 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" /* Name of the DPAA2 Net PMD */ static const char *drivername = "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 = 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 = drivername; 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 */