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 1E8DC45CE3 for ; Mon, 11 Nov 2024 07:38:39 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 159284067A; Mon, 11 Nov 2024 07:38:39 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2077.outbound.protection.outlook.com [40.107.237.77]) by mails.dpdk.org (Postfix) with ESMTP id 4C55640E1F for ; Mon, 11 Nov 2024 07:38:38 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=LfDmT2Om8KRS6zZ+MdCskym9JmAMqfLiW3AgqebdFdM/bS25coxU1N+G7c0FR3v/4Sf99l97gUYLUPbBMizx0g8mFtmE1AGWGw0bHqxrRxVGxpKtjzurfgwv/cDgD8apzVhY8xvvSq/7Tx4gfFgm68ySSeYLIYu/ppWV/WyJ40iQ6Gx2/OfIOSYEaWMtkTmYEf6F7nSaNDNOKBNYeEFXfFAwQwdCOWyEO7cAKOZ+6rHbFPaZrubHg1R222NKOLWGzHSOFR0lt6MN9ZyQDyhL3mxH99Ixi8t3rxWyb3iaUYy47QjebaCetBor7ECrj/aaLtAYnwm8we8xrM7DA/28HA== 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=QALZzYgXhF/SrOlrWHVAuafVwwKRzgumw9NTxjk4850=; b=WL0EPGggMNWIo9sQwOC9Qd/yBzloOlM2DRfpQbHijCeZnn823Qd4KxvsvegdlddnWlv+6T3fXmOfVOYuKK0fHuIvEudsASO9YWfmdBTopeBZUASao3sJPx/3c00hTL/edPFCrwy0Nkggzv8wc5jCW5ASqq7Zv/q7MiKCAhIgFw9UWp/IvxGOcIqKkq5C1F/5GcxpOzLaBWPg5Xs6aSkvhVfRCPbdmODjblMKVD1QH42JtAnq1zWMa2q01EF5gHOwCOTL8fpDxCBuMK5IwH4boHxrWYTpIt4GLW4dX/9KBaVZspfQeI/nAHIX/9iAhyI0ADpwhfaB5niZ1YGA/jIR+g== 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=QALZzYgXhF/SrOlrWHVAuafVwwKRzgumw9NTxjk4850=; b=bY5ZL8+WrsXI1HWV5yqemv+LfNA2fWfnl08DzZquUL3SISdMhgoawlWlaSZExkzq8ZQzapm7PdUDE19ZjUm5xcznQODWBsD6G24zuHS7czR36eBp9vleLJpL4ZJsGLKJ15ZASzCAu25UgHQlrhRjWYNlNOSfd6JqkZn6cqtjCNkyrM32r7Uqi9GMbZM/ZLdOXBVSKHf/I4pVO7IfrjQIAvUlkva5Vgpe+RbAGiSATEaXpsVxeiUSRPcs5Tup/QiEMzkeAmIwwUcQ+SxoWr8EzhKpRBTSO29/tYONbL2WS9PiX9Bpv/u+KRCF0mx1rAJK2ZIcrWUxh1NrWViVCkPEDg== Received: from SN4PR0501CA0097.namprd05.prod.outlook.com (2603:10b6:803:42::14) by PH7PR12MB9203.namprd12.prod.outlook.com (2603:10b6:510:2f2::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:38:35 +0000 Received: from SN1PEPF0002636C.namprd02.prod.outlook.com (2603:10b6:803:42:cafe::d6) by SN4PR0501CA0097.outlook.office365.com (2603:10b6:803:42::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.14 via Frontend Transport; Mon, 11 Nov 2024 06:38:35 +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 SN1PEPF0002636C.mail.protection.outlook.com (10.167.241.137) 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:38:34 +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:38:24 -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:38:21 -0800 From: Xueming Li To: Qin Ke CC: , Chaoyong He , Long Wu , Peng Zhang , dpdk stable Subject: patch 'net/nfp: fix representor port link status update' has been queued to stable release 23.11.3 Date: Mon, 11 Nov 2024 14:28:17 +0800 Message-ID: <20241111062847.216344-92-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: SN1PEPF0002636C:EE_|PH7PR12MB9203:EE_ X-MS-Office365-Filtering-Correlation-Id: 5dee7f15-cfa2-4869-4d69-08dd021b77a6 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?1ujdGS9wFMvRQJOfo2v5hAmePssVoLQNHtX11lIf5IJxcGjw8V7tlrHVKTpB?= =?us-ascii?Q?6S5Yl/ct9LklvWs//Lsoos0mft8S1qTSaB7fFoCg/jTtihBMW9iTAx3vwWFK?= =?us-ascii?Q?EK/J+h60PwkvyqN52Fa0iSXsi/Amn128dze4oYShvum2GcCAtlnyPsLld1Ri?= =?us-ascii?Q?K9FVL0vzX+GlaTTQE5dP2I1bzKXb7yb8Ersx2WhvZb0XGCDoS8140xAileAA?= =?us-ascii?Q?C1ffNn0gUPwUBskGxn3LdIQEUbvaxI9AgsqKAU9lW3vayhouH8NffA2Fd57y?= =?us-ascii?Q?PcBlk/Gx8J6Kam0vFPjnsfVGAN2jXfNbMXYmPEBVK9DEsvR7tTuIxaPf2gom?= =?us-ascii?Q?qHg4miNrVX0DdivBKHJJCO+940kdGJGN3FYaJNCbD3Jq482SKxISDUyHgvCr?= =?us-ascii?Q?r9+U0+cebujoxrJ/UVuVW2I8WuqfYBTO6cnHxOezIpdNmzQ7vNRyLh50QqWv?= =?us-ascii?Q?1Pqtut7+sf9zW0b07TOyN3RDs41FJ+m4jXAa57iEalXusyrVphx6+q2RM9/S?= =?us-ascii?Q?86ZIUNkPuh4aeCOsJGst7XBE9EdmI7nHTLRtEOZmlHiDzd5w33VhDn7JO04E?= =?us-ascii?Q?QJYR6+MPRcA5trK1GkIPRW0KNPVxkwl/6fjM0O4eTpgDOumxIJJCeIQjB/mW?= =?us-ascii?Q?xNDZU15tfNfi0ISwJndt88jRRAhkihuNlC1SDUjqqrS1c1E1CSZxgpFKgHBw?= =?us-ascii?Q?8SPeJC9BJTP2SOoWCUisS3dra7UArBmTOz8YR8O8MErbJrkku2h0u0NUkJoP?= =?us-ascii?Q?PPdYcXZyYe491eW8Fg5Od5l74JD9LeIsLD3CUsaigK+xHI1FcBVBGP57pFaa?= =?us-ascii?Q?CsAJHj2CQtvfE3u2HOpt/E+wG0e56xf74aga244CN4uh5wW68TxFugnh6mzx?= =?us-ascii?Q?z3sZgsDBJaAt3QdgW/P+KDFG77xuiGBDXiryadMKYKxESSAHTOy1z7bdkatn?= =?us-ascii?Q?iXeaIIlaS5nmqqs9mWD5tvERBMQSYvpwPEbD74kB8Z56IbBO/0RzXdINlFD/?= =?us-ascii?Q?SuWa612CKCo9/X/XBFh4ZUQgJjAeO+s5kvTFMdc6Qj6G2AbixPDAgqxx7Bze?= =?us-ascii?Q?It0PSHgzzX22dqaUa3feuWx3o8HYS0uUkVW+G24g7oGaAKiTgzxL5MHEXcNz?= =?us-ascii?Q?jFyFqLncUUMyV49WcikLW/iTpx65lDsYJQKX/hiQnahnhRcto3ZBSl1Z5oel?= =?us-ascii?Q?L3r4pCjgi7EyJsMwUzCW65DZeYzok1mUbfDMtWjXCmvsiaWk040zJAqRxdJc?= =?us-ascii?Q?QaOdfpkl6rcSXajXtUTD3bRlCstVtkwcN9KfyGCZpqxg3u3PZI/3mElcaaCB?= =?us-ascii?Q?HOdg6+OKirKJ0f1FaOe+9+7x+zHN7U/Hdqqe1f5mUHflTBJhxjQcsK/G9O99?= =?us-ascii?Q?MWqd5ji7yLa5pA2bzo5wk7x5umi2QxIdDpXPgef+glIjTDlBFg=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:38:34.9832 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5dee7f15-cfa2-4869-4d69-08dd021b77a6 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: SN1PEPF0002636C.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9203 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=d2484a7f388c787198637ea4e39a2722ab231f15 Thanks. Xueming Li --- >From d2484a7f388c787198637ea4e39a2722ab231f15 Mon Sep 17 00:00:00 2001 From: Qin Ke Date: Thu, 5 Sep 2024 14:25:11 +0800 Subject: [PATCH] net/nfp: fix representor port link status update Cc: Xueming Li [ upstream commit d95cf21d2ed6630d21b5b1ca4abc40155720cd3f ] The link status of representor port is reported by the flower firmware through control message and it already parsed and stored in the 'link' field of representor port structure. The original logic read link status from the control BAR again, and use it rather then the 'link' field of the representor port structure in the following logic wrongly. Fix this by delete the read control BAR statement and use the right link status value. Fixes: c4de52eca76c ("net/nfp: remove redundancy for representor port") Signed-off-by: Qin Ke Reviewed-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/flower/nfp_flower_representor.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c index 88fb6975af..23709acbba 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -23,7 +23,6 @@ nfp_flower_repr_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete) { int ret; - uint32_t nn_link_status; struct nfp_net_hw *pf_hw; struct rte_eth_link *link; struct nfp_flower_representor *repr; @@ -32,9 +31,7 @@ nfp_flower_repr_link_update(struct rte_eth_dev *dev, link = &repr->link; pf_hw = repr->app_fw_flower->pf_hw; - nn_link_status = nn_cfg_readw(&pf_hw->super, NFP_NET_CFG_STS); - - ret = nfp_net_link_update_common(dev, pf_hw, link, nn_link_status); + ret = nfp_net_link_update_common(dev, pf_hw, link, link->link_status); return ret; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-11 14:23:09.255512556 +0800 +++ 0091-net-nfp-fix-representor-port-link-status-update.patch 2024-11-11 14:23:05.232192837 +0800 @@ -1 +1 @@ -From d95cf21d2ed6630d21b5b1ca4abc40155720cd3f Mon Sep 17 00:00:00 2001 +From d2484a7f388c787198637ea4e39a2722ab231f15 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit d95cf21d2ed6630d21b5b1ca4abc40155720cd3f ] @@ -18 +20,0 @@ -Cc: stable@dpdk.org @@ -25,2 +27,2 @@ - drivers/net/nfp/flower/nfp_flower_representor.c | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) + drivers/net/nfp/flower/nfp_flower_representor.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) @@ -29 +31 @@ -index 054ea1a938..5db7d50618 100644 +index 88fb6975af..23709acbba 100644 @@ -32 +34 @@ -@@ -29,18 +29,13 @@ nfp_flower_repr_link_update(struct rte_eth_dev *dev, +@@ -23,7 +23,6 @@ nfp_flower_repr_link_update(struct rte_eth_dev *dev, @@ -37 +39 @@ -- struct nfp_net_hw *pf_hw; + struct nfp_net_hw *pf_hw; @@ -40,2 +42 @@ - - repr = dev->data->dev_private; +@@ -32,9 +31,7 @@ nfp_flower_repr_link_update(struct rte_eth_dev *dev, @@ -44 +45 @@ -- pf_hw = repr->app_fw_flower->pf_hw; + pf_hw = repr->app_fw_flower->pf_hw; @@ -47,2 +48,2 @@ -- ret = nfp_net_link_update_common(dev, link, nn_link_status); -+ ret = nfp_net_link_update_common(dev, link, link->link_status); +- ret = nfp_net_link_update_common(dev, pf_hw, link, nn_link_status); ++ ret = nfp_net_link_update_common(dev, pf_hw, link, link->link_status);