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 D5E2B43829 for ; Tue, 5 Mar 2024 16:35:59 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CFC4F42E23; Tue, 5 Mar 2024 16:35:59 +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 850B0410D3 for ; Tue, 5 Mar 2024 16:35:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652958; 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=6nnSd2mk/PfohPDRRdzSm3+9JsOXiw5Z7D9HeUXdZYM=; b=Slo7b+zzFWdc0dRndCZk1QRBkny3SV8lj+R2uyox9FRIfY/UIcV9/kIE0Nu5gaCP9CjopE Kbfn9hJlzOTxSlGtaCc9V53lgUuPRiH5OZFEbKqa/tzx5XRPMx0X26+MFhxp2vwQ0rU6Hh 79VgLVriA2ZK0hBlpTksmeOg/iqHkSM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-3-GPzA2n_lPU6tNEkSt0OH0g-1; Tue, 05 Mar 2024 10:35:55 -0500 X-MC-Unique: GPzA2n_lPU6tNEkSt0OH0g-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id AA93D18188B1; Tue, 5 Mar 2024 15:35:54 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id E3CC1200AE7F; Tue, 5 Mar 2024 15:35:53 +0000 (UTC) From: Kevin Traynor To: Dengdui Huang Cc: Jie Hai , dpdk stable Subject: patch 'net/hns3: fix disable command with firmware' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:34:17 +0000 Message-ID: <20240305153449.263666-44-ktraynor@redhat.com> In-Reply-To: <20240305153449.263666-1-ktraynor@redhat.com> References: <20240305153449.263666-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 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.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/11/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/a327482169f382747f71150316c5969e6937abb9 Thanks. Kevin --- >From a327482169f382747f71150316c5969e6937abb9 Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Fri, 8 Dec 2023 15:44:15 +0800 Subject: [PATCH] net/hns3: fix disable command with firmware [ upstream commit 66048270a49088f79c2a020bd28ee0a93c4a73ed ] Disable command only when need to delay handle reset. This patch fixes it. Fixes: 5be38fc6c0fc ("net/hns3: fix multiple reset detected log") Signed-off-by: Dengdui Huang Signed-off-by: Jie Hai --- drivers/net/hns3/hns3_ethdev.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index a805046d19..619346b5ac 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -5605,11 +5605,8 @@ hns3_detect_reset_event(struct hns3_hw *hw) last_req = hns3_get_reset_level(hns, &hw->reset.pending); vector0_intr_state = hns3_read_dev(hw, HNS3_VECTOR0_OTHER_INT_STS_REG); - if (BIT(HNS3_VECTOR0_IMPRESET_INT_B) & vector0_intr_state) { - __atomic_store_n(&hw->reset.disable_cmd, 1, __ATOMIC_RELAXED); + if (BIT(HNS3_VECTOR0_IMPRESET_INT_B) & vector0_intr_state) new_req = HNS3_IMP_RESET; - } else if (BIT(HNS3_VECTOR0_GLOBALRESET_INT_B) & vector0_intr_state) { - __atomic_store_n(&hw->reset.disable_cmd, 1, __ATOMIC_RELAXED); + else if (BIT(HNS3_VECTOR0_GLOBALRESET_INT_B) & vector0_intr_state) new_req = HNS3_GLOBAL_RESET; - } if (new_req == HNS3_NONE_RESET) @@ -5617,4 +5614,5 @@ hns3_detect_reset_event(struct hns3_hw *hw) if (last_req == HNS3_NONE_RESET || last_req < new_req) { + __atomic_store_n(&hw->reset.disable_cmd, 1, __ATOMIC_RELAXED); hns3_schedule_delayed_reset(hns); hns3_warn(hw, "High level reset detected, delay do reset"); -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:55.703198202 +0000 +++ 0044-net-hns3-fix-disable-command-with-firmware.patch 2024-03-05 14:08:54.667520810 +0000 @@ -1 +1 @@ -From 66048270a49088f79c2a020bd28ee0a93c4a73ed Mon Sep 17 00:00:00 2001 +From a327482169f382747f71150316c5969e6937abb9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 66048270a49088f79c2a020bd28ee0a93c4a73ed ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index bccd9db0dd..d626bdd5b1 100644 +index a805046d19..619346b5ac 100644 @@ -22 +23 @@ -@@ -5553,11 +5553,8 @@ hns3_detect_reset_event(struct hns3_hw *hw) +@@ -5605,11 +5605,8 @@ hns3_detect_reset_event(struct hns3_hw *hw) @@ -36 +37 @@ -@@ -5565,4 +5562,5 @@ hns3_detect_reset_event(struct hns3_hw *hw) +@@ -5617,4 +5614,5 @@ hns3_detect_reset_event(struct hns3_hw *hw)