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 7EB9745DB9 for ; Wed, 27 Nov 2024 18:23:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7B0BD40B8F; Wed, 27 Nov 2024 18:23:09 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 48D6E40A82 for ; Wed, 27 Nov 2024 18:23:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728187; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tp6TTt+NeCzc7V9AgJxfZWpaN6/UZ3RqFPz75i7IRCY=; b=dmYMfB7W812MpdP6mPH7Y2+NU1NoElvMKEMWvRtKhhyvM/y/uLJnytMif8PUGO1QrcCYci mD5wLdbWs4m+UnPuOG8nWeAO5dbTe61Az29OzxMAdH+p2cMPnHeGpj6sWlrE+tr273r2xf hA0tysleK1UkTA3cUPM5I/jtOhd+sN0= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-643-kW0kBsogMGidRqJz00eZ5w-1; Wed, 27 Nov 2024 12:23:06 -0500 X-MC-Unique: kW0kBsogMGidRqJz00eZ5w-1 X-Mimecast-MFC-AGG-ID: kW0kBsogMGidRqJz00eZ5w Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4C9C71955F3C; Wed, 27 Nov 2024 17:23:05 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 402E930001A2; Wed, 27 Nov 2024 17:23:03 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: dpdk stable Subject: patch 'net/bnx2x: fix possible infinite loop at startup' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:18:50 +0000 Message-ID: <20241127171916.690404-103-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: KWMMrtqmsw2JYFMC4nkk3dCiS8-N6DhGOa0qVn9ULSs_1732728185 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.9 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/02/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/25c2e093b2c9b324f555c90acd789c1ae3c0553d Thanks. Kevin --- >From 25c2e093b2c9b324f555c90acd789c1ae3c0553d 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 [ 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 8e6d2c5c80..a93642650a 100644 --- a/drivers/net/bnx2x/bnx2x.c +++ b/drivers/net/bnx2x/bnx2x.c @@ -10338,10 +10338,11 @@ static int bnx2x_init_hw_common(struct bnx2x_softc *sc) 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); -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:41.500371309 +0000 +++ 0103-net-bnx2x-fix-possible-infinite-loop-at-startup.patch 2024-11-27 17:17:38.323269881 +0000 @@ -1 +1 @@ -From a47272b052dd1c8c571a1c0b89b56aaa3ebf4351 Mon Sep 17 00:00:00 2001 +From 25c2e093b2c9b324f555c90acd789c1ae3c0553d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a47272b052dd1c8c571a1c0b89b56aaa3ebf4351 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index af31ac4604..d96fcb55c9 100644 +index 8e6d2c5c80..a93642650a 100644 @@ -23 +24 @@ -@@ -10332,10 +10332,11 @@ static int bnx2x_init_hw_common(struct bnx2x_softc *sc) +@@ -10338,10 +10338,11 @@ static int bnx2x_init_hw_common(struct bnx2x_softc *sc)