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 6580043699 for ; Thu, 7 Dec 2023 12:21:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6012342F06; Thu, 7 Dec 2023 12:21:54 +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 874D042EF4 for ; Thu, 7 Dec 2023 12:21:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701948111; 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=gyNsmgf5jeV/C+RWT7b4o57uDZUicL3NU+mSJfJUOFY=; b=Yj8D+ZjRmTe23DCjlf4NdYLt6GCaO+wPqArhjA3fvv/7GyBn3qZOeB2XexTxFgUOvp7YAI VEaXLRyp5gowPr1m+kkQmzw7hn/7P5y9OdWhMLFqi6tn38S3c7uEoF6R7dEcr16VDGs+mz HLJ6OhOOTy1h40uxVrO7Tmt5O1rAFWg= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-527-jNGjpJtaPfqN7FOhwQlTgg-1; Thu, 07 Dec 2023 06:21:47 -0500 X-MC-Unique: jNGjpJtaPfqN7FOhwQlTgg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 418623C2A1C9; Thu, 7 Dec 2023 11:21:47 +0000 (UTC) Received: from rh.Home (unknown [10.39.192.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 84C98C185A0; Thu, 7 Dec 2023 11:21:46 +0000 (UTC) From: Kevin Traynor To: Dengdui Huang Cc: Jie Hai , dpdk stable Subject: patch 'net/hns3: fix ignored reset event' has been queued to stable release 21.11.6 Date: Thu, 7 Dec 2023 11:21:11 +0000 Message-ID: <20231207112116.769502-19-ktraynor@redhat.com> In-Reply-To: <20231207112116.769502-1-ktraynor@redhat.com> References: <20231207112116.769502-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 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.6 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/12/23. 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/0dece2892b8a59d3fd4dbca5f9ea3a96e2b13837 Thanks. Kevin --- >From 0dece2892b8a59d3fd4dbca5f9ea3a96e2b13837 Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Mon, 27 Nov 2023 21:39:01 +0800 Subject: [PATCH] net/hns3: fix ignored reset event [ upstream commit 4c40006c4b6b3c567185c84d60535752c9f7ea3d ] The code logic that only new reset whose level is higher than old reset level will be addressed is added in 'hns3_detect_reset_event()', in fixed commit. When the new reset is detected and the old reset level is HNS3_NONE_RESET this reset will be ignored. This patch fix it. Fixes: 5be38fc6c0fc ("net/hns3: fix multiple reset detected log") Signed-off-by: Dengdui Huang Acked-by: Jie Hai --- drivers/net/hns3/hns3_ethdev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index e4d2b06521..a805046d19 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -5613,5 +5613,8 @@ hns3_detect_reset_event(struct hns3_hw *hw) } - if (new_req != HNS3_NONE_RESET && last_req < new_req) { + if (new_req == HNS3_NONE_RESET) + return HNS3_NONE_RESET; + + if (last_req == HNS3_NONE_RESET || last_req < new_req) { hns3_schedule_delayed_reset(hns); hns3_warn(hw, "High level reset detected, delay do reset"); -- 2.43.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-07 11:19:00.053206904 +0000 +++ 0019-net-hns3-fix-ignored-reset-event.patch 2023-12-07 11:18:59.644873985 +0000 @@ -1 +1 @@ -From 4c40006c4b6b3c567185c84d60535752c9f7ea3d Mon Sep 17 00:00:00 2001 +From 0dece2892b8a59d3fd4dbca5f9ea3a96e2b13837 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4c40006c4b6b3c567185c84d60535752c9f7ea3d ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 941d047bf1..ae81368f68 100644 +index e4d2b06521..a805046d19 100644 @@ -26 +27 @@ -@@ -5561,5 +5561,8 @@ hns3_detect_reset_event(struct hns3_hw *hw) +@@ -5613,5 +5613,8 @@ hns3_detect_reset_event(struct hns3_hw *hw)