From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B92D345CE3 for ; Mon, 11 Nov 2024 07:41:12 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B0B134067A; Mon, 11 Nov 2024 07:41:12 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2041.outbound.protection.outlook.com [40.107.93.41]) by mails.dpdk.org (Postfix) with ESMTP id 955004067A for ; Mon, 11 Nov 2024 07:41:11 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QMlchYprs0ibwnIJ9Xrz5yo8gnkmDXNWiuPCzApr/bKQ4OyLImiInudVdkj/ul0aggfCAZDNyRLx79kqQaXQEObAJuVQUfaGVHw62pRGKMi3tTdt6lmEG/WUyPgTG0OluMrrPYwB2i/oRResOZu3XaPwcYYNqWQ//DLQRjdLhpzIs9/j+wbb9E9bh9i44vPuM5iA6qm7wAKndp6/nZYpmhbPNkxScNKSEWJbpdGPMNMZ2i5AD1YArSJLrkV4f/PSx0sqQsu1eP2W6+FERYlxJNt+7m2wYLvUlufJEixB6RWHxoYy4K6BlUqYVnZ/iZjz2E/GD4tREScD8FBoOyw6yQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=h9mQo6X4LwcUsvv9rEYqLDETxCGYVy8bJf5ANN5yaLc=; b=G4omnL2wmwQkdzMiZGQP+yqUb+8AhqY+r4SJYtOK9SkwHAb+kaSUELCMdBTQ43X4iraWzrqcN0iMl0JB8ycE5ggQZKNK3BtHB6MhCxB0tH+OgLWFosCPzFDrMS9tr/bq5OArvojShoYiCrlt+D2Vie4soUCqb9780fvJS4qcnKZLamQdG0++uL5Jzap5ZpIBIo3SPqxQU4QfJokc3IM4qr5a1vOoArANenWLifXf4uJyG5ULdvnb5EfUSXueb+//LUGG1bErjoQWiq1s/LVSXX5L7FZPb7wtgRZWrMi5cBGFu43n36SVMyg0UbewOCq2w/uIYxJUXGrW1s5SLaDLsQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=corigine.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=h9mQo6X4LwcUsvv9rEYqLDETxCGYVy8bJf5ANN5yaLc=; b=dfQzN3aNyBf7IgjRNyTfPtlMCrl1fiNaWK+fnmGRialgn0m+J45DVLA/plulk0nA8J44WK3zpTjfHa5IzPQ6Zfj084BOSLV6BvGNpqk/g7OaLcKqYQFbL+q9e0gp5RcQlrl+XzouYWLR61zfduiZjgznvaTaG4jvGwujhUirnxn1MEom/GOQyAizytk+vek8fqBL3I7+mEzbciWQmWkF/GnL/bac2eR0PUOrYoGcuFx2+XvZt17x791091CqlrQ9q/+q3vISIalaBUxVNpVf96hXzds8afxo67MtYLxpXqJSv1PdzPN/UasbtA4eAyMW36VU6++3ue2mb13QJN5TPA== Received: from SN7PR18CA0001.namprd18.prod.outlook.com (2603:10b6:806:f3::15) by DM4PR12MB6254.namprd12.prod.outlook.com (2603:10b6:8:a5::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.28; Mon, 11 Nov 2024 06:41:07 +0000 Received: from SN1PEPF0002636A.namprd02.prod.outlook.com (2603:10b6:806:f3:cafe::21) by SN7PR18CA0001.outlook.office365.com (2603:10b6:806:f3::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.27 via Frontend Transport; Mon, 11 Nov 2024 06:41:07 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SN1PEPF0002636A.mail.protection.outlook.com (10.167.241.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.14 via Frontend Transport; Mon, 11 Nov 2024 06:41:07 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 10 Nov 2024 22:40:58 -0800 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 10 Nov 2024 22:40:55 -0800 From: Xueming Li To: Zerun Fu CC: , Chaoyong He , Long Wu , Peng Zhang , dpdk stable Subject: patch 'net/nfp: notify flower firmware about PF speed' has been queued to stable release 23.11.3 Date: Mon, 11 Nov 2024 14:28:41 +0800 Message-ID: <20241111062847.216344-116-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241111062847.216344-1-xuemingl@nvidia.com> References: <20241111062847.216344-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002636A:EE_|DM4PR12MB6254:EE_ X-MS-Office365-Filtering-Correlation-Id: db32a7e7-e4e4-4d67-f44d-08dd021bd29d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|82310400026|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?lILyi0mCrQ2jnd8MOIos+5KHvSLHDJ12HECsAcZdtt2ybhNuLuORcQGJRzUT?= =?us-ascii?Q?RPs1fNY2nOoiaI5nwBAkOI5b+kONoIqyBiU0m5jt8qqj0V6aw/taVjpa92Gw?= =?us-ascii?Q?d/ZeU1vmOUDPp9K5DlZPj42DU7Z79cvtgUMYgaFosklB39fd1x5+zsXM1mZw?= =?us-ascii?Q?u2SCdRrrunTbasfM+jCGMntg5ujz5aLsxZmv7rEPY9JN3R4zzdY48WVjBEIr?= =?us-ascii?Q?Dm1HNg2jLLkif2D1EpQ7aqzo5YyMcMw4R8RC7/hF5NegUul2FZGaTxUmpPnM?= =?us-ascii?Q?EHvjZVTxpWyEvtiRodFKMlUK3du+lba1sl4eEkGR4wf9R2PuiGldeQrwRC3e?= =?us-ascii?Q?umXmgQOjJEOIKZVx5IHsh9NHkN7TfxP3qyerUXsMXRuQBqdyMoag8KuEljiX?= =?us-ascii?Q?OWna0AAvIhpl45hjpk9nV1lVQDSXZuokg8CRvy8DmYQ8rYwsDS/LWcJW+azK?= =?us-ascii?Q?J0SQluLB9uHyR7QCFESJfQPriOghBkkwTn6i/Wpo7ilh/uq5Q/L8SdPDawTy?= =?us-ascii?Q?KIU+OUCXcRGOxQN+0QRPthEjo37Nfg3Ta4jm3NOW20AmR0CCKKi5tG+7Bdzs?= =?us-ascii?Q?hIA6XY3iIKgVId2l7PemTUioSKTGgw/vK617qjH3RRQpXIb/BdNKbXwiBzeb?= =?us-ascii?Q?BBzXRz3lk8W9+YD/+kN41Ogne4bgzw+p2MG0xys2m5tDc5OP76OWTLSGVpsR?= =?us-ascii?Q?awfIvcAho7cchA9LGDyVN/hHCmwcCiZKjsskvEYcxId7Ge82KZl66e4bkThz?= =?us-ascii?Q?X6J2iQxk0JK0tpM59dsFqJS7x1rqGAd8M9+EHulKNCpcwBo7nudwA9jnEC5E?= =?us-ascii?Q?XLxF88+Jt1IO6Fra4WZyo/gKt7s8hfLU1Iu1IrZ0A4nH89TG5Weo7h9T+GLd?= =?us-ascii?Q?68D71fLaz5TL/kki+VgIjqHmx/JvMDz58vY2A8T+MYKnOWPKx5VBUhB4XiH+?= =?us-ascii?Q?knEV/QFGcLO8e9MjxB6mCs0qolHawnIeplL5B8I6X3mf18eG31TzrwlaCaw3?= =?us-ascii?Q?4HHsQpY/DwOqlwJ1lxrpvSptulXdgY7kjOQQdhKqET12jwCxhB34lqe9xYtI?= =?us-ascii?Q?SJk036ZYy7Syq+jZh722IyGPxqXFtT4YkS23hQxQkx30fi0wmKjjM0iMJYC0?= =?us-ascii?Q?5Hxwku08jZs+vobMOQwodGZjlFWoFvPIJBdaRQtfJmjAp7H9lxpwjmZDG/wk?= =?us-ascii?Q?dIHPKW7eq+FzsVUnNq1SdSEw8E8LZofUPhCqaZJayMJ7emVMYFc7/YG2cvZS?= =?us-ascii?Q?IGawhCRrXhh2MHWhk8gtN+Df+gt3ffjGMDioOnfCIjALunjsQad5VL+7avMN?= =?us-ascii?Q?tO8Z9cBbTmk+8vrvkkZni7omVeUfz7d/vWCLMqCn0XpvCvBzfqsp/UcI1Dfb?= =?us-ascii?Q?GseD7h2wQvxhGuOBEZCHw4ExlTS6/wM4b+0yO1IJAjwZgZGeEQ=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(82310400026)(1800799024)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 06:41:07.6011 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: db32a7e7-e4e4-4d67-f44d-08dd021bd29d X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF0002636A.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6254 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 23.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/30/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=ebec3137a58cbd31c0cf8483586527b1d48ae779 Thanks. Xueming Li --- >From ebec3137a58cbd31c0cf8483586527b1d48ae779 Mon Sep 17 00:00:00 2001 From: Zerun Fu Date: Mon, 14 Oct 2024 10:43:55 +0800 Subject: [PATCH] net/nfp: notify flower firmware about PF speed Cc: Xueming Li [ upstream commit 2254813795099aa6c05caed5e8c0dcc7a8f03b4e ] When using flower firmware, the VF speed is obtained from the firmware and the firmware get the VF speed from the PF. But the previous logic does not notify the firmware about PF speed, and this cause VF speed to be unavailable. Fix this by add the logic of notify firmware about PF speed. Fixes: e1124c4f8a45 ("net/nfp: add flower representor framework") Signed-off-by: Zerun Fu Reviewed-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/flower/nfp_flower_representor.c | 3 +++ drivers/net/nfp/nfp_net_common.c | 2 +- drivers/net/nfp/nfp_net_common.h | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c index 23709acbba..ada28d07c6 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -33,6 +33,9 @@ nfp_flower_repr_link_update(struct rte_eth_dev *dev, pf_hw = repr->app_fw_flower->pf_hw; ret = nfp_net_link_update_common(dev, pf_hw, link, link->link_status); + if (repr->repr_type == NFP_REPR_TYPE_PF) + nfp_net_notify_port_speed(repr->app_fw_flower->pf_hw, link); + return ret; } diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index 134a9b807e..bf44373b26 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -166,7 +166,7 @@ nfp_net_link_speed_rte2nfp(uint32_t speed) return NFP_NET_CFG_STS_LINK_RATE_UNKNOWN; } -static void +void nfp_net_notify_port_speed(struct nfp_net_hw *hw, struct rte_eth_link *link) { diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h index 41d59bfa99..72286ab5c9 100644 --- a/drivers/net/nfp/nfp_net_common.h +++ b/drivers/net/nfp/nfp_net_common.h @@ -282,6 +282,8 @@ int nfp_net_flow_ctrl_set(struct rte_eth_dev *dev, void nfp_pf_uninit(struct nfp_pf_dev *pf_dev); uint32_t nfp_net_get_port_num(struct nfp_pf_dev *pf_dev, struct nfp_eth_table *nfp_eth_table); +void nfp_net_notify_port_speed(struct nfp_net_hw *hw, + struct rte_eth_link *link); #define NFP_PRIV_TO_APP_FW_NIC(app_fw_priv)\ ((struct nfp_app_fw_nic *)app_fw_priv) -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-11 14:23:10.471975632 +0800 +++ 0115-net-nfp-notify-flower-firmware-about-PF-speed.patch 2024-11-11 14:23:05.352192835 +0800 @@ -1 +1 @@ -From 2254813795099aa6c05caed5e8c0dcc7a8f03b4e Mon Sep 17 00:00:00 2001 +From ebec3137a58cbd31c0cf8483586527b1d48ae779 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 2254813795099aa6c05caed5e8c0dcc7a8f03b4e ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -28 +30 @@ -index eb0a02874b..eae6ba39e1 100644 +index 23709acbba..ada28d07c6 100644 @@ -31,3 +33,3 @@ -@@ -37,6 +37,9 @@ nfp_flower_repr_link_update(struct rte_eth_dev *dev, - - ret = nfp_net_link_update_common(dev, link, link->link_status); +@@ -33,6 +33,9 @@ nfp_flower_repr_link_update(struct rte_eth_dev *dev, + pf_hw = repr->app_fw_flower->pf_hw; + ret = nfp_net_link_update_common(dev, pf_hw, link, link->link_status); @@ -42 +44 @@ -index b986ed4622..f76d5a6895 100644 +index 134a9b807e..bf44373b26 100644 @@ -45,2 +47,2 @@ -@@ -184,7 +184,7 @@ nfp_net_link_speed_nfp2rte_check(uint32_t speed) - return RTE_ETH_SPEED_NUM_NONE; +@@ -166,7 +166,7 @@ nfp_net_link_speed_rte2nfp(uint32_t speed) + return NFP_NET_CFG_STS_LINK_RATE_UNKNOWN; @@ -55 +57 @@ -index 8429db68f0..d4fe8338b9 100644 +index 41d59bfa99..72286ab5c9 100644 @@ -58,4 +60,4 @@ -@@ -383,6 +383,8 @@ int nfp_net_vf_config_app_init(struct nfp_net_hw *net_hw, - bool nfp_net_version_check(struct nfp_hw *hw, - struct nfp_pf_dev *pf_dev); - void nfp_net_ctrl_bar_size_set(struct nfp_pf_dev *pf_dev); +@@ -282,6 +282,8 @@ int nfp_net_flow_ctrl_set(struct rte_eth_dev *dev, + void nfp_pf_uninit(struct nfp_pf_dev *pf_dev); + uint32_t nfp_net_get_port_num(struct nfp_pf_dev *pf_dev, + struct nfp_eth_table *nfp_eth_table);