From patchwork Thu Jan 19 13:23:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 19806 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 C2C01FA84; Thu, 19 Jan 2017 14:26:04 +0100 (CET) Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0066.outbound.protection.outlook.com [104.47.33.66]) by dpdk.org (Postfix) with ESMTP id 505E7F97F for ; Thu, 19 Jan 2017 14:25:24 +0100 (CET) Received: from BN6PR03CA0009.namprd03.prod.outlook.com (10.168.230.147) by BY2PR0301MB0744.namprd03.prod.outlook.com (10.160.63.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12; Thu, 19 Jan 2017 13:25:20 +0000 Received: from BN1BFFO11FD047.protection.gbl (2a01:111:f400:7c10::1:136) by BN6PR03CA0009.outlook.office365.com (2603:10b6:404:23::19) 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; Thu, 19 Jan 2017 13:25:19 +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 BN1BFFO11FD047.mail.protection.outlook.com (10.58.145.2) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.803.8 via Frontend Transport; Thu, 19 Jan 2017 13:25:14 +0000 Received: from bf-netperf1.idc ([10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v0JDO4eu015351; Thu, 19 Jan 2017 06:25:11 -0700 From: Hemant Agrawal To: CC: , , , , , , Hemant Agrawal Date: Thu, 19 Jan 2017 18:53:45 +0530 Message-ID: <1484832240-2048-21-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1484832240-2048-1-git-send-email-hemant.agrawal@nxp.com> References: <1484679174-4174-1-git-send-email-hemant.agrawal@nxp.com> <1484832240-2048-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131293059177660887; (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)(7916002)(39840400002)(39860400002)(39400400002)(39380400002)(39850400002)(39450400003)(39410400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(81156014)(8676002)(81166006)(50986999)(76176999)(50226002)(8936002)(104016004)(77096006)(2906002)(86362001)(4326007)(50466002)(2351001)(189998001)(92566002)(48376002)(38730400001)(68736007)(110136003)(8656002)(54906002)(626004)(53936002)(6666003)(85426001)(33646002)(2950100002)(47776003)(106466001)(305945005)(6916009)(36756003)(5660300001)(97736004)(5003940100001)(105606002)(356003); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB0744; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD047; 1:VH28aIn+cfeOcHxkKzPUkE168iJ7ZHmJdbdx08XD+WRsOLILLIxMvdHwJwlUasJ1LzNwILSqKVCtBBXI4MKE+etacSrOCGn8eVzIm4ikqhFjy4U9SMIlXzyplff3pRvUQUQ330mkw/gacf7L8J106NlgeyH97gPgMNdWL2NsIlFhgRBmhK2NryC4jEJYr7GToT1zQBPA7tiFC/UpRhZW+Vs9L4j78mjO2kCLOJAvPjiYpF4aO+m41mf/iIu9VLSnF2sRmuFVT00zt3N5U94BpZ8Y9duS5khXrzZE0EU0BaQ7NznyyrNusBlWnM6e230Mg/qYJ0mKniQlltxvgbBUNINk0X3zwSov1wEGq3FDqnF45QoCluc1/a9rp1arcCEpjZ4PXVnS4mITr4wqAXg79bUHGG5okQfUB3k2VbM6QvwswPrq7jiLATijRXSDs4G8OUzTDc/1RsEXR3twYz8Z2ClcE2A26bqwGdY6xhybDmLXqGzcY/7XWwg3KQH+LrQUyO7/Rctb90BjZu1PjTJOnBo+EGnn6U0Gc68xJTCWIxFS9xf6208EeQAc9VlbYd0n/b9+nIKApDelWfm4CPeGpwHCK8FE4bYL6uct79b9cl13mbDIQZ1RolTVYo7gd6g/AwuvTkr1swxwGVoAcfFunjlPPKQGfkIUG1BXfFDGk7J+LI4xJgC2HTnPH1Wxhu4u1P80DUjF112Fb3V5xD+iJl3dSvmXiL9lhrAc7IcH/QuD0l+R9wuye7NoV2JgntJg MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: f5ad7c4f-1113-4ae0-e07d-08d4406e9c36 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BY2PR0301MB0744; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0744; 3:UKAUNj7djgI5pRLcgYuyjKilg/AOCyXUxsm+iiF7GuejVT+Qan1pxQYxDx7gvj44HwSisBVPvomFjWFo7k/ILPtha2URuxed2jEjwMuBXl2jaPeIwHAOh1xcUdxGFCOCuoiATt6iKv4cRe0x+iLFnPGtHYxrXyzSNps+n9mAlB/Md3Vht0peYPZNMl3CrjCtNHb3Ev69zfCMnFw/++8GdeBWSC7l0SXBnfnynEdmB2eksq99h7hiWZbW4Fg0m+zvl5vBra9SFOEC4pS3xkTOE9dsoIDuRkaM8dRsxYLGcVqZ0+EYtgTXTVS7KdXG61pMT4SAFIjb0IfgQoYWVIld24XOc4tDmh1ejBOyz+f78mweszO1bgIjly8qHRWpBRaP X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0744; 25:G4LUo88+M+GIr1QTVfmedZ8q6r806/shwfSLVA8r/vW8h1c5sCGpQ3VfrIzB6d4P54w+uIb2Baw1IIaBg2G6fyb1GxN9/D0BTb7I836fdW7i/R6AAQ48Y4Ct9BQ0U6S4kcSqB18eNTmFB2Lq11tYJSexUN2rcHdg2w2XkP2xFAkj341n6PNIy4YyNtcNIc5vq9be7aRpZmyMCsAMlO179EQI1Dgq/uOeEYBZPsz6Gq+Im+UiqfBt83JqCNv9YSMbzu5h0i9+Jp48BlVlkY8f9ZPHxaJVrEX046DvUw3DTF9pNCH6mY2oWFcm1f0kqvze1U+Ns2haNIzjGBDQdX1tYjb58gabkYW729UywiXqddwk8nEjrq6h595NZcvDxq83rrQ+776z3nalIsJQxrTIovFXhRzBDHfylZOgINWTG4sueyyC3cPj4PnwbjgGAA1bNw3tzlxm4ekRNDYB8jl91jogbx7dsRDazRzjPMuNV8MViBhk9p1nDnZw59oJAFKgixsF9DrAqpabZcvu7zz5f+JfQoglRsMIkzb0+QV6UT9r6gBDAyy/r7zkPa6mjtTupqJsGXItdWQa8FKqVmlHDas/EcAS8UNll4UA9pohGxopmdEKINNmw0W7qb/G6qSojGxSFfAwecOiBOY6BYlzLgU43cQmbsangQMnhQyFAVMQPgpN2NgFIaS8gqXjPP8STeK6XCEGWK5b/en1MMJtSjbWnZCKCmFCdt7L2imksinsPrSbUxwlXuOOA77ptFphcnqwV7vtTUlFX1Y1tMgKUCc01b5NR/3aPaN205EujpE= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0744; 31:5Mzl4Kd1+1IO8RVAMBdCRUl2JZgeFHyrRjF10gBGqQSmbx5BOCB7FUWrVavw0XIYWWd+u8EdtyrpaXZkebr/nvKpxrxncvM7O83J5nvTquSY+h96GIGa3+a0MVd5KglbduOKst4U3obwxig5XIAxQm14hcXMkNbuR0YYLu0zN0A8sw8hnjLTxRC10GOldAnYqDHZpShB48aYeW6DdagjUTCdmM+An37yIAwNDfOTXIsXdLcnPmtlYvueGM4vLvdTyT9TIcpRHzQ0/f7LVO2QkLfR64EONK8+qCCpR35/khk= 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:BY2PR0301MB0744; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR0301MB0744; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0744; 4:ObOhJqhiV9zaH3prYAgoi2xgjyz3ikPXXbfH/K+W5k/l+67/XVNWzOozAdU8/x3CyqsGrvHa15js39fpXpRp+IZ88Z5zvpfVTqx0tSW4fSU0RhS79gZhlcbWPdliZbRSwQdqcWBq7+8Uik7IWC5kvkb7o3Z2SQVUDhWZD6kVkaFcjxY/p4eWteUVSoAPnXton2TeYcb/S0vhMt+0U2CjmmRXJAmlhNDFLI5BESj3cphC9a5Xix2vJ3SiNP76OniiCpJHnwIKu4vCPPGv1urkU2lSXbR2hpPi66vnz8KApD03Yf7WJYgfLOeGxKd8aG3vewVsdQfZasVSX8GIFZCmXnz9cfwHQs4fbNmNYPThT3mbPqzWmih7vTGRugwi/4rU5P9qiDkWozUvQucCYU42JfSHCynDlf10MROONj5KrmkMCBWdUy9xrVwjgFCVRQDptD8iNz5mqfZf0k/sOO0NhhCt3tWUBlVKcNAT4HpFJ0sIN481uQ9n1WIackiJkpqSquQC7lIO9ENAURg26gP4SuGzJ169psY/ZhKxd6g2SQ9SM1C0Tx9+PvU0BRLT0XU6mTpTwfiRvo87lXUXP1ucX4BNLVN3aKxkCeN3bOFFEbkGOrde4pTaiUyAhsyYoiad+VJnakGCAdQRjVSBfh7EYE8oWpN6rCxKNASH1tPgsTde1+dLWrBHnK9L1wPhAM4wKasljuA6+oC71rCF+kZ/quphVeoS2t6IcNftl1Axe+183V+wazkev0H44pc2hSZob8dQjCIF2D8CVhtEJmOGjQ== X-Forefront-PRVS: 0192E812EC X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB0744; 23:eO/L/0IeY/3eYil+LfyRn8OBBOcPTct/torZybe?= 34pHHhEFLXw3Y65vUMUPvOvXEGOy6rcHLRxykrSFQ+kAyPtS4G0XZmGVZabMscMB2SgWEoDLhmbk0Q6OI2ifJXcYPpIB71zR8Twwq3TqYRGMtVapYKgKjRRYd9GZJLdWjWXag5lyHaU5WtROSEMH+qEDwKsGmVPuidYqj/zUM4ErlX4DOx69YGuKQgHRWRRYuKyvcrXezEYCGJNOaGi5tm77I3KsfUUyPj7s+agM63c7xLxDk5yWOaPShPIRY7iOgIqUSIcCw1owTUvDs0vBbrn8lkmUgmE1U/SuoWZYPtQBVo+NOl5rULThDJv00R59rx441xYY7rxQIJBT4yS90tuoCSGHViZoCcx+iZR6ozjmzGfplqes245dq3xqnMYlhc8rdVfg8FFkpldsySLvZAb38ADz+h+PnbuFzknx2wU31qViulJWh2IaZNO4PHSBOGGP6oVt/0ibh/ME/3+JnBcFOcLsywxMrU/VtJEByqnttgyyqt/oqJD0uBh26gd+AD6DkzHC4SXn7c31M/PHEZ8y0DYvniFTFXygpGlZEWrkW6k2a1haZ3qIbg2rCQAHPa8UZ7v5bdN910Dkr781FFEbHbMZq31cz7JCCA8XThO4NiF4VBU6HeuvXVAkeTWy5apmW3aob+5vB/rCUWrRJ6E5WjoCb13wbs2bjrZCBu+nQAd/BghWcLWWiMGU0afiCy/7QjNTDMHebL5we1DES7gtwYxT1rSJMGyD6jPWKUesm5FVB7utnDKzGY8IHqI0IVv/tDH7M+m2caGQVz77lvobCSGCYYnQV/JQdkeA0WBaZ6pYgBChlH18Z3evPCEwipNZF7lpMnoYGN4MAdhp4SZ4pcNyBz07t88+I8IKV9v0JbZgkdwZs+me99xZpjcMtV8hGZna/uAKgGtJ3J4LPlBzNykLzI0ooQ95+eQypU12DDH0As5w2VHkNfqX28KIoai8PUjFGI/PVQ+gqH9p10PnjbReB3QO55xxwQIgNbZVXAIrsTUtL4WWfpw5OyTMYrKvkZ0HKpjJaGlUG4zyzRfEfbZlmZgvMxDbq4062tsfbEKguHkTai82DeajHKGOih/tkSMjhScxRK3oMhfe7D1AkYv+j8R2ao4KCmwyQty6HM9lkXgrBTiwQBa0njvUMZq6/DbJ6wsBq72ByHXnZiVUHraonVhdU7IwAyFwFgrQn3FPvSbtMYQh4yo8ml0tHHc/HW2aROtxVvsduwR4MXpCXQyLFgdduvd+87ssVKbYJ8XkleFIhDyaJ/ew4VJ8kgJo= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0744; 6:Zlw69iJNcYT4CPYuvC/Rb9Oer804XoYm8d6twtWwbPgAseLtBJhNsgCPosnM38xutgOnc0ZLltNNhs9jpNA7b+LZeU8BQNHOecXcbxJbrJgnrQcfhwul3qHsgUxGJRtvrzIYuE2qX8YgGeUtNLo9bg/lnNO8XL/bfxg7E8U2StcEp/WwzSypEAtZ2lypVcsEJ97v0WbpppKKucoPKB5NWpiMZlTtUznx+2q+NXEFEHv6NkcInxMuxpe6TbMKVRJYUKQSm5hMfcTIuKv5KEv4W7UIIZV0a2kP167b8drSEox4MPvga27EB1I+H7zbDOmZJ4jvXGyj/C98JDEe4DYkhIqvKWwd2PbrSss9zCQ+ld7RE5i4nvy/Tj/807Ge/71I8yStkj9dq5qDXPVPuBGJG9BvLhO+ZUPEFwiOlZjWfCf+ODwPzFcxz1BOGSJsFxnf; 5:ILbyBvZ34EHXxYREMfWgAV6R7/BvpVJ5x2pncFdr9WPs+7DtOQYhtwe/OoKcOtx7JgxYwwv64h7Hk2L7EFwIYlkZOm4RoE0xoWopNvxVHXwRo2bcRfcgVjmL567Lj7e0Tw1iawNAqHeX1w73mjyqnyOih5XqNlAHeFo34kh+CZHNfUdGF1DnF8ml40kGGYra; 24:tnWfBuB8pteXEpn+b9TMmjWEfn3ZI9VGob8xpfDFqnkpM5NAYNN9Euj3xJkT2f8wQ5yL4TkSC0oTwdwjtTv962WlZsKUWO4TH6kdHSXP8kI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0744; 7:tQ3Bhv8bXUb29UVJvhvSvl3IRu0u3UG4z3Oj3/i/XgrraB3uWvAar8gaUJP2n5N5ZPmVJkXBvbqpLDlyWF7Q6ainuYSakZAwpcNnP+S8XFlHTruWp/CMYdSFovFgc6+sQUHc7psTxv5GNS/3hyqyyNmQv96kX8pwY/WUhdMiMjr82hASb5v2YvR1NFOSoiwhyEHcUDpkLK+kXHQWYRR6lsfKpjdls920JiK33MypfniLwXwN2ajfAAgQlRBHf4S6wRAOZzykXf1N9bWRwqQ5goJfAAvBJ1654IFkXP2nFipBl7S7+E/xqwznxOOTcGmArxlCzrhZYjlRF4GgDd5J2Q9+T6lgCf5VNRrbY8UrpGDgdew+BRh7vqaKJjPj4lZRiBMwLv0a6apqvM0t+a5NrPpyLfRE9tGJCC2BAx6WF5f8oXdDyIsHbFRHTbp0eStHj4aQs9KAW0FBkeOkoOWKSQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2017 13:25:14.7554 (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: BY2PR0301MB0744 Subject: [dpdk-dev] [PATCHv5 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 */