From patchwork Fri Jul 1 02:20:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 113588 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D25C6A0093; Fri, 1 Jul 2022 04:21:47 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F386842B7E; Fri, 1 Jul 2022 04:21:18 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2120.outbound.protection.outlook.com [40.107.243.120]) by mails.dpdk.org (Postfix) with ESMTP id D660B42B75 for ; Fri, 1 Jul 2022 04:21:17 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TjsS139DYVERiwhwGKnH8YL/aBgtlOjdRu2Y1GoJADOP+fb4t/8la7atxTJ6G3fpxucaEbzv9m/oKVs4vQ+Whdx6T0t4UMPgZ45/HM48O51w+cSnBrhQwc9cFmkMzTOBJYxu44G46NsHNAcE/9JQXeVh3Vb5n4iua5BDPLkSHI8Srh3wDTK3up0rxQaL540FyxnwBgno0PXMejun/yugXdz9+R4m4nzQdgOPouqBNcYLTHZG8hW7nlmNXBl1t3qvxbOOuiTjS5w9r1c4LXHJo2HdUedEBQn2Pd6damRAyjtTSL4Y5qG5tCq9BSd5qie4/sxid0ffqdLVKN1oMgS7UA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=cpnvv2m5wSiwn8P7s//J2yovHkcAe3eJDmqoCFV/paE=; b=CFXY+86BcvDHRCPa/YjI+GasAiscRsbFtSRK2EAv6v4auQtIEdeXtH9UHBGIqri7m6tehPZG42xwO9H+1ldvX1qORairasf/cbNo7FNs49F4U69Qqv+l4zVj7gwIE6UDUVMf+B4LFhjzisAhC63sOIfwQIVmJ6s8OBLCL0N7FescPTilF7cva7hEgXQbAYiVHC4bVR5Y8D97ZXsABYzEVXPa2pNq6Y43bwGYRYCHLzqX/aiKfzHjYzriMncfyqt1zaG5gWxinjoSOs8WZtvG28pM0+8ZRcAgWyRC2IARY4W2G02czXS6rJMjPjOiabrur04Rptc0H2QrmqgZYYRI+Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cpnvv2m5wSiwn8P7s//J2yovHkcAe3eJDmqoCFV/paE=; b=g1CugFWhHFsvr5s9XO84Sutw7jpMIFadO1luSvt+NTvu1hEXB8CqmqEPkKXH9eIilhTsWnHKxBQxYmxynoDAwsLKxWVEiJxMzZRDoyIpPTrrE4sD5t8Go+9rS078gVELn34lNqrhdEMAVLKHdQQukCEV8LphS3A+16cfCgC3MXo= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by DM6PR13MB2379.namprd13.prod.outlook.com (2603:10b6:5:bf::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.8; Fri, 1 Jul 2022 02:21:16 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::5d9e:9ce5:51d1:2021]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::5d9e:9ce5:51d1:2021%9]) with mapi id 15.20.5395.014; Fri, 1 Jul 2022 02:21:16 +0000 From: Chaoyong He To: dev@dpdk.org Cc: niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v4 06/12] net/nfp: add flower PF related routines Date: Fri, 1 Jul 2022 10:20:11 +0800 Message-Id: <1656642017-8992-7-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1656642017-8992-1-git-send-email-chaoyong.he@corigine.com> References: <1656642017-8992-1-git-send-email-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR02CA0079.apcprd02.prod.outlook.com (2603:1096:4:90::19) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d3899376-a5a9-4379-259a-08da5b086041 X-MS-TrafficTypeDiagnostic: DM6PR13MB2379:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zqRxiZ40T3GPFa7f9N52ViEjtM9R7IvtcIeKXfg5jJrJjfohbq0ERZBJ+K4sQgMUghlA0DnNu18xuZBRmbnE/CbZMSCytSKDY41KFAlCzHo1N3KOvXhXlGpDajAZ3F4ucL5VMIYRldNwpY6Naa0CAwFujs93NDbYJD9FCadkEOMa88fJsa4asUTy8kkp54hPt7gEHPjZWZas4eyzKdUzzrrKeA/ZapY97QFFTaCBpmqLkxd2wiLlTbJjESd1vCg34DzpZOOdH979Nx47qJAaL8wm6Lpr0hVGA4vcv5NOXDTOA9xmivbcR5Qjl2qagFVMrWrXcNCqEvDkWii0Brjh9nOM4UJ3xtmXaKxYZnYnfD96Q8KR1XbgYoIVBUc24y1UFoAnH7P4gk5muEDqt/w45hN7Z3q08dnmteFPBmLjT/WoPxGl3fQqSIWJX6w42Gr8QeRxvv6HexWnzFaiRhdSIsmo8jJUfR9ANaEfiDwMR352x96euDOUcr8637vmFmfyjaI3FxSFLCLYCF/xKEJX3ss1CvlpcONKEmLF3PllGTQFAR5AYN9o7G3w9CtjIRqV5FZiO84NPmlABcJShbH8kkvUIqPxHqWOsfBBECL/E3E6IPDsr1T/+3DGvXk/ktYLV4nh1nvty6tLeKRxJ2KXFrFoY71Rhf2YWcwocwu8+77QBbW37mlMS8tSSh3aKb1u+Z6NVytQuC1RPYwni9a9cjg0zm3XJqwzpYndn2b7CbSEctomABLnmKkZHlZrqTii2FHLMlC6czjypMtDTR4O3hy9Nz4PxRAxOTgtjx7Umnx7AHD592NaP0nImD4lcqBS X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(376002)(396003)(346002)(366004)(136003)(39840400004)(186003)(6486002)(38100700002)(478600001)(66574015)(83380400001)(107886003)(2616005)(38350700002)(4326008)(316002)(6916009)(66946007)(66476007)(5660300002)(6512007)(6506007)(66556008)(26005)(52116002)(44832011)(41300700001)(86362001)(36756003)(8936002)(6666004)(2906002)(8676002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?uj+49ggC8AioKdjDrh2bLfR6WTE1?= =?utf-8?q?4PemJ/KRCfTXDrhnDsBaWenoqgwS0Ps2hC8mdyAWdEWa8LfA+3r3Hm+eKTHMFurVK?= =?utf-8?q?jMTMMoAWGrDcZZpr8zSNN9irEqT72hT9hR5JFJaC1n0HYP81eq8X8ZDLznQXV6mJ1?= =?utf-8?q?ww9L+BgA+DKj4d7MbQdBp2zEMxiGVU/9DfwoGo41HUs7SJwqiCxh/uUXklCX5YQC5?= =?utf-8?q?LDI8TyWaiFtEpuqp55ch4pOkDmjB6a4HwcAfa5zxJw9896IkGAiVFlHAV1cEUKfq/?= =?utf-8?q?Ie6yCCGPEMx0U/1nYu97zZ+z35K8pdWRcJc0iIQADUTuEBBpuhCLqmt3rxYyQ8ZBN?= =?utf-8?q?wruuM6jkiPR9qeDv20u9fUmNOEDPMQB3LLAtMQI5g7XYTEff4bEgNTJnzXetr1nnh?= =?utf-8?q?V0HXtQ6r5f1J8JUH3ZW8qNR3aPhC8AZbLUtPH5F5DSE1mZdNlvif0xi29aE++Ls7v?= =?utf-8?q?gNktv7YwS0UHBM+MACxUuX7sv4J5L9p0YwbQIMU53EaVX0cU7QtJTjE6fz1MxBWb7?= =?utf-8?q?HUZLW4RirtUvSphBYDW1pPgsAmeOittxwe1dUAeHsTpr6kjmwo1mUn+dPLNIIMfPj?= =?utf-8?q?TYrSV/fHK75regdNYrHUuPHF3PNh3x0BUT5PUuUKMFjeTLG4UVP1ltcnnYlpXPnbl?= =?utf-8?q?lkrZ0kG6yunzRZ9LCK9Cw54+TASLqsBs7PhjYAQZLN8dzPEDZoARBcPxYcChPnnC4?= =?utf-8?q?ifh2fM+96jwyT6NaxdSMEzxn9/ORu75ljiAvxXXs0fGivGl+02Qbf2Y3VGDpNa4nj?= =?utf-8?q?v+eFpHgIZBXjdR9e0N0MFUgHeIcy59Kbxr8kgQ/3augPtGlPJ7pvEo4QmaoYR6Q35?= =?utf-8?q?Iyv8lTWMrPwX7ELnonEW7lreOlmsJNs+zVckmeJ8AhNPTVGnYCacXYwgyx6if1ide?= =?utf-8?q?4VOSWwH0oW9tlP1AP/Ux/zWqZls5lXPlfE6XgmMvtLO681qI1U1lIf3L4qDSHlfhA?= =?utf-8?q?1RuAU2LnBYB4dpjHuCV1uBqy2Jp23WYvFuWTJ3W+3sjQ6/INRwH761bbl7uFKZzmi?= =?utf-8?q?3+lwqzvgLXIIJwxAFv3K4t//9+hAOBMSFA/2VmpJyOCxgxQst5JnR7oEGFWOAPfaU?= =?utf-8?q?2iPnEWz8IBGA0P8wsXBs/o7dGMAu5MDnTkk2Hfr+QCRHbKZ56ME9v4/kC6hUCrNoY?= =?utf-8?q?rF10d63q/rYtK77vdmyP91zoGVlwnS0KebHmcyIwLSa9osbgMbaUsokNUjr+xl+2z?= =?utf-8?q?2hAwgIfZGt3lV+3jwY0PdNxi80gzx6xrA2RbbG84a8+mTD0Vj+5tmT6z1lLTE3lN0?= =?utf-8?q?+jkZuM+4P/iwgzrO7dJxUR/Fv69yL172Fa9CozAtz8zwUe3/i7nPXqUhLDn2w9evZ?= =?utf-8?q?nK8D3N5dQtCTlVoWprgQ4A2Vt61N3zEUoC9Oqtfb4Sc+eYVgNyfqaApBWNj5piWt0?= =?utf-8?q?dQLYVsOjYWdrWkVmL1M8Sa2pD/ReDQkmRp9qvAeplgX/Wie07a7UroW8nf7AUVKK5?= =?utf-8?q?3oIL5nDYYgMOWjlw7d5dEn+GHG4FwF3SALzRebzBkZeefaWmRdpqlSsY998975Vfz?= =?utf-8?q?FcaJ+JFeIPzJLn6uJX8iebVS63MTKddyzA=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: d3899376-a5a9-4379-259a-08da5b086041 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2022 02:21:16.1750 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: LZkCjL2L6O/doMJVLDDbVkPpkiUZ8hjfohVP7A8wz/AQgvALBrExT3gX/hsx7qaBybccb1jMfk0Q6jVpq0VEMqhkQ3+CYYp3fXnpx9sz9pE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB2379 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org This commit adds the start/stop/close routine of the flower PF vNIC. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/flower/nfp_flower.c | 193 ++++++++++++++++++++++++++++++++++++ 1 file changed, 193 insertions(+) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index 0a0b1db..417155e 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include @@ -37,11 +38,178 @@ return 0; } +static int +nfp_flower_pf_start(struct rte_eth_dev *dev) +{ + int ret; + uint32_t new_ctrl; + uint32_t update = 0; + struct nfp_net_hw *hw; + + hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + + /* Disabling queues just in case... */ + nfp_net_disable_queues(dev); + + /* Enabling the required queues in the device */ + nfp_net_enable_queues(dev); + + new_ctrl = nfp_check_offloads(dev); + + /* Writing configuration parameters in the device */ + nfp_net_params_setup(hw); + + nfp_net_rss_config_default(dev); + update |= NFP_NET_CFG_UPDATE_RSS; + + if (hw->cap & NFP_NET_CFG_CTRL_RSS2) + new_ctrl |= NFP_NET_CFG_CTRL_RSS2; + else + new_ctrl |= NFP_NET_CFG_CTRL_RSS; + + /* Enable device */ + new_ctrl |= NFP_NET_CFG_CTRL_ENABLE; + + update |= NFP_NET_CFG_UPDATE_GEN | NFP_NET_CFG_UPDATE_RING; + + if (hw->cap & NFP_NET_CFG_CTRL_RINGCFG) + new_ctrl |= NFP_NET_CFG_CTRL_RINGCFG; + + nn_cfg_writel(hw, NFP_NET_CFG_CTRL, new_ctrl); + + /* If an error when reconfig we avoid to change hw state */ + ret = nfp_net_reconfig(hw, new_ctrl, update); + if (ret) { + PMD_INIT_LOG(ERR, "Failed to reconfig PF vnic"); + return -EIO; + } + + hw->ctrl = new_ctrl; + + /* Setup the freelist ring */ + ret = nfp_net_rx_freelist_setup(dev); + if (ret) { + PMD_INIT_LOG(ERR, "Error with flower PF vNIC freelist setup"); + return -EIO; + } + + return 0; +} + +/* Stop device: disable rx and tx functions to allow for reconfiguring. */ +static int +nfp_flower_pf_stop(struct rte_eth_dev *dev) +{ + uint16_t i; + struct nfp_net_hw *hw; + struct nfp_net_txq *this_tx_q; + struct nfp_net_rxq *this_rx_q; + + hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + + nfp_net_disable_queues(dev); + + /* Clear queues */ + for (i = 0; i < dev->data->nb_tx_queues; i++) { + this_tx_q = (struct nfp_net_txq *)dev->data->tx_queues[i]; + nfp_net_reset_tx_queue(this_tx_q); + } + + for (i = 0; i < dev->data->nb_rx_queues; i++) { + this_rx_q = (struct nfp_net_rxq *)dev->data->rx_queues[i]; + nfp_net_reset_rx_queue(this_rx_q); + } + + if (rte_eal_process_type() == RTE_PROC_PRIMARY) + /* Configure the physical port down */ + nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 0); + else + nfp_eth_set_configured(dev->process_private, hw->nfp_idx, 0); + + return 0; +} + +/* Reset and stop device. The device can not be restarted. */ +static int +nfp_flower_pf_close(struct rte_eth_dev *dev) +{ + uint16_t i; + struct nfp_net_hw *hw; + struct nfp_pf_dev *pf_dev; + struct nfp_net_txq *this_tx_q; + struct nfp_net_rxq *this_rx_q; + struct rte_pci_device *pci_dev; + struct nfp_app_flower *app_flower; + + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return 0; + + pf_dev = NFP_NET_DEV_PRIVATE_TO_PF(dev->data->dev_private); + hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + pci_dev = RTE_ETH_DEV_TO_PCI(dev); + app_flower = NFP_APP_PRIV_TO_APP_FLOWER(pf_dev->app_priv); + + /* + * We assume that the DPDK application is stopping all the + * threads/queues before calling the device close function. + */ + + nfp_net_disable_queues(dev); + + /* Clear queues */ + for (i = 0; i < dev->data->nb_tx_queues; i++) { + this_tx_q = (struct nfp_net_txq *)dev->data->tx_queues[i]; + nfp_net_reset_tx_queue(this_tx_q); + } + + for (i = 0; i < dev->data->nb_rx_queues; i++) { + this_rx_q = (struct nfp_net_rxq *)dev->data->rx_queues[i]; + nfp_net_reset_rx_queue(this_rx_q); + } + + /* Cancel possible impending LSC work here before releasing the port*/ + rte_eal_alarm_cancel(nfp_net_dev_interrupt_delayed_handler, (void *)dev); + + nn_cfg_writeb(hw, NFP_NET_CFG_LSC, 0xff); + + rte_eth_dev_release_port(dev); + + /* Now it is safe to free all PF resources */ + PMD_INIT_LOG(INFO, "Freeing PF resources"); + nfp_cpp_area_free(pf_dev->ctrl_area); + nfp_cpp_area_free(pf_dev->hwqueues_area); + free(pf_dev->hwinfo); + free(pf_dev->sym_tbl); + nfp_cpp_free(pf_dev->cpp); + rte_free(app_flower); + rte_free(pf_dev); + + rte_intr_disable(pci_dev->intr_handle); + + /* unregister callback func from eal lib */ + rte_intr_callback_unregister(pci_dev->intr_handle, + nfp_net_dev_interrupt_handler, (void *)dev); + + return 0; +} + +static int +nfp_flower_pf_link_update(__rte_unused struct rte_eth_dev *dev, + __rte_unused int wait_to_complete) +{ + return 0; +} + static const struct eth_dev_ops nfp_flower_pf_dev_ops = { .dev_configure = nfp_flower_pf_configure, /* Use the normal dev_infos_get functionality in the NFP PMD */ .dev_infos_get = nfp_net_infos_get, + + .dev_start = nfp_flower_pf_start, + .dev_stop = nfp_flower_pf_stop, + .dev_close = nfp_flower_pf_close, + .link_update = nfp_flower_pf_link_update, }; static struct rte_service_spec flower_services[NFP_FLOWER_SERVICE_MAX] = { @@ -381,6 +549,24 @@ return ret; } +static int +nfp_flower_start_pf_vnic(struct nfp_net_hw *hw) +{ + int ret; + uint16_t port_id; + + port_id = hw->eth_dev->data->port_id; + + /* Start the device */ + ret = rte_eth_dev_start(port_id); + if (ret) { + PMD_INIT_LOG(ERR, "Could not start PF device %d", port_id); + return ret; + } + + return 0; +} + int nfp_init_app_flower(struct nfp_pf_dev *pf_dev) { @@ -438,6 +624,13 @@ goto pf_cpp_area_cleanup; } + /* Start the PF vNIC */ + ret = nfp_flower_start_pf_vnic(app_flower->pf_hw); + if (ret) { + PMD_INIT_LOG(ERR, "Could not start flower PF vNIC"); + goto pf_vnic_cleanup; + } + /* Start up flower services */ if (nfp_flower_enable_services(app_flower)) { ret = -ESRCH;