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 BE69745E41 for ; Sat, 7 Dec 2024 09:07:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B640F40281; Sat, 7 Dec 2024 09:07:17 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2052.outbound.protection.outlook.com [40.107.243.52]) by mails.dpdk.org (Postfix) with ESMTP id 2E55640281 for ; Sat, 7 Dec 2024 09:07:16 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=syvTKdc6bZGCfe3g97ZI8TZRAYzORRjVJVvrPuH5LtwnEes1ICz53XExXRYQAGkF/8CfZESMwO+H1otfrNCYoI+bue7qXQN+CSRSngh6WQXbxc9kkp5b9BpoY8YxpJF5rVuySR/5GbJ9FWqwAtgxlLfk3yMGf9+xF/KO3/7SEi8UKLEHOXVYQ2zgUyRp7Qo6iZO0NAhpV9XFsVWpibPF+JK7VJGarl8ZXagX5vdGLhzbyf36axlO8iwRxuBKbAEn4x0ed9kntAYgnFy3gv9Mbl0sMb15XP15QlgtsQ1LtjwAxFBnqaT1GL6yqVLsYDD9UyPO7icoSLzoE61WrOAhYA== 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=/hcljzPc83123fdx+AkQaemRwgfzGMDtzb4bBQ8/qws=; b=mKflk3dnHMrPIpBLD5jiK489WpJvHOxVK/Qx7Hy4VBq4Ztjsbc3sUXSI6f+Ev/VBr90uSp080iEDRY/E5RyVZRU2GwQ+/bcwp4EVK6MrT4HvX63Qsqb0NgIh2TKN02MeVLmGbxp6m7tFoSlHZ5kQxkURpgBD16vgBSiThneyUM4Zpxt4rKnvb+hX0guhnrMUDoB9ZnOY5GScH23b6HjxXrinmFWQ5wQvS+++MdXD4yIKW6nKFMEOGyQqlHhlepCYmYDnxZz8LZ5r1T2fRwAflA081ExzaUUNpAehikR6D2TSI4lIPOcpceCXDLSf3Jg74ad2T/Ym8MEH6Akoks1hKA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=networkplumber.org 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=/hcljzPc83123fdx+AkQaemRwgfzGMDtzb4bBQ8/qws=; b=nUQ2A/FkDRQ0kyIH3VMZWa5JITvdWskwOC54S5MW1vLVaOLxKsqkKFl4+pfFlrfSpJGzGE3V8k0Rf78CERaAVyvKwtFGNuf6gBS+FyHAs6HJ/cawZN6bSAtyWP1ftwjCzcsgDYc6FQJrUSngsHRmgQpYLaLop3uvfdfgGpS/kfAarenk7O4amjDDoVFOJHmlcWV8AkqavZPk3Cpo+zTX5N/hqlAsvWbsijC0QKuilCTKRKsnX5E7UWC1EpSYjCmc+2hdgvhAlwbCAEKafKn0hqjnobuFUfCX59kkp/8HXIsCQdUdLzPvC7nxB7r0TKgpTKu5kDvy6tA49c68cElCrw== Received: from BLAPR03CA0015.namprd03.prod.outlook.com (2603:10b6:208:32b::20) by CH3PR12MB8725.namprd12.prod.outlook.com (2603:10b6:610:170::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.11; Sat, 7 Dec 2024 08:07:11 +0000 Received: from BL02EPF00021F68.namprd02.prod.outlook.com (2603:10b6:208:32b:cafe::2a) by BLAPR03CA0015.outlook.office365.com (2603:10b6:208:32b::20) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8230.10 via Frontend Transport; Sat, 7 Dec 2024 08:07:11 +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 BL02EPF00021F68.mail.protection.outlook.com (10.167.249.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.7 via Frontend Transport; Sat, 7 Dec 2024 08:07:10 +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; Sat, 7 Dec 2024 00:06:57 -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; Sat, 7 Dec 2024 00:06:55 -0800 From: Xueming Li To: Stephen Hemminger CC: Xueming Li , dpdk stable Subject: patch 'net/bnx2x: fix possible infinite loop at startup' has been queued to stable release 23.11.3 Date: Sat, 7 Dec 2024 16:00:18 +0800 Message-ID: <20241207080055.488538-61-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241207080055.488538-1-xuemingl@nvidia.com> References: <20241111062847.216344-122-xuemingl@nvidia.com> <20241207080055.488538-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: BL02EPF00021F68:EE_|CH3PR12MB8725:EE_ X-MS-Office365-Filtering-Correlation-Id: 977b971b-468b-4d7e-3ffd-08dd1696267c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|82310400026|36860700013|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Oz/3+3A2p/srUK8MbtvUs+SEVepO4h5wulbQJQT0rcm7/NanbR7O3wwwwTMs?= =?us-ascii?Q?bqZWtOwJc2fzuzMbeOmI8vzXDavUiTGerj4/c0VdnH6RIaq7KkdDzIaswdWI?= =?us-ascii?Q?4+dJ526gzrVJsrDjiBeuLMfaAOrhME9mG92d8k6XpC1g9mZ61ZXxA55xVMo2?= =?us-ascii?Q?XV8ttVJMe8TFUegkfUIHIBepRTmw//Rda14SOtxo8fVhZuedSmgGvNMx8YrP?= =?us-ascii?Q?qQPjl70JTknV1KbbKZqs9kKFdzW2o4/Y6YxWpeKQhQpXFfiW+Va0zthGx0PD?= =?us-ascii?Q?Ifmj2kOIVYQYlTTiBdmLBvVtWDFjIqGg4Z8RHCte9dEoMShBhTPVyNeu3ph7?= =?us-ascii?Q?1skKgxEhBH+VlVJfG8YVjWoRKgPQrDaZaPDsdrXn/TIze7B7nvxaY3f7rvFy?= =?us-ascii?Q?NGJS1DWESAAXn8jIG+Xb4WJRVucenMyYVR+2FcMqL1X/XCsb8C5Ea+OC+JaP?= =?us-ascii?Q?YJMUUCxPZRxZgNsy5Nc+qQwAZmYxfHkHrS2BUdH319vMoAQ9VobhzPicQGXc?= =?us-ascii?Q?/A2LNA9DOM8zKwPPbB9sRzlmKnjOphFH8tJJ2bv3oYP6wyAqBMLcv0/Htbm9?= =?us-ascii?Q?3/h9eAVee3uu8T026izKxfaKM/1MlGcKw3S2fqpfsSD4nIymr9ysD6TE57Rv?= =?us-ascii?Q?UFFq+hI+UXxqdDz3Wrr+vJTHPqoNNGXwQnz8mE1ouwVsRaX8nfjBooNi0G7d?= =?us-ascii?Q?JdjuxqcGy0tBS3+KkMCnOx26ZGKyTxTrSwlI+LICnsC1qAV3BNgmYOVxnUW4?= =?us-ascii?Q?UdZuPDDAX6mpqxvdlpPprGL3i69113D2nj+mwmstauYh0C8zAahnq1F5fEhD?= =?us-ascii?Q?qN8MublfohBNJlsoxE9BI/4lEk7Xm2l2B4HAnyuAMYA6rRbj7HebddMQTcvP?= =?us-ascii?Q?efyV3Frk0g5kv/64brpEXfOzu1ayfHIPEk73VV9ST7EGkDYqp5TMoW5+O1Ln?= =?us-ascii?Q?o30PL3XGWfubvWlMCuI9rsCrO9+yqjGCoAisox48KFtz4vu5RrTmNkjYGRZA?= =?us-ascii?Q?FmMkBSyiA4tuk2wZI2m+LMJ7uDVDimnUvraX/CK2tC2Cb1r32u/mr0Vv530K?= =?us-ascii?Q?udCEhDY9Q3jTMWTsCivP5W7kr2X+VBVZidI7Oh60pbi3M6Tx6QOn7adkP2L6?= =?us-ascii?Q?xrNC83av0WLTa9gCpi7mUUPuDj6E09OUP1s7iDGri+nevMMrQ4LiSGBuEghR?= =?us-ascii?Q?7A9j2DyWKM4A3nxjjWE16IdPYTY1N40KcaNLzQ+wY+v9rVmHHOrDNndphjNP?= =?us-ascii?Q?vsUUGzLE0CLMNCqjrLhFSGClq/bbiFJLUJAiHglX0EFNmiIjY4dt3irdZ2qu?= =?us-ascii?Q?kRZA0XZ8837dr91rjjWJC1qZssrPyQRzQmrTmF+uBznn9Ual1DyL6LOsoVwA?= =?us-ascii?Q?asj7lDUawL+VR742KTKu2W6QRNtKgbA8OuYFLWjNwx4aSKTm3hnFaneRSNm7?= =?us-ascii?Q?XCQfhikJLT3cysRUhaeXDo7gdqhR+yJQ?= 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)(1800799024)(376014)(82310400026)(36860700013)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2024 08:07:10.1029 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 977b971b-468b-4d7e-3ffd-08dd1696267c 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: BL02EPF00021F68.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8725 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 12/10/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=7315de38074fb4a9087a3d3696b1318f68fcc1c1 Thanks. Xueming Li --- >From 7315de38074fb4a9087a3d3696b1318f68fcc1c1 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 12 Nov 2024 09:43:55 -0800 Subject: [PATCH] net/bnx2x: fix possible infinite loop at startup Cc: Xueming Li [ upstream commit a47272b052dd1c8c571a1c0b89b56aaa3ebf4351 ] Coverity spotted that one of the loop conditions was always true. Fix by initializing the variable using same logic as Linux kernel driver. Coverity issue: 362057 Fixes: 540a211084a7 ("bnx2x: driver core") Signed-off-by: Stephen Hemminger --- drivers/net/bnx2x/bnx2x.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c index af31ac4604..d96fcb55c9 100644 --- a/drivers/net/bnx2x/bnx2x.c +++ b/drivers/net/bnx2x/bnx2x.c @@ -10331,12 +10331,13 @@ static int bnx2x_init_hw_common(struct bnx2x_softc *sc) REG_WR(sc, PXP2_REG_RD_DISABLE_INPUTS, 0); if (!CHIP_IS_E1x(sc)) { - int factor = 0; + int factor = CHIP_REV_IS_EMUL(sc) ? 1000 : + (CHIP_REV_IS_FPGA(sc) ? 400 : 0); ecore_init_block(sc, BLOCK_PGLUE_B, PHASE_COMMON); ecore_init_block(sc, BLOCK_ATC, PHASE_COMMON); -/* let the HW do it's magic... */ + /* let the HW do it's magic... */ do { DELAY(200000); val = REG_RD(sc, ATC_REG_ATC_INIT_DONE); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-12-06 23:26:46.058237404 +0800 +++ 0060-net-bnx2x-fix-possible-infinite-loop-at-startup.patch 2024-12-06 23:26:43.973044828 +0800 @@ -1 +1 @@ -From a47272b052dd1c8c571a1c0b89b56aaa3ebf4351 Mon Sep 17 00:00:00 2001 +From 7315de38074fb4a9087a3d3696b1318f68fcc1c1 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit a47272b052dd1c8c571a1c0b89b56aaa3ebf4351 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org