From patchwork Thu Nov 2 06:16:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133769 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 51F3C43269; Thu, 2 Nov 2023 07:17:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D3E8E40DF8; Thu, 2 Nov 2023 07:17:15 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2122.outbound.protection.outlook.com [40.107.237.122]) by mails.dpdk.org (Postfix) with ESMTP id 5F52F40DCE for ; Thu, 2 Nov 2023 07:17:13 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XTiiD9R3a3pZsFksQ7Oh8AOnfxGKI6Fzjcj3C3TpSCmeyUdiktHqTn31gsFjs7uVVyfLqycxWygZpoAwFH1chassd2SGyQfEr2GmQkVAvcJnasA88b8C3qddbrmsi783spJYwELJKxQegrULdnvDp5cksvteMIzALObr2Q1SlfclWIJcnTTcpaUOVb4ZmpAjmTsTf4Vkl/wxyMOqEqdcuPLHuAbbPd4Ck8gEa9JG4ZOLYn7WmKVSSVjRoq+heUbGBzwBDWzs3U423fjTuUDnwjlxxyqUuNHsRj/XF+9rOE8GqrwZBUJrSIYdxAK4KJRPE+5LX37VsVeO7fER1l9sAg== 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=2W/IlAOWr+9GHFuvPj/C6Zy/sRnR4CeekNZ7cqFuxEU=; b=eIboobo7qQjZfgLsbS4crQCEfQ9RUypgSZ/THzJcwAbguTSzK1TMDCYQ7eJJJgrmhbN6R5XZs80hVrC/qMla5fvlU13opjxblz9d4WWY7k9Q4lgZBunqFJPA5XfxRX1ZESFPCgMnymX3454PU2SU9i+JiErCV5qg8pPKPwu327L6+nDYj2MdDav7b3QXRzs1lCkK+KAxKfcwdba5xhiHtrxQHlKPkRV0GbXKSLQvh63Pan1ITNL9zI7r9SIed/2FymVAuN0lAHluxZKpS1wlvBAqdhB07k43iye4X9gBAGV8dcpKQkr2jbU/fxmXu/ggnsCbaEmVWQWbsTfZ4RJK8g== 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=2W/IlAOWr+9GHFuvPj/C6Zy/sRnR4CeekNZ7cqFuxEU=; b=ka2lRrphvVoGk3diQN3B2LcXZt4bpFfmvGD2+eD7AhyLCrJq3IQqWJK3+/Bg2+SvjHOfv4RUeO5uM8uuRFc75DONoSSiqTyKRyCygVdh0tv2MR9zScIvxtOXn/ltjnAZafffkNNCpACdjxbaJrRlOt9pst5gq2JR5nvVdhwxjZE= 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 SJ2PR13MB6503.namprd13.prod.outlook.com (2603:10b6:a03:559::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.28; Thu, 2 Nov 2023 06:17:11 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b%6]) with mapi id 15.20.6933.027; Thu, 2 Nov 2023 06:17:11 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Zerun Fu , Long Wu , Peng Zhang , Chaoyong He Subject: [PATCH 2/2] net/nfp: support setting pause frame switch mode Date: Thu, 2 Nov 2023 14:16:41 +0800 Message-Id: <20231102061641.2463244-3-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231102061641.2463244-1-chaoyong.he@corigine.com> References: <20231102061641.2463244-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SI2PR01CA0049.apcprd01.prod.exchangelabs.com (2603:1096:4:193::13) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SJ2PR13MB6503:EE_ X-MS-Office365-Filtering-Correlation-Id: 90d8f944-3ca7-4790-0408-08dbdb6b5971 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zN96lVdJUaDyGi2zX30R05AiZ7DlYHnbxmbbTfsErjgq/EcA1kAqD3iuQAg7+U++JCdQTMiY21NRykgW19W6PoCyU/BVn1Zr8KJHSZ4H92X9UlVQTizGE2T4u/0B64FTcW6xuMQYuzpeA5YmXCEr89pbewYDmqH11k891Apyosy0OZPRf5W9QUNoMCGYn9rzTamue7Tjlh+rkJ3yJzDe2Oc6tCoXo3Ciz3vMi7ow4n/8WPhmX+mVQOKA/vJqdeyjWd2vWwtScNMRQjfSBz6TN4kYZSWcvEHPWPNGkwaF3fXKANZf5RahpJigRfiGiMoP/9HAgd/ocygi6Y85eBDAydzBr/roPhkxRwFKg4WMfZBQfyf4rAA3I3tD/ZaAsENcjRaljxY+CZe/a16ssjbBrjq/fPIjK8kHQkjlWDZRN4DNRErHD9kheCMO7oVvT9Kq4AmiLRTPH2yoakV1YEZ7/8h/B5Qs+mmNG7HYOsIw6StuzpIzMBODxMQNtFc2RclvH+2XKJzSaYg14RTB6ofVpcASWha5xSxnQkAu/0ypYUyZnHxkwFtiIkRh6/MuxAfEmye/i+plIfQKxxx2u2TbVpbMuN9n7ZwQZysBcpY/PKKq+gYw7Dg+LydiWhjcGyMAfFjKV/RDwDevmiD9KR0W9cEpdN4x5NPRTzty5bBq6ZQ= 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:(13230031)(39830400003)(376002)(136003)(346002)(396003)(366004)(230922051799003)(451199024)(64100799003)(1800799009)(186009)(107886003)(6512007)(6506007)(83380400001)(2616005)(66556008)(38100700002)(5660300002)(6916009)(66476007)(316002)(478600001)(66946007)(54906003)(8936002)(44832011)(52116002)(4326008)(6666004)(6486002)(41300700001)(8676002)(2906002)(26005)(36756003)(38350700005)(86362001)(1076003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: W1Z0TFtK/Kxft2uV1HZZoOhA27IbQAtU+nttZRzvhaUhK9tT5UFNh8CooVCBIqUJA31InJg6i89i435h8QzDGGYCnRYUdrhfgO8BimCR1SADMAY/r8jq8q4UczZSRf5TNzbh9u0VADMBmhzVYM415UCEXdvr9DqbtdYhW/vhyqEp0TSDJ8NTqT62Bk11csRnLDnrsdZ6mVDkvV6io82TEzJ3r0X0Ozz7PhuAR5SOGXxa6uNy/VGyLt4TyXylZZQcWm1FgeNVQVcuSdCJ3iLcpqE/iRz8udMpaDaUFI8D7HBUPBzLjUHeQDilEX/tTecu9AXBan9ymlR2YSBhErUAL7N6rIuM33OXfFOoVBuFsNhdwN6dlPfXLvo44rwHmdgJLBN6SDgFwiRMscE7Naf6HY2YYaMX6oSrKXtoJuNuOhOk85kJ4+wWSHzNjg3nlCjNmKX3qYjYyOlc39cQZfQEWIgsM/h7J/woHd4cuM2PruxyXwjWctPNb1rJn4bDzdFeBW+TzLLamhOkZqHnPoWAz+blFZ5bw8esfI3O5JbEHNNXeEtrJJODHbr7pKaTmP6PdNsRm7/G2JO0E4dlnnX25EB7FhrA4VFw6TKUl01N4Iyrn/5Wxaybc4pq70TLcw+oWaSLUG8PS9RYF7p9/vEUQqWMUQOzgiFnEd1zDa1aczUvovwh0CfAXIa8H+7ogtY7cfHI6BguzpXT2v6iU2E+FlTqI2ypCxVuGLhSz1hBD+wpbq4ieCRDjunK0P8jydQddBaGlhIll8AL+fEgxrAb9i6zIALzRfiYY2BCKln8degWpcwavftsNDsLRbJOq3tkuce+64j7RUMy8PhbcOsD8bRO2T37RaGX1YTq3BwlTLFVDuxlULS/Z8YIi8c6eNtu+hUHzHpEuq+xZ+9KpGz2uG+CP/6VsBvhnm+FSkWkCYjCsppR/HTc0W0egjikKpGrQDwjfBGHWrBAQSpLq6d27Tq07AzG9mF7r/ZBFGUMA4sbDx/8wfFLhvUsj8NnjchjkvNjgVm+KSy2+mmo5M2V6v04N/8NbrvT18UZL+THw6sDDkvIFFjkN76/vZlp/X1YTSqDleOZGr6u9vb8oOba6xH+b5AWAbjvbUM1EHxWggQIR/x0R7MJT42yDmjSr09xVPVMt6rObWoicSwYSjd0+vY4Kf3TeUCBFEjRjGPHdybfn7feUBbHqHYNlWjBrfVaeiOITY9A5e7+Wf16qf2fuNfGQ9bhLM6yFfSnBUQ5yaEJMwZ9sK7o7uWMc5QQuuBe7PHpOXmOsvwNilCDcplvyti7CBsmE+l6dSV8puzmyfnDBNrAZRCcs7S6LfOmdX5QUvMjgPLe2o7EcTO2sdvQYkvY2gYlzm6WsCPEyYilTa+5h+CCkavmKvgGJdd0RsoX9uTd9H/g/3ku4RhVZKC+W9HHY5winKSSeRRsw445lEbt9Fy0Hv+YEU6spsKCIIG0b6IIPtS8uTd2eVROcaai7JXVjQESO/rJ2P6Fud+u4S1bqzlGmzVo4oDO2oq+VICJwL2TwOBygAyKD+4pFff5bEQt7OMRDtQYxcsxmeAXFTrfuL5/i45lEmkIybkZK2GFj72c4pjgfU1ztr00fb6tfw== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 90d8f944-3ca7-4790-0408-08dbdb6b5971 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2023 06:17:11.7274 (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: QDei2YCsGmPY0K6xb9fsSnXIb6n7gs18QnLvCHYYGImMFJff3CGn3+j2UgS7rJ+bDYmuqdqVyFix9TiC4GACbMmw9bhgjZdC5q421DrBRd8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR13MB6503 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 From: Zerun Fu Add support for configuring RX/TX pause frame switch mode. Signed-off-by: Zerun Fu Reviewed-by: Long Wu Reviewed-by: Peng Zhang Reviewed-by: Chaoyong He --- drivers/net/nfp/nfp_ethdev.c | 1 + drivers/net/nfp/nfp_net_common.c | 75 +++++++++++++++++++++++++++ drivers/net/nfp/nfp_net_common.h | 2 + drivers/net/nfp/nfpcore/nfp_nsp.h | 2 + drivers/net/nfp/nfpcore/nfp_nsp_eth.c | 52 ++++++++++++++++++- 5 files changed, 131 insertions(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 452e16e126..fd54d58cb5 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -429,6 +429,7 @@ static const struct eth_dev_ops nfp_net_eth_dev_ops = { .udp_tunnel_port_del = nfp_udp_tunnel_port_del, .fw_version_get = nfp_net_firmware_version_get, .flow_ctrl_get = nfp_net_flow_ctrl_get, + .flow_ctrl_set = nfp_net_flow_ctrl_set, }; static inline void diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index 44b2d6dd4f..8dd014c575 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -2114,3 +2114,78 @@ nfp_net_flow_ctrl_get(struct rte_eth_dev *dev, return 0; } + +static int +nfp_net_pause_frame_set(struct nfp_net_hw *net_hw, + struct nfp_eth_table_port *eth_port, + enum rte_eth_fc_mode mode) +{ + int err; + bool flag; + struct nfp_nsp *nsp; + + nsp = nfp_eth_config_start(net_hw->cpp, eth_port->index); + if (nsp == NULL) { + PMD_DRV_LOG(ERR, "NFP error when obtaining NSP handle."); + return -EIO; + } + + flag = (mode & RTE_ETH_FC_TX_PAUSE) == 0 ? false : true; + err = nfp_eth_set_tx_pause(nsp, flag); + if (err != 0) { + PMD_DRV_LOG(ERR, "Failed to configure TX pause frame."); + nfp_eth_config_cleanup_end(nsp); + return err; + } + + flag = (mode & RTE_ETH_FC_RX_PAUSE) == 0 ? false : true; + err = nfp_eth_set_rx_pause(nsp, flag); + if (err != 0) { + PMD_DRV_LOG(ERR, "Failed to configure RX pause frame."); + nfp_eth_config_cleanup_end(nsp); + return err; + } + + err = nfp_eth_config_commit_end(nsp); + if (err != 0) { + PMD_DRV_LOG(ERR, "Failed to configure pause frame."); + return err; + } + + return 0; +} + +int +nfp_net_flow_ctrl_set(struct rte_eth_dev *dev, + struct rte_eth_fc_conf *fc_conf) +{ + int ret; + struct nfp_net_hw *net_hw; + enum rte_eth_fc_mode set_mode; + enum rte_eth_fc_mode original_mode; + struct nfp_eth_table *nfp_eth_table; + struct nfp_eth_table_port *eth_port; + + net_hw = nfp_net_get_hw(dev); + if (net_hw->pf_dev == NULL) + return -EINVAL; + + nfp_eth_table = net_hw->pf_dev->nfp_eth_table; + eth_port = &nfp_eth_table->ports[net_hw->idx]; + + original_mode = nfp_net_get_pause_mode(eth_port); + set_mode = fc_conf->mode; + + if (set_mode == original_mode) + return 0; + + ret = nfp_net_pause_frame_set(net_hw, eth_port, set_mode); + if (ret != 0) + return ret; + + /* Update eth_table after modifying RX/TX pause frame mode. */ + eth_port->tx_pause_enabled = (set_mode & RTE_ETH_FC_TX_PAUSE) == 0 ? false : true; + eth_port->rx_pause_enabled = (set_mode & RTE_ETH_FC_RX_PAUSE) == 0 ? false : true; + + return 0; +} diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h index 5a65d166e0..68a84dea06 100644 --- a/drivers/net/nfp/nfp_net_common.h +++ b/drivers/net/nfp/nfp_net_common.h @@ -240,6 +240,8 @@ struct nfp_net_hw *nfp_net_get_hw(const struct rte_eth_dev *dev); int nfp_net_stop(struct rte_eth_dev *dev); int nfp_net_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf); +int nfp_net_flow_ctrl_set(struct rte_eth_dev *dev, + struct rte_eth_fc_conf *fc_conf); #define NFP_PRIV_TO_APP_FW_NIC(app_fw_priv)\ ((struct nfp_app_fw_nic *)app_fw_priv) diff --git a/drivers/net/nfp/nfpcore/nfp_nsp.h b/drivers/net/nfp/nfpcore/nfp_nsp.h index dc1eb55a1f..4888501e46 100644 --- a/drivers/net/nfp/nfpcore/nfp_nsp.h +++ b/drivers/net/nfp/nfpcore/nfp_nsp.h @@ -189,6 +189,8 @@ void nfp_eth_config_cleanup_end(struct nfp_nsp *nsp); int nfp_eth_set_aneg(struct nfp_nsp *nsp, enum nfp_eth_aneg mode); int nfp_eth_set_speed(struct nfp_nsp *nsp, uint32_t speed); int nfp_eth_set_split(struct nfp_nsp *nsp, uint32_t lanes); +int nfp_eth_set_tx_pause(struct nfp_nsp *nsp, bool tx_pause); +int nfp_eth_set_rx_pause(struct nfp_nsp *nsp, bool rx_pause); /* NSP static information */ struct nfp_nsp_identify { diff --git a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c index ca8bc8f550..87db928c08 100644 --- a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c +++ b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c @@ -44,6 +44,8 @@ #define NSP_ETH_CTRL_SET_LANES RTE_BIT64(5) #define NSP_ETH_CTRL_SET_ANEG RTE_BIT64(6) #define NSP_ETH_CTRL_SET_FEC RTE_BIT64(7) +#define NSP_ETH_CTRL_SET_TX_PAUSE RTE_BIT64(10) +#define NSP_ETH_CTRL_SET_RX_PAUSE RTE_BIT64(11) /* Which connector port. */ #define PORT_TP 0x00 @@ -519,7 +521,7 @@ nfp_eth_set_bit_config(struct nfp_nsp *nsp, uint32_t raw_idx, const uint64_t mask, const uint32_t shift, - uint32_t val, + uint64_t val, const uint64_t ctrl_bit) { uint64_t reg; @@ -683,3 +685,51 @@ nfp_eth_set_split(struct nfp_nsp *nsp, return NFP_ETH_SET_BIT_CONFIG(nsp, NSP_ETH_RAW_PORT, NSP_ETH_PORT_LANES, lanes, NSP_ETH_CTRL_SET_LANES); } + +/** + * Set TX pause switch. + * + * @param nsp + * NFP NSP handle returned from nfp_eth_config_start() + * @param tx_pause + * TX pause switch + * + * @return + * 0 or -ERRNO + */ +int +nfp_eth_set_tx_pause(struct nfp_nsp *nsp, + bool tx_pause) +{ + if (nfp_nsp_get_abi_ver_minor(nsp) < 37) { + PMD_DRV_LOG(ERR, "Set frame pause operation not supported, please update flash."); + return -EOPNOTSUPP; + } + + return NFP_ETH_SET_BIT_CONFIG(nsp, NSP_ETH_RAW_STATE, + NSP_ETH_STATE_TX_PAUSE, tx_pause, NSP_ETH_CTRL_SET_TX_PAUSE); +} + +/** + * Set RX pause switch. + * + * @param nsp + * NFP NSP handle returned from nfp_eth_config_start() + * @param rx_pause + * RX pause switch + * + * @return + * 0 or -ERRNO + */ +int +nfp_eth_set_rx_pause(struct nfp_nsp *nsp, + bool rx_pause) +{ + if (nfp_nsp_get_abi_ver_minor(nsp) < 37) { + PMD_DRV_LOG(ERR, "Set frame pause operation not supported, please update flash."); + return -EOPNOTSUPP; + } + + return NFP_ETH_SET_BIT_CONFIG(nsp, NSP_ETH_RAW_STATE, + NSP_ETH_STATE_RX_PAUSE, rx_pause, NSP_ETH_CTRL_SET_RX_PAUSE); +}