From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0073.outbound.protection.outlook.com [104.47.32.73]) by dpdk.org (Postfix) with ESMTP id 473EFF924 for ; Thu, 29 Dec 2016 06:15:18 +0100 (CET) Received: from DM5PR03CA0003.namprd03.prod.outlook.com (10.175.104.13) by BN1PR0301MB0738.namprd03.prod.outlook.com (10.160.78.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.817.10; Thu, 29 Dec 2016 05:15:16 +0000 Received: from BN1BFFO11FD043.protection.gbl (2a01:111:f400:7c10::1:173) by DM5PR03CA0003.outlook.office365.com (2603:10b6:3:118::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.817.10 via Frontend Transport; Thu, 29 Dec 2016 05:15:15 +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 BN1BFFO11FD043.mail.protection.outlook.com (10.58.144.106) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.789.10 via Frontend Transport; Thu, 29 Dec 2016 05:15:15 +0000 Received: from Tophie.ap.freescale.net ([10.232.14.87]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id uBT5DOI0010218; Wed, 28 Dec 2016 22:15:12 -0700 From: Shreyansh Jain To: CC: , , , , , Hemant Agrawal Date: Thu, 29 Dec 2016 10:46:37 +0530 Message-ID: <1482988612-6638-19-git-send-email-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482988612-6638-1-git-send-email-shreyansh.jain@nxp.com> References: <1482180853-18823-1-git-send-email-hemant.agrawal@nxp.com> <1482988612-6638-1-git-send-email-shreyansh.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131274621156963613; (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)(7916002)(336005)(39840400002)(39450400003)(39860400002)(39380400002)(39410400002)(39400400002)(39850400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(77096006)(38730400001)(92566002)(104016004)(36756003)(85426001)(356003)(305945005)(86362001)(575784001)(81156014)(8676002)(81166006)(50226002)(8936002)(50466002)(69596002)(2906002)(48376002)(8656002)(2351001)(110136003)(189998001)(6916009)(50986999)(2950100002)(76176999)(97736004)(5003940100001)(4326007)(33646002)(47776003)(6666003)(626004)(106466001)(105606002)(5660300001)(68736007)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR0301MB0738; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD043; 1:hgRVfBsmZ0p7SxIvoF3/5DI0X3oNLRmipUn3Y9upN1WyJxOmLu2HNqv36IBoJ0vDOHONmL9hu64P9+CImNNyzJeLQIRagM0EzEXjRICoFCVG9kB+g1IlcTYiFj3qvpOU221qpp3UwXzFTequsaR+iGMXeK5gFaJ2dU5XbBN3KI9th1MeKDTEllIdf3zJk3HCgbN60hZ9v4qq7uT/mCd508kOUfABT3DYIgLuRJ7KTme7nnWXxgKUPTT9bHWCgNH7qGQjlmm1TrLj4aEqAGnHxcW5cI9ah7ixKBX/Za68uaoWIDMh13hXcw+o1cxir8Z1lYjqmPfWtasMSriqa0yLWwUFeJ/sXE/KiwNMWEYBIKnGRFirR66KygGY0tkY+rePB8BcxBiwKCU5gLzzhGQD0GqO0tF3iB01NMpBrf2wsJzsO7bRwz3sfE6jE7eQshQ1GLUPSGs+bVQIjnl/lAHyl5z+IiG+jcqHET6v7LepTuhsctwgz3mQPfHfSDatwzYnrfccv180QcE5du4BahIIxF4ieIjLNMiJScqawS35M80aib4replmDgPwt9Y8r1bzogCH119Aa4/mcOnLJIjekawEMNDT0oqDTMnO5XAKR4WLV7dH+MNUKezHU2jRGoRilAIn9lQZhJ6vfFVa3pJLmJXhTh2GKnyEaxI2/MKsxdAceyVZ4TtZoX6oGX6KtaIoe9jKKOI9B4SgqCr2jSqEqU+0gqELVfFPXQfCTIq+GAE94OrYwsqRbcFPjYuybHfvn3l79KdJM88BFim3uJdulQ== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 55202ced-76fd-413b-53bb-08d42fa9ac8a X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BN1PR0301MB0738; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0738; 3:WrP6Mf4Uo90VL4XZrA0oFndR2iVcfgAESLGZSWg1aUFj+9U5Fgvb3e9Zq1G0UcG9IsblO7ExFTjnSCreG15h6FgXL60IbHgiVFm2Mb29P3r5lb3ENC/fMJQGuU/mhhvBhoM6GXl8KXTpyWEWpi0hCCUmU9b4J+5looIfnXWLjR3vFEq2IUoWPkzvZ2RX0YbeKlGlDqmRYeBi77oycLyPszFDepBk8KYszMj/QGmvptLsPJWy6udOkk+PCQWmciiLfc4jbQVM08SF7po3oKaK0IHjH1zAKY1AU2THjSJq3Rw+HdWVvv+e7BZoU4y3CM9OMyoZfbBcZ3dj/UpZHZ1wm5XQ2fwE1PvdgorNEb1jQj4= X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0738; 25:koG8VBVhKHrlQ0NK0o1B9uepU4kbF1/N57cYs1tvCqAO35HGUI0Sis1ZtzYacwFzmyxQNlaPupWLmoks7gbKCzY7YVWB9wxVb1rlKjdO6OsZ2ZG+S7dXbBblMl1X0RUhxtR4msHNR8y+wPZMZQsc/apm0MW5zEED94FAnRfDG5QcjvTxM0NwPzvbMIE6Xa2DcAaA6xojwDb4SnGRm0T6d4XR7Gv0trYZ23X2Gxe1wzrmJUZd+wfzBXub4k4azZi4D6rG5Tldjm951WM46S8nR/PXbovrkuSMChlUWOoQIWenlrRIIHdgAoKtWreQClUE2Q8/mMWIabVlBtUq6iPp61CvKQcMXCaS6hkwG2nUtHHPIuiD1Cru/ke1zMwMRONGmVbrH7OISl52zsJeUPPjaHc0lg6v3RW7JVrHe2E4eBjJaHwBmPZEtoT9v0HUrMzsNOTJC6YmkhNeCIEco+r3FiqB1KHjsy0q9nH9ic07Oy2XYN8KKYouOv843RyQULJjZ38pDlOZissEoS9nEmmjxnFGDwALuLbc9l+JOdvWlh9vLpiqccfkVeaqMJc9b/qMvpt5NEjyMebcimED0ZuHA4sh2rzd/ofYZzAq3izmQtXTojimS9KighXuKGSnQCKNQ2lDxrXLXuE4TEoMLNlphjf79+R4T7thVS60s7XNdTwrYAz96Ie5k1CR80P1jgonAVEWCgA6IMtmClrorteY2YGSaXkcJZPEF9KDsGHHQMb8nL7aUq+nurBsTBX8KM1m2zPvR6sXBB0j5oHQU51VK4i3GtW3xyDt4ro7WM7bpzA= X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0738; 31:GKdJvSAxIDDoeHvopuN+CrEE1ay90wS5Zx3NwLHjuQlsJ+gwJozUKmS5OBPiT6nGlF4Dfa2wSyf2mtuPoQI9UrfI+AOMkvVVwe0qmD5mnuewCLSRq2/2vnexsvvJdUO2z3r3VhSa6nOzYh4kz7d2pg0Oxh1irfbIiMauHyy+k17byc0sJBODUbYskIVpZuAsHIkr+PTB+5DPHJtHW199BQUbcvGKazPU1LWPMmv0abptezA4nbQ7RvulDx4jzg9Mww7DwXngXjvE6KKFMobGp8b9Ay9zrQn/CVO0BAA5dDg= 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)(13024025)(13023025)(13015025)(13017025)(13018025)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6096035)(20161123561025)(20161123559025)(20161123556025)(20161123565025)(20161123563025); SRVR:BN1PR0301MB0738; BCL:0; PCL:0; RULEID:(400006); SRVR:BN1PR0301MB0738; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0738; 4:xnXKycgnLNo7yTGIe1yu9+yx5edi1S9ZOVI0OYYjKB3qUm+qIBPoUlahMRy/AZ/pbQN3Vm7LDS76ZiApWdcV9YhTBPLKwLPSL4feBWQZuKg/ZDxm9ZLEsBK2zBkPyHHj1J4128Dai0O90r/XpID7INPeg598Q4Jc8Cv1DgcJqGtjwZjzfFfD9XHwoxj1pKw72eUQM/J1byqaorvDL0LviN5JGFbFRZIrCPvw3QwNnzkWg73mevFmehiRdeulM9FjAWquhiIE+SllwzzUtYFr2W8nbw8fyjT/MemheIvlbr3PuMjNanMgKokMLYyd0uLP/vOW23iYtfDUYXvbmH6l/jdZo7alQQM/TC+RMb3MZOHy8c+Kg3A84HVe8fzxSjrF0tI20NCUheZTc37V5iWOvKhBFIyJ5z2G8yIfng2q/Dti4ns4ag7XUo8zmB+nLKTCxg+9u96TLQ6Ns7/ABt/uK4vTUSew7bDvBmvg4txgb1XI5Q9yvnOCr5gFU181r/U1bRSkPcr/iEWnSWRirvsmkVkNpT9sAJ3J1pewyyyA/IG0P4FPPKOsCfqAya+XLyDc2eCE1omU1OSYb/r2iwZM52RivJ0+AFFJQ0qU0kEy6TNxGjFZ5Ch+zNII+XJbibRdjpiswW59Fd30a1+e+b1oz3XiknUNJGDcoWufUIVnhNyxkh+LMgAZKyaygzxhHD376tB1OfhavjB4nZhRwN1MO0lIjdc9BWf/8iyUbycPJW5gpRXcGpvlwFTxdsBpL1GgBWKKNE2YeZZONx7DWBRYWg== X-Forefront-PRVS: 01713B2841 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR0301MB0738; 23:ODEYQ1pNURscDqOzMPrwXsCfagRC6zQ1AfZAT7h?= =?us-ascii?Q?4mnTmLQBzj4shUP5HqjoUOTlVasHLATTjkz59CPm5KkxRV8A45MHmreXqneA?= =?us-ascii?Q?OieVTm31QGn6jgsUJfS5Y2yUfnSYc5sX8IMbzQmI2Gs946h8YDjxPhne3Tws?= =?us-ascii?Q?KChyj2zHiznSxTsXsO7w5LljwUTCCg2Z92BkUDkUexI/F4+dOzRTr5y8DZBe?= =?us-ascii?Q?Ao3tLnM2gJwWxmQALl7BFoS9CuQZdOnz17lPt4+ADblwmgdRZbwLOT4IBA77?= =?us-ascii?Q?m7hEjTnA6AFT2MspAwkKQw9bm8LaGjvyLKCjawhQ9TwNx1j4icq5HSbBml2Y?= =?us-ascii?Q?GZHqaxAReBY61q3FHNuDpV9E5evRV/y6nprL1EFkzwaaHKqW4Z+eBPa/DqhT?= =?us-ascii?Q?7VT8/xNKAdt0OTwUfY64p0BAgpJhO5mCDq5AUefiA2fVk9ONsC1Qd62e+7ku?= =?us-ascii?Q?zHxsaG5T/1iaKnXOeFXey2QTfXJ60tevYehE4GNjBMMejeRuBW14Y147hpHt?= =?us-ascii?Q?89jH1S7dj+037YkpvNbGlJ5Kdo67Xs+b+9E0rlqace1DLw+WRT25AIaqMo1O?= =?us-ascii?Q?PYMwmIq/eABz/CJD6zlQzRzLB7b1lxTNhtR0hN9Vb+lz4UTqLe9GUTJ4BYGk?= =?us-ascii?Q?+TF+cx9OtgIsf/B268hnaeJlWXU6xDpD4fdyVt9zVDQHEV6GdqIigLaBNKtz?= =?us-ascii?Q?Av6ZwUqbWbflKOeq6kqTuQ7letUum9usrLoAs4nE0LNevpNXV5IAxxz9U7z9?= =?us-ascii?Q?VH+6Ub5IA1zKOgPVnaBkJOGp0d9NzCzP6CxMy0HxRLYEi1nayfCeKyMah+nq?= =?us-ascii?Q?GOmVpEJS3LjB+yjQXuhveM6kKv0KLBimZ1d6LXRPP3TOQi/yiZUSuqPsTZ1u?= =?us-ascii?Q?4euLKhyKtbDoC0EB7Jzu7t0UL0D68fpVMqkGoWoZsC6DS3+pxh0HrjuR0x9v?= =?us-ascii?Q?ix2dNX+HfvysF09nlC6n7hyHexHfqynSrcbuZ36XO1lDqzbMDQFLP1HjLc6I?= =?us-ascii?Q?rGRV06YxLdCxzd9csMYZhxj5aMYlSmSwh4Q1jPI4gwxU1n3704f5A3g0O2ky?= =?us-ascii?Q?INgCQ+EGAui38uSw+Bq6HjUXKXu6a9o94+oYRuPB7l22o1medPzeqaUQVgNN?= =?us-ascii?Q?BUp2nXOknFJlc0xeZvjFjI4yjm7DPKQjVQWxVo+yxWZWISEhtjD68V116F4Z?= =?us-ascii?Q?cROvOXp0jPGOyIIfrrbxIkuLG/GkWrO1QYn6zOmQJnchiyBRYtzYm79aXbIk?= =?us-ascii?Q?GcGl/G8aoMGZdvMKPzkESLeq6aHAReyaYAvDZklPrzJu8bHAbUppEVmeFaBw?= =?us-ascii?Q?LXLu4KYvQMeE1LrbP6H+i/5XSksTI/csfFC3lnZObs10V?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0738; 6:6EZh2Z0y41TsiPiceiuijU/+/Qk35KEMKq0Sha3s1l8V/l8LQYzrcr1cL0i+lT65mXbCWp14+ZVeSgAJuhKTPDoxC+TdSoNWIKQE+5KlDuMajsY47rx1ckRlaYXp3/40Y6G6kfbdtfUn67iRc9WPhPWkmqM8ScKHJTKyreQkCzN+GbnozhudWfbJtmwc4Mv/+Aiz+h1wFoCodF6XXME9VTbE+wb/Xc6tcNw3SQ8gY2j/QlyyYv4gSzX86Gmc4j3wwTZhVPR3M/yVYton+MGZ+Px8hsz0PHXjwlauLNxeHc7ZYi3lOIJFp1Bw/8xIKypHqZUDH2kKxdEUbk3/bBteircw4Req/ikC5zV7LjDSHu/BrdvwzANYtOINQw5RhAPGDqtZ6SHvdSq1331q+vCjvLBhC8gZBoPvyNXd2HnGVnxsjiayy4hNwxId35rH2coY; 5:eMTdsBzjiexTx/932o0iR8VAgVnLVAM/xgGdpoTYtEvlNU0y5q5qpPDANc2btpEVktjrIMlfcanTH8ZWbNTu4qBOuGnteXPKevrxB23UIXhtN687pDvmIVRATrgy/64FU4G+ETL8rUZeAu7rAV5QSSN6IoVqblb8EkVq/z/EBplebdYwvfcUTGvMruv4/Kb8; 24:5nkWm58QoZKojOV3VZrgP4xoSNr1ydG6u46iKe//4to48pMiPRYo+zDzHwGJ/EyQQXJN5BS2lLH8hReqEsWyoBggvL9HS4lbI5yrpT/Jj8Y= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0738; 7:PRVLuhsNz4AMoo7Ujfb+k7mtEatAKM72lGtH6hamLgXK7KLhtQBXBLcBeRb5xnZ8IpOAFYdYk4EtmAGj6452K/gP8N84YzF2uAJfQLjnlg29m7J1VM7Izc/GdQPue0Ee6bZyMAUboRtcper0Qkg5m7Y1tB5GymH73QFPLtp4bUyEx2iwU2MGL4Bw/zTSNca2r0prA+QaGIr8b51cj3thEVwg3dNgUPRG7w533okYzwMMZ5/4fDFzFmR57PHyWwr+7f6yn+agWisghDPF7ycwhyeA7HV4Bqxl+sxUwvkkyF9TJaWhR+yaVOPQlMCZS1NWTGFclHjYxJk4XjLXwb3sZxHz6NXJuP3sNdlqVbD2EYZypc7lFvdC/BpwqcvVkVuh0OgJV3S3caxQbBnPDH2Ri6S3CwULm9r3YMg9++LZVI7z/rTOx4JLsuq1Gf58WXJT383hphwu8kyWm9MsxKicuQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Dec 2016 05:15:15.4467 (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: BN1PR0301MB0738 Subject: [dpdk-dev] [PATCH v3 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: , X-List-Received-Date: Thu, 29 Dec 2016 05:15:19 -0000 From: Hemant Agrawal 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 */ -- 2.7.4