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 3C087457A1 for ; Mon, 12 Aug 2024 15:04:59 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 374164065A; Mon, 12 Aug 2024 15:04:59 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2087.outbound.protection.outlook.com [40.107.236.87]) by mails.dpdk.org (Postfix) with ESMTP id 41C2E402C3 for ; Mon, 12 Aug 2024 15:04:57 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=zLLu4iD533Mdr4J6FDfoAGHwPC0RyFFQzA0ZQBQucS6Ghyi0DWv1BoiCvwbd+11AQnphEehq9J3qAxVpDFrQ0SQwGx+9dYBGQ1w4YaFLce92C5hHue8VqtiH8t9zcRi685ZNdzv/JxxPwbH2JCqq8bqdEMlzZANdO6VbKXTz+EI6v9hjS8AYQfEriRrJY4ayL7Q45h+GJhsVBLmetl47Clt2sfnBP/EVHHGy4ImRKsDhnN0lgKMhD12BYtcuZ4yKZMA7Rpcs5BlT7D8vgwnFDtyKgej1F0rcYJj11Ih66y7CC7dufXcoCRKQXDfSMizqJMhbdvpaD2w7XnXWQnwPFA== 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=HaxoJBO7DCIEAuTZq+JRpCk6VUfmc/ywoGhXNKUl3V0=; b=L6OxFv4C15tDUkSg+qirA1hRC++cU6WXCm3svjTn2wQH8SVHRWuy4sfhjYxfSnsdT86tKkvuw4yUVwAQgEcCWEmKZCqnbB1Uhk9VqbR8fvbtQWk1izcpILKYcBnbK9ECBFt+mueXmJYnh1VzajqRQ+RBej7WcndBgC8A5QO7fkg8rou5hz1BOahQ3s48GE62tnVLqY9HFoEXnqqZAHxTXgqP59vBFqdZVD3fQHiH2ydKMIqpIefPrzmDFhVMZxOokYGWsmfbbF79h2PdZdoHC43pX0MFxMAg5QPktCy3elYhWmM+Ny1FdOLzaMv1mb7s58kLg0JnpfSaBa7SihNKcA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.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=HaxoJBO7DCIEAuTZq+JRpCk6VUfmc/ywoGhXNKUl3V0=; b=MYrWlSH/j8CCFZna+Yd84k+WDz/bTgLYRZJCp2LUQBYcf9WXsgRzk5JVDwV3arIIzk6PkLzITXOCGcC0r/lDIMSpxal+T0LD+1NyHbHn0cHwB+iM8KsTX5wuaUW1iFDrOls0+iTgD7hvn8IifM0lSAWRbY8+ReTLKntQKB+UZicLHxqxzslKYaLAdq6370F36iONO/fPmjAhLZBBoxMwV/5gZMDi3Sq+3X1HtBmwqh2oct7cf0/mwnlTaET7ccLHO4HLEdpkq25lLkkWESsnApSu3CQZcsFQjEw7w1eXpZLgP38QuK7zMgPhD5+ypo7YoX6RB1B20M/0qDDtgYARxg== Received: from MW4PR03CA0182.namprd03.prod.outlook.com (2603:10b6:303:b8::7) by SJ2PR12MB9115.namprd12.prod.outlook.com (2603:10b6:a03:55c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22; Mon, 12 Aug 2024 13:04:52 +0000 Received: from SJ5PEPF00000204.namprd05.prod.outlook.com (2603:10b6:303:b8:cafe::88) by MW4PR03CA0182.outlook.office365.com (2603:10b6:303:b8::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.33 via Frontend Transport; Mon, 12 Aug 2024 13:04:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by SJ5PEPF00000204.mail.protection.outlook.com (10.167.244.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.8 via Frontend Transport; Mon, 12 Aug 2024 13:04:52 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 12 Aug 2024 06:04:37 -0700 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; Mon, 12 Aug 2024 06:04:35 -0700 From: Xueming Li To: Zhichao Zeng CC: , Bruce Richardson , "Song Jiale" , dpdk stable Subject: patch 'net/ice/base: fix temporary failures reading NVM' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:50:25 +0800 Message-ID: <20240812125035.389667-149-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-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: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF00000204:EE_|SJ2PR12MB9115:EE_ X-MS-Office365-Filtering-Correlation-Id: 903656a9-b380-46f6-75dd-08dcbacf5abd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?JZroYW6iPkpQGTusl/+Feis6m97aQ/ejKV/P9hqrqso+MkvZJMyuEvv3SU3m?= =?us-ascii?Q?ksglbJWsvc54NiYYwZfAU0CrT1ceXtM+b5re+NFljHLbFNV5KhP0kGbm+aFh?= =?us-ascii?Q?/3YrF3oqnDVdZV6H4XKC7q6+JE/SiRzqyOReOOQ0F5C+r8HeRcpDqroQmKX/?= =?us-ascii?Q?TnFzuEbIGiEbqoh0OITaHCmamR3YexDd63sZxpUzTA+DmAidteKo4S5nFqfr?= =?us-ascii?Q?7tzasNU7yeVtH3Ne7qXULGIq16V+4zOigcQPcFcr4EhEicNQ2PUNmaz5vu17?= =?us-ascii?Q?6F4EnT4mYDdaQwp97LHa6aKmetbLcm4QozsFr+nheCJWYz9NG8kggoky93Cg?= =?us-ascii?Q?3k1CQmA479p80bBjm18orw++tBe+i21lum17QJavEFpZQ8JwT283bMWTPixL?= =?us-ascii?Q?Oe1WyIuBIpREK0QfWp54ooSJ6vYdY2OUHzM6LfrVWIMb4MvobwQjobgIDakm?= =?us-ascii?Q?0Cr5aiYC6G8+7/eenb467+vD6ZegfuOhANuYPxHDgojGHGeVGPbwtDFMEOEH?= =?us-ascii?Q?gxAvhT/AbVsCQQFM5Tz3F1IEoU0WNZ1kc33WVeAUQLpdCcPNnSDnLbSZvZM8?= =?us-ascii?Q?ZITMopcqMGlQy6P8uPwJsD12BOFYll1Z0K4ZSveaVyez9jKSXjRAw7GC5JPh?= =?us-ascii?Q?7KF2kB6q06JtVTzBkE1COXmDFMhwG9A7rjjiPt/awERureggd0c1RFLQr1lA?= =?us-ascii?Q?2QTcQvcqbpu6+Rc6joV3FYiRxtcBAi6ZEQ3yHVz++DiwxT9vNb76rTDGMJD3?= =?us-ascii?Q?0SP+bgumTtcEuUsxfKwPtYDbGvNmUPGxygRWFlk2JMPrMTeYcbn5DVgySwwa?= =?us-ascii?Q?lZeMm0v5KL+VT5IKYKwUO9Q4Wg2NiRi2Zxqfs3aiRhPcl8ymp/ZOqvkBR/6b?= =?us-ascii?Q?OJqwbXQ1qokZFSPEaSd77NXuzHZxXJqM09+SBKbr4Ll4XT1xR+hiWEklpC8V?= =?us-ascii?Q?Fvj4zi9c3b18BldveOFKOBCIUwXRTUbXceYLNw+VH7WQe3hOhlEjrdap0/II?= =?us-ascii?Q?8MoqgYXeeEv2l/shwbUiYcdDDtpqNWHChRMW67blxiEAFlhZnFUP47sXwrG/?= =?us-ascii?Q?X4L6erXJv5cGnwCw5DvhbvdB2TyHWyQ3vmA5kZqpniFChriciOwdL/vc812t?= =?us-ascii?Q?5qU2qe65Et3d5Sjcaq+TVSrLmi5dRQd+2IwX5+FDX+ls1qQx0DddLhkjY/wM?= =?us-ascii?Q?ODXKmSrBgqF6TDJczMQilWFcVV9sB1b2cZD1gNVW5awZLRUWMx4P//+MWu+G?= =?us-ascii?Q?APJokjoHB50mJbbPkzl+0eX1E0ZvBGcdUo5M0oR+x0W+uCQlzefsvJj50tQF?= =?us-ascii?Q?rsHTY7iwW65Xm+efLU2GIjAstagJsPd+2APezBH//xcoItapise+0ZgGR2XS?= =?us-ascii?Q?YwWuyj0GDHAq+7bYVJXA7mfmotvgJ4aaXrYisG56UlpdXeS0CJdQb9RXyUIn?= =?us-ascii?Q?zjwvemLEVejaxqGn9cH/u5seQshK7JkB?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(1800799024)(36860700013)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 13:04:52.2817 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 903656a9-b380-46f6-75dd-08dcbacf5abd 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF00000204.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB9115 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/14/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=80da81b6f9695db69d2abf634dc1cdb59401b1b9 Thanks. Xueming Li --- >From 80da81b6f9695db69d2abf634dc1cdb59401b1b9 Mon Sep 17 00:00:00 2001 From: Zhichao Zeng Date: Tue, 23 Jul 2024 14:19:15 +0800 Subject: [PATCH] net/ice/base: fix temporary failures reading NVM Cc: Xueming Li [ upstream commit 04de5c7d40b24ef391bd5b51be23994a6cfdd867 ] Reading NVM fails in some scenarios, so follow the approach taken by kernel driver and add retries on read failures. Fixes: 2516684aed7a ("net/ice/base: extract logic of flat NVM read to function") Signed-off-by: Zhichao Zeng Reviewed-by: Bruce Richardson Tested-by: Song Jiale --- drivers/net/ice/base/ice_nvm.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/drivers/net/ice/base/ice_nvm.c b/drivers/net/ice/base/ice_nvm.c index 30e603127e..6b0794f562 100644 --- a/drivers/net/ice/base/ice_nvm.c +++ b/drivers/net/ice/base/ice_nvm.c @@ -72,6 +72,7 @@ ice_read_flat_nvm(struct ice_hw *hw, u32 offset, u32 *length, u8 *data, enum ice_status status; u32 inlen = *length; u32 bytes_read = 0; + int retry_cnt = 0; bool last_cmd; ice_debug(hw, ICE_DBG_TRACE, "%s\n", __func__); @@ -106,11 +107,24 @@ ice_read_flat_nvm(struct ice_hw *hw, u32 offset, u32 *length, u8 *data, offset, (u16)read_size, data + bytes_read, last_cmd, read_shadow_ram, NULL); - if (status) - break; - - bytes_read += read_size; - offset += read_size; + if (status) { + if (hw->adminq.sq_last_status != ICE_AQ_RC_EBUSY || + retry_cnt > ICE_SQ_SEND_MAX_EXECUTE) + break; + ice_debug(hw, ICE_DBG_NVM, + "NVM read EBUSY error, retry %d\n", + retry_cnt + 1); + ice_release_nvm(hw); + msleep(ICE_SQ_SEND_DELAY_TIME_MS); + status = ice_acquire_nvm(hw, ICE_RES_READ); + if (status) + break; + retry_cnt++; + } else { + bytes_read += read_size; + offset += read_size; + retry_cnt = 0; + } } while (!last_cmd); *length = bytes_read; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:07.175503728 +0800 +++ 0148-net-ice-base-fix-temporary-failures-reading-NVM.patch 2024-08-12 20:44:02.575069389 +0800 @@ -1 +1 @@ -From 04de5c7d40b24ef391bd5b51be23994a6cfdd867 Mon Sep 17 00:00:00 2001 +From 80da81b6f9695db69d2abf634dc1cdb59401b1b9 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 04de5c7d40b24ef391bd5b51be23994a6cfdd867 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 528489929e..5e982de4b5 100644 +index 30e603127e..6b0794f562 100644 @@ -23,2 +25,2 @@ -@@ -71,6 +71,7 @@ ice_read_flat_nvm(struct ice_hw *hw, u32 offset, u32 *length, u8 *data, - { +@@ -72,6 +72,7 @@ ice_read_flat_nvm(struct ice_hw *hw, u32 offset, u32 *length, u8 *data, + enum ice_status status; @@ -29 +30,0 @@ - int status; @@ -30,0 +32 @@ + ice_debug(hw, ICE_DBG_TRACE, "%s\n", __func__);