From patchwork Thu Nov 2 06:16:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133768 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 DB40643269; Thu, 2 Nov 2023 07:17:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A184F40A76; Thu, 2 Nov 2023 07:17:12 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2126.outbound.protection.outlook.com [40.107.237.126]) by mails.dpdk.org (Postfix) with ESMTP id A5D7C402C6 for ; Thu, 2 Nov 2023 07:17:09 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h04dnrAnZ2aBEP0BMTK/xD4Ik5ohkEL4mmz4lzHIKOotIvuhQo4vx3GnzPCUGvbs89Zdi7q+ndO3EakI7L9zokROwCoU3gfgaoiujHebioFK/356wIW/Nu9+m+YeDNxcg2+0PU/AF2NtLPeOIonWM2FG7h8llWg8ZPZucUUs96kcLXFzi1pzzL/w5XrTF6kt1IcHeWNo1OHHADxk/pFCiI27o080IXjJDJq8+Bzd+fGjskvRkD1NFIMZ33174+I0XZAAKFotx5z3QHXbnc5uOnOfRRc1K9Fheg343HiFImEHCY0MH//xVUmrODfAmAhoX2gn/MY0mNS4PeXh4RfECg== 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=9qmkoXB+ibswGBPkboVjabSDEpKBfcGmr8+/i8lefdA=; b=j8zBi22Bb8I0JAeS0/a7RWCDV8C6tBdR4EQk1qmYDFaYAS+LC/Kt7TXKMhuX73mg4bmY5sMBL0UZQiy38LWNjrcI9pjbh3WEJcbsFfpjWrb/YkzhVotmYMeqjZe95C3+F1BvBSgoxvRqCm1Tg4RSflmO0SZ3js0hRG1xe+TUy0TiVECiCDN5Ih0I9MDc/K0SnS4SRrwpIGVpFDHwtwT4d3V8zWDoGNs6Vyn81lZX41q2+9T5blWbHzgpg8RlYpdkvJY3keMYLeOf0Xl0yA8hgGsItSF/SsEToRVL8XrhJYDeXRndZBhvbdS+UbVIkBgc3tKS2+xqVWVXHo+9Spxhog== 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=9qmkoXB+ibswGBPkboVjabSDEpKBfcGmr8+/i8lefdA=; b=CbIDfTOV5JT/QwAtGtOnVNJFI3uDflC0ryzHhrk37J9LpYUgI1dAloHGg9DdK4ZzOHdCbZ1e5hGcoc+Pvf/MPwbAbqxK+ebGT/ZkI/8L7l/QNMREhmZr8pLZT16dEpozX7C01oE01fHZWnl4sgH+dDtlvLibcYInR8P/MjZ8EZ4= 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:08 +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:08 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Zerun Fu , Long Wu , Peng Zhang , Chaoyong He Subject: [PATCH 1/2] net/nfp: support getting pause frame switch mode Date: Thu, 2 Nov 2023 14:16:40 +0800 Message-Id: <20231102061641.2463244-2-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: a5646575-dc00-4e80-513c-08dbdb6b57d9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /qP79/pGnG1mIHmwMxkVWNi7wWfPmQkfA/oDKyhECOQ8FMvbHvAc1kyGPtt2IuWwW3s/+j0EgJmTFKTjk7dy7637b1DvFZw9g7mBM6RUB3Y9kFpE9U3v2yYWhqPzrAGJ2cOYapn/9QqllsUoQGU4Gajapj9alNc/0XYbIt89xEG2FxQlqspNZ6TxArCoEZgCDXSKVYKInAKhWVONGX+FNTqPpgRv7yHdD5x3CRcyxX3l88HvdzTjyNCs4quyN2q4bwxUqectM05BD+aTbynivnssJiW5glv3U+cKhL7Z1TcFcPPEBMpFyQ53+RWzqeDPme9wu20PmQ9MvMqj8Vgn7R6Imva3gNWpbh52ThyQGTEpB13xpnhk6tX8UtGjgnlv21QWULh6wY/ETFqWw0q73N0uGtyrVHHRgDWNPZ9M5RxTE+aL0hFJCwSZfXmnLKgX1aHShWgC+/p/6hYpE+gQ4jclrY7iUqLJ1Gy3bsBsvyUw2pM7Zu6DL6feWnWZMRh0HUlN4ml8a8JoJl284Lf9Wa7aI1YmDWOwMOqG/UHdd+6ca+1zB4lyguPi2RgFiVUr3sEKo/embUUTdzOYofh4DZAhC/wTeLY2ZKW+1uaqvLvqKbleDyPvalwLUs1r1Q2rurYryhyfOxb0Jjw9ZSj2YMI/7BWtOmDGO/kTWp9/8eM= 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)(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: qwJ2dGCvaR4TmYDnmzmUlEeoTG/txv2XwyHVxffGu23VWqNEVnpMHkmKGQ5nQX3eqkJyHCIGVVEsf7NKeNT5vnRAIFgNVjLqGZpc3hIGoGcV9mlqALqLxmbODBh1B8sHi8CIzzvIZgea32PernavfOGwuli2+WJb2TKvMeyqZYFrD+k4Z+606n7pwAUcwZ1rUMS8afAl4q2J+z74wQ0F8TaWBBQifhyX1PYwXAqF7RYS0mzsktj+BJ2Ncxa0szVbOXHK3XMGtjQ3vdJvk2HDgrhDy6ZGj7JCe8QPopvZ6ZecZStVgYvq7/C7I2VfNEsqYEJJW9EAoIc+ieEJIDLikpbOtCfE0knGALzi9c4mzlxfFR4gmh2zg3w33WeDz1HL5ajWSZ8NSM6LuwHW7GyFHNqpWNFb8kG0aTHP0VZQP4vxfn5ON9Xborb9dFYFwCD3T03uMxR7FwG8raeqDzv65LyXXsVlOHMVwJBBtjilmg6kB3LVU1gbSTEJ1mn9JVQ/qDf0IIvLrmWMItIImN5XkK832DhKtmDN7TBglXbIJ5ZlK4Ct+ePGEF6XbMDQVVwZ7LsQtXjNvyxM2Q8P1iu+BTG9YLb1QfUbnOt70hsDLNDK68dgLZtlikIHekhWzRGmsApi1uw2kB4pdDGmdO8fxdrj6oNIdwBcOZ7lUUvEieLHbf8jxId/AjyPbp0SNOnvMlI6TiQE27mgRbttS1ypkYKKL5vPdcWppGRz36raj0D1/3cBQbq6pmpy3o89tItOKpBQaobXM6jDymfMGDTLC9Mgbtdf2AGCdnqW6/ESwoeOkQZMfQhmtP+I02p4Z5e3n0b4eWSwPJe0OpO27uDnU8RJJ/Ux5DUNRyJyBLRrTiDFeKXZfzLFGLTP2MwYPXbLAimDX+1+PnWpwZwd00GImzemnb1PVq7O1IPVZmvoFHCCEB+5YMuAnFEsJgU9ocmFO1hZ3Hg9Gk7/ImJ1Vq95Pfo/gp0QM/zdJM6IPRikAp09mjmFkSQUE9O1lFZLjyn0VBSkdeiuak3wpU+hMJOzbI9pXXEISIaZiEt74H/76tIKa/qc8AenI/q91dYrFf2z2g/FWHC/44kdw2VCXfJJvrPgHv/IPLcGLgyydz8aXizWqebeKxfbkNGzw4QRey0qcT3YYK/XZpuuTnjw/I2msPjUMkn5mWDMXsYBbRy5/OWjXsEtdntgV9PvUocIGcQtzDxVSww0BE77s35hWbVcVMfAuG0qzdY968QqSKGKBB6zbHyT91dchLS2aAv3y52nWuQAIxJ3+WQJ/psh+ZEY+EbOaJ80yQrOzEGUrklraWN03YR4BbP+RsQ003n4Z9tYpCaYCmXkfBhexHP0+f5Rkxrfwh/7HRDSL7cqDmcdkxUDObOCj9D3YE067xwINL7BN40o3ojywqKRozxZK7IIXCWFKdy84kdg/7wS7O4kDKb1OAQFIHOoM7VqVPyM37/RQiFvV4/mPMKdT3f15VaSi4hkD/1FW7cI9A2ZN9M2gURUK5vAUq34BTKFyuRYjemNIGXyNWxU1ufqCu6lE4AKKMwWm3Bh9CqNeQj6lpG3ov0MVB9KTry1WPMr74YzMElhloNYjUySnYK/Ydj/UtoVzg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: a5646575-dc00-4e80-513c-08dbdb6b57d9 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:08.8828 (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: ijcxoTDuBAV/OEdCUlUXiPbGdIU5wOFUO+LdeFfZY1T9boY3dH/dt9we81VTJ4h6mBTCl3KkK53DkeijlmpaJ3RQ/v+wKHYgwIZlpIGri+Y= 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 querying current RX/TX pause frame switch mode from the device. 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 | 41 +++++++++++++++++++++++++++ drivers/net/nfp/nfp_net_common.h | 2 ++ drivers/net/nfp/nfpcore/nfp_nsp.h | 2 ++ drivers/net/nfp/nfpcore/nfp_nsp_eth.c | 11 +++++++ 5 files changed, 57 insertions(+) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 4fae2e5540..452e16e126 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -428,6 +428,7 @@ static const struct eth_dev_ops nfp_net_eth_dev_ops = { .udp_tunnel_port_add = nfp_udp_tunnel_port_add, .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, }; static inline void diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index 4efcdff76f..44b2d6dd4f 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -2073,3 +2073,44 @@ nfp_net_stop(struct rte_eth_dev *dev) return 0; } + +static enum rte_eth_fc_mode +nfp_net_get_pause_mode(struct nfp_eth_table_port *eth_port) +{ + enum rte_eth_fc_mode mode; + + if (eth_port->rx_pause_enabled) { + if (eth_port->tx_pause_enabled) + mode = RTE_ETH_FC_FULL; + else + mode = RTE_ETH_FC_RX_PAUSE; + } else { + if (eth_port->tx_pause_enabled) + mode = RTE_ETH_FC_TX_PAUSE; + else + mode = RTE_ETH_FC_NONE; + } + + return mode; +} + +int +nfp_net_flow_ctrl_get(struct rte_eth_dev *dev, + struct rte_eth_fc_conf *fc_conf) +{ + struct nfp_net_hw *net_hw; + 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[dev->data->port_id]; + + /* Currently only RX/TX switch are supported */ + fc_conf->mode = nfp_net_get_pause_mode(eth_port); + + return 0; +} diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h index 1f9001c81d..5a65d166e0 100644 --- a/drivers/net/nfp/nfp_net_common.h +++ b/drivers/net/nfp/nfp_net_common.h @@ -238,6 +238,8 @@ int nfp_net_firmware_version_get(struct rte_eth_dev *dev, char *fw_version, size bool nfp_net_is_valid_nfd_version(struct nfp_net_fw_ver version); 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); #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 fe52dffeb7..dc1eb55a1f 100644 --- a/drivers/net/nfp/nfpcore/nfp_nsp.h +++ b/drivers/net/nfp/nfpcore/nfp_nsp.h @@ -139,6 +139,8 @@ struct nfp_eth_table { bool supp_aneg; /**< Support auto negotiation */ bool override_changed; /**< Media reconfig pending */ + bool rx_pause_enabled; /**< Switch of RX pause frame */ + bool tx_pause_enabled; /**< Switch of TX pause frame */ uint8_t port_type; /**< One of %PORT_* */ /** Sum of lanes of all subports of this port */ diff --git a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c index 75f6d40fea..ca8bc8f550 100644 --- a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c +++ b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c @@ -33,6 +33,8 @@ #define NSP_ETH_STATE_ANEG GENMASK_ULL(25, 23) #define NSP_ETH_STATE_FEC GENMASK_ULL(27, 26) #define NSP_ETH_STATE_ACT_FEC GENMASK_ULL(29, 28) +#define NSP_ETH_STATE_TX_PAUSE RTE_BIT64(31) +#define NSP_ETH_STATE_RX_PAUSE RTE_BIT64(32) #define NSP_ETH_CTRL_CONFIGURED RTE_BIT64(0) #define NSP_ETH_CTRL_ENABLED RTE_BIT64(1) @@ -186,6 +188,15 @@ nfp_eth_port_translate(struct nfp_nsp *nsp, dst->act_fec = FIELD_GET(NSP_ETH_STATE_ACT_FEC, state); dst->supp_aneg = FIELD_GET(NSP_ETH_PORT_SUPP_ANEG, port); + + if (nfp_nsp_get_abi_ver_minor(nsp) < 37) { + dst->tx_pause_enabled = true; + dst->rx_pause_enabled = true; + return; + } + + dst->tx_pause_enabled = FIELD_GET(NSP_ETH_STATE_TX_PAUSE, state); + dst->rx_pause_enabled = FIELD_GET(NSP_ETH_STATE_RX_PAUSE, state); } static void