From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0087.outbound.protection.outlook.com [104.47.40.87]) by dpdk.org (Postfix) with ESMTP id 054475678 for ; Sun, 4 Dec 2016 13:44:29 +0100 (CET) Received: from DM2PR03CA0029.namprd03.prod.outlook.com (10.141.96.28) by BY2PR0301MB0743.namprd03.prod.outlook.com (10.160.63.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.747.13; Sun, 4 Dec 2016 12:44:28 +0000 Received: from BL2FFO11OLC008.protection.gbl (2a01:111:f400:7c09::113) by DM2PR03CA0029.outlook.office365.com (2a01:111:e400:2428::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.721.10 via Frontend Transport; Sun, 4 Dec 2016 12:44:28 +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 BL2FFO11OLC008.mail.protection.outlook.com (10.173.160.143) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.734.4 via Frontend Transport; Sun, 4 Dec 2016 12:44:27 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:717; Count:10 Received: from bf-netperf1.idc ([10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id uB4ChXbN032240; Sun, 4 Dec 2016 05:44:25 -0700 From: Hemant Agrawal To: CC: , , , Hemant Agrawal Date: Sun, 4 Dec 2016 23:47:15 +0530 Message-ID: <1480875447-23680-21-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1480875447-23680-1-git-send-email-hemant.agrawal@nxp.com> References: <1480875447-23680-1-git-send-email-hemant.agrawal@nxp.com> X-IncomingHeaderCount: 10 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131253290679600438; (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)(2980300002)(1110001)(1109001)(339900001)(336004)(189002)(199003)(85426001)(39450400002)(50986999)(106466001)(81156014)(81166006)(5660300001)(110136003)(36756003)(8676002)(68736007)(2906002)(105606002)(6916009)(2950100002)(76176999)(50226002)(8936002)(4326007)(6666003)(50466002)(7846002)(626004)(8666005)(33646002)(38730400001)(39380400001)(39400400001)(39410400001)(305945005)(356003)(2351001)(48376002)(97736004)(92566002)(189998001)(5003940100001)(47776003)(104016004)(86362001)(77096006)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB0743; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC008; 1:lOvL9Z/N+1p2Gv3wo6Mk3RAkfqOe5Jdu1tnOaM8nK7Wyy+SPyOKFLP5EKphL7jl2NmM59J7AEIdS6UbdQYLavTj2aJIXCmS9NxyT5hAfGNbwNcJB3Xco2c3OSn+be9kezCJ1qlHDLn47PPlwbweido4OR+ChwK5NPfmrGoZg8s8ynWoERPn3vGrj3bfV/JvOE7cf3a2D4o7ToKBFPKF0R//pklFkqu9EsjoS9aUVGDTt4UPf/sCt/x8pXhf2JFBxei+tv454jlQXRErEPAKrczm4Orp4CmzGjXKw9sfdhdmXhpRfRxMfxXSGQka6r23AOpvLLK7ldUSnM3cryTzSMXlL2j4Dwm4Mbrvdvd26QujGD6+lGdnZ2XN3qCUz6SVNlFSqwCTx6BHaANfvCPAHGbKISO6Mv3dmbIFUyZiuq4S6HQfiYNv6Zyxi+UWNgAlRlEICLdF9q5y8aOq8CJldtXSp/BdOIXMQtyrW/3uhjoOho2cRwlJqrHLFSPy56rOEnr09XAqwYQV1nlDGUz+IQYCCtYjPmbVCTTDrvBzZ/ccx8SJa71/rI0FWZw1DPGz2+zXhrDpwBD7ZXZSSWovyQ1lepsLzNE83JufjJEmPSYPSO90ZLkbMGLfSiENXmA36ryu81nxocHHtMLvIBLLuE1KXI22/QHLQHVi+ci5A+rEUYa4M7NtVrTQ4qn2s16Ven/1wjDrlbNJrAs1uuGJXEJ8nrfbj3x+FZPY1jdiyUbiSn7t0TqChgtFp6F1bQRz8ubTpLip3GJ72byJgkW5Bxw== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: fdb1ec08-0c58-48d9-a3d9-08d41c434903 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BY2PR0301MB0743; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0743; 3:3EzxGrV3YxHr4MYbO56ZEndJtZTDmNGNGlFFD02pYO+mcPQJ0l1meJc+dRkNXKaLlyN7dgQU5ywcPe+YUP51nkGkeNRkpRHtkbQee76aEujoPxvGwCfwDve1u6+OlNpM2uPiftTQkAbLwMqB+uy3bLnEVN5rgl3/rXSWhzw4QvxDq7gMezmRA2WoxqBZVdlNXXlZP6f0bPWVkPx4/i5v2yugnpkyZwnedM0GphRZb9y8nEnPuMBxRGRo9+fpdvsIyYg/WsFtEY96vZlMp6/b3WfsX7/xrV/0B2SRbSyDacTP8fqNFqtEbVfRkdgBuc6p2+8U4JLM2eUW9kt1rSBtjQhlTZBJ0mPF/9cAkwABpyKp/CCvq1LiEp/mzPrd/jtp X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0743; 25:TwHs1Qgs+yIrNj4D8RjaHCkZy7nFuvvakh49/v+LIEMVH6yBtcyIkyqBbM45Z06/dzfEWNxX9u5QIZkmiYVv8mBIO8KgkqDUdsI5zwG2q2tA9Jt5/Q3Gsg7pkHgrtf8Gq7nL3AZ6ydGoU1b3bVML0sMjN9s3dmXCvPmpZIoF0BdumcgG7trYgzkxvsyYTrCi1ulpDrfjmlK9naFgKj01n6ujgnxu+H3Doci2WiUopjfvODcyGUY4dzKm5MeeT7skEb+5Kd9h+3BZ2v6AwG9AX/locDjXtADCM7zSI2/mh32ak0qHWqXdEvdnYJMZizHuuAicRryjzxmurEUU4iDcPKWYcg3MeScOxR7RDn1lAICIopMfSkSS/9kd0HZ1NoXb5+lsSA79Ov/YL0lTREgU9Ah4OZqyBJSxLXNDiBVpG6m82iSut/ioOhfyYJqdmfxuHxs7CPhS0DlnPozU1Wlgm87PsjR3dxvt6efLz0ILWtlHwVnOgmECl81yX/kKl1y+T9QohEkFYjo9Oybxs+4sEwjnSyyvh2tM9+7qFiCeRBsNrqjEO6GdYLrz+4+RviIRoyNGKdMWn/GLanCMNeTmQ7mh+osQltMAgfv+pGXPBnEe2/6Yi58IifqvA17Z53zYVEtoMILiDsJTxC1+CyC+XaSzXJ1THiMPYCfFVHunG+LjnT/Wl1kJpGSbJ4ua+vI0V1zdx2gIcU82LwWvG3AeTMxX6BvTfW1yj+truVAMRLYKmk+TqCNMoDfEi1dACRXzierpClUlEQvyOyRGW/CsKlu49gfHQFpsnKkEqPsJq5WDHxJMRFGSygAazU2IeRNY X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0743; 31:HR2asDsCLQjhnm6lqYORcVDTyXUaVzQ4yMFx8GwGIjRLqr1vRkRCIuhVPVSHxgcv/6r9Y6hdWUYKz1skUV3uAXlkuKP3WHbkz4J32fzltLj0fsei+sHbQG9z/C/4zX/GGcCT7qRKfv8Ncg2/E11K+Q50zVys9iKJnjf7TQwT+/KlPEsErut4bHrKqfpYt3tXmuarebqiGIWT/LB4jYeNNlyGOw0vMf3XqI9wn0s57sTOAenIBMtdzh/WsNkyFyhLdstZnTfJ+7DKcjuu7/cWxERfg9GV5sx2Oh32k/rPYgY= 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)(13017025)(13023025)(13015025)(13024025)(13018025)(8121501046)(5005006)(10201501046)(3002001)(6055026)(6096035)(20161123565025)(20161123561025)(20161123559025)(20161123556025)(20161123563025); SRVR:BY2PR0301MB0743; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR0301MB0743; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0743; 4:CNNPsO0AuEjcZoGzT7QRTnEqe01A1FwWvhK0d/OrLT2WP27mDdvbTeJVqj288GcqGRrb6kSVuaH+g69T3J1kULli7JPijUAFYY3JHkh+nF5gxnlkPg9iUxj9QuFr4ikRx9Po+shdm19uhwiul0zIacKc7Vj2MlqyRR3tUFo5p9q6MRFb+ik6F0SuPXYOW2ZGPhw1AKFZHs5/WFzFm4UUH2QX8o/JfYcMRH6C2hCSmdtnruCkGxJadtW26XeJkp3hNYDkT8T+NHa4waZ7NUqauhGbLfvqYy8izVickSBfxsj94fd1b0SBfGveGEmJRaCh0DtFA/8WsmwtkSVn2lwwu2a5OPcMh+L8NWKin9etWGC6G+uz6C2ReanoyJR1xyhvsXU72dfa+c3UzqiB+1+zKoxfSQlYCJNzYV2tSPDHWpv3fDkk2Uzh6uYDdD1SHqnj4YESQYvk1gZB5p7HlwK/iJaWnvgEi/ED//1z4DT42qJrmhVZ8SIjZF64ppWy0oo7FGfiPlZbv+1NGrRLWur0D4AgNRYPQFDxigxNq+h938i5fNvIISydxzDf1uXKXpQd8pe8hkGS4OJnN7BwJYaHPedXcki0jgUxhwD+bwlWa1xLA2mTvET8D1yQ28SMWidOCSeRd+S35EoRav3XeGgMSxsUckBnh8oZx0X5sbdSe8KKHwqEsRi6YUeRpR4MoUm+WZCmOi2VSCP3GQDKTXUKe35H997CJDWDUUxMgDK+ARVyFo4GAH9bd+1Pfk0eRXNI X-Forefront-PRVS: 014617085B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB0743; 23:Od6tqRqZlNeURbWUQS24/hpL225QHQGmAqUBNd8?= =?us-ascii?Q?byktL5ohIi9HyOi8+uCJrh1LPwpphELXQXKUSmQpVn884PM9W8tcP01L4A+E?= =?us-ascii?Q?TGEBTv4IpAgW5sOwDUNom5yG0Oc8Xf7kXBYQF/UA1Mk6sB4yOyjZggAwajhd?= =?us-ascii?Q?XWbQk+i+oOU4BKDCzWie+qsiQZ2CklqpmoZ3zzx/ZVdM+RoUBrBSnQ9O7ciP?= =?us-ascii?Q?2uV/XAoZreUUwMRtvbiZcn05o1RltsMJtD2Nj8bh37+vPlb5p3r1KiBSJvhK?= =?us-ascii?Q?+2oTWoT7iVIAtFFMXjjOLWt8ZkhNzaL3lQ3smVthiymNfgY87FgDQ71WbjqF?= =?us-ascii?Q?ld53VS6BDMbE7Xma++EsEVkRwgH87HlHP52c0g2+I+0fuF/32rlKVl+S/jeL?= =?us-ascii?Q?bdAlRY1ecUJoUUmkps+pQBzqidAQtaFijV9kiHAZHPaXT6W7mreptx2IJ6C9?= =?us-ascii?Q?BM/hfjx0FF09wndaRFIFE6CFYZ/wtqwJJKLwn7kiQhRRvMabq7xlpZv9WsWJ?= =?us-ascii?Q?ECLbja7Zm/jVdKai75b6tV73iRyrq/qFoCr8I0hEYQiVxrSB6xDmfgeAYE8m?= =?us-ascii?Q?4hJz8hr9RL+4LDofQVE2jALagD2eDti2xagq8Gn6ksT3Qo0YOKsiePnETFvS?= =?us-ascii?Q?jM0OdBNOCVNhk11VUowE9P4mSA5po4I/uJksP5YXuDmbR3VMeNgMGPp7YiXp?= =?us-ascii?Q?atlc3N+ZIdAegozPTQySqh+CxuDa7h01uNvrKXRtIamFoW8SMmo3e2whkG8U?= =?us-ascii?Q?RrM0iDCptsfgwYBZ6hkZFeE8tkT3/CF7Ik51CwfgEppS93QW7fLxJsuRUzhW?= =?us-ascii?Q?RBQGxRurutLoG4OUVCRBXhX5lxQ2gAW9ngX1Ka8VwFkU6nI2P7oRMjZqiFRY?= =?us-ascii?Q?f9CR0/1V+r6IFjJroxn4MqtpqPbwKKt02i1RemFmkgBCP71F4wn6VsUWSmP7?= =?us-ascii?Q?gu3cthNBPfX0bMpPpzqbMk9vrZbwG+EsAsO5k7ADBIQwlmDlg1VddhoHT15c?= =?us-ascii?Q?CJgBw27JXdvvKFF++3rnfKV8/0Sd/6JK8FGqg6ppc4AJYoCeN9c0bHood7p1?= =?us-ascii?Q?rcF3WgGRtzDklcNG5kzLC/oyOU/Cq229hlEXkqkLZazZIca97ySopODfTgxl?= =?us-ascii?Q?+rhRAg8D0R5+fV6SDdZ+Kh3q/ajAZqf2DEdTPjI9FbSNaTG+JZ+FbyCkBt5E?= =?us-ascii?Q?6tjhA+PpFIzWPLRKBJ4IWJOO45cqDrGKpUJoq8WgNw0SokV59r1zI7+OLSA?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0743; 6:6WUZwKZ9PNgJR9pE4l8rmP0IAvtUE+Uz3a7pSvkGzltDraHrSJCfmm24QtFuitGbXmphLX1Lmtly97uhz4ZVfhwWUoGDbWWLjv3L5/uDR9byOQfW4ICTRZxlT1LUI7DxnOkvU82pNSXae5XKohDMA4dO6IhMwSvrcrHb11zjVDVAWLM1TMGvlTxd0oBAtFk82x7uKIcP2xl4Il10YgLmoWlJLiRaUSrnXUwSvZWmlvoMlHdoUCANMfq9F/ehYbwtsTl3rDtHQlmNNUJ7q7pdmBKM1Xv5PlIdZKrJOeGm61Bi9r6O88JEeRT2t7GMyqxA90S5zZuByKtyQru+yhbqAG2A9AvQwqinsEY7RJh6fYNX5XoXYljGchEOVGnflzsKZgoezpHmeQqKjeFZgYao+wnbC92IZqWUBDMnlMfwVZIj/MBpvFxOQv01BpIPSmJ4; 5:RgQPOK1OjJP8inmxIEvj9ZeBWbmS3XqBH5yYmvjR021ca88PSwIhp/IkUt4aUNXbSHmnvOOWg1gIzJxKH3FABkUXy299BTxodaOcOGgOa15Tc40PzXlX1zzf5CvAHhErH0dgztD85VwzcA8GThDjv+y3T8mrR/YUw0FuqMUCIfUK8iQPeFU1z+ZtSl8+yua/; 24:0YQRydz7HmAeSeei8Pm7PxnBt7ueOTEV6Ipl/z78eOU4R0Ol2aMDzcZ6HysXA04qIhJ0lgc90SG+ZkmkjTrZyRuLBBrdi/1bH4/UnX2XkiY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0743; 7:5JTaVVCYXG1QNfSEYBqb3JvPeEGXbnfrPtAMdQJrd76p7YQhRqnzmL/PZfOkU8H8kmayG6nfRdschlF4fVy+TnYdi0NA8seVhvUdZ8yYNoiGeNx5XTB7uLlLJrLPg3qKGSbFj8zGWkCmY7wHmxlwlzRx81O1oHxuVrcL/SVKLQbSnGZ+j10UU4Z/YAHn/x9/HPS9np9rBIpvRQMkaIu3yCAetT+I56W+0HvPX8ltqOh40o7Y9O8JzEXBNH15cfYSFdZQCJRo2hoSBIDGWrARwFwnZwzxE1wBvYJbetSg3+c5iO3hNH9n8XJNIVUc5rHmwzya8cbn7g9L9TrnIK9VmKpfvWFk6EUS+Wufw6HmmQeCQCsfFCP9E47sDQtDKLXHV/zHGTiiTMW1/sSC3GNOz94kd4Y1z8Rhvs5y/GWC4RkofBMgQTpaKFm4au4xSWbQmYruwkEE+L5ZX+nELzbAFA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Dec 2016 12:44:27.7728 (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: BY2PR0301MB0743 Subject: [dpdk-dev] [PATCH 20/32] 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: , X-List-Received-Date: Sun, 04 Dec 2016 12:44:30 -0000 Signed-off-by: Hemant Agrawal --- doc/guides/nics/features/dpaa2.ini | 1 + drivers/net/dpaa2/base/dpaa2_hw_dpni.h | 14 +- drivers/net/dpaa2/base/dpaa2_hw_pvt.h | 21 +++ drivers/net/dpaa2/dpaa2_ethdev.c | 254 ++++++++++++++++++++++++++++++++- 4 files changed, 288 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/net/dpaa2/base/dpaa2_hw_dpni.h b/drivers/net/dpaa2/base/dpaa2_hw_dpni.h index 1b655e4..197fd28 100644 --- a/drivers/net/dpaa2/base/dpaa2_hw_dpni.h +++ b/drivers/net/dpaa2/base/dpaa2_hw_dpni.h @@ -36,15 +36,27 @@ #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 + /*! Global MCP list */ extern void *(*mcp_ptr_list); - 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_DPNI_H_ */ diff --git a/drivers/net/dpaa2/base/dpaa2_hw_pvt.h b/drivers/net/dpaa2/base/dpaa2_hw_pvt.h index 5038209..867611f 100644 --- a/drivers/net/dpaa2/base/dpaa2_hw_pvt.h +++ b/drivers/net/dpaa2/base/dpaa2_hw_pvt.h @@ -37,9 +37,12 @@ #include #include +#define DPAA2_DQRR_RING_SIZE 16 + /** #include +#include #include /* DPDK Interfaces */ #include +/* Name of the DPAA2 Net PMD */ +static const char *drivername = "DPNI 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->driver_name = drivername; + 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; +} + +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) { @@ -69,15 +153,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", @@ -85,6 +288,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; } @@ -132,6 +356,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, }; int @@ -140,6 +369,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; @@ -175,8 +405,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; return 0; } -- 1.9.1