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 438C643699 for ; Thu, 7 Dec 2023 12:21:52 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 39DB342F0B; Thu, 7 Dec 2023 12:21:52 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 87ACC42F04 for ; Thu, 7 Dec 2023 12:21:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701948110; 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=HykV9+axV9fMhK9wNUobIXTHuCX8tjH6U2DMfEdL/no=; b=fF/iQgDlqqJJrwy3caoyk02PUu8mviE/L3PBoFOBVFrfCaU7LbzToNZ4SaccmKqUgV8NtI WQkmq73baRcPkBqm2GjKhvh0AZB7Q5SqBNU3Axx7/B8vQ6Kn3KmqrXmcCZEty805eV6o1W TviKX90ifuRWYYqaSjxHph8+Y08EmxY= 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-632-dSWb7PTpMx6bgT-L4bU3iw-1; Thu, 07 Dec 2023 06:21:48 -0500 X-MC-Unique: dSWb7PTpMx6bgT-L4bU3iw-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 5A5711C0BB41; Thu, 7 Dec 2023 11:21:48 +0000 (UTC) Received: from rh.Home (unknown [10.39.192.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 96A6EC185A0; Thu, 7 Dec 2023 11:21:47 +0000 (UTC) From: Kevin Traynor To: Dengdui Huang Cc: Jie Hai , dpdk stable Subject: patch 'net/hns3: fix reset event status' has been queued to stable release 21.11.6 Date: Thu, 7 Dec 2023 11:21:12 +0000 Message-ID: <20231207112116.769502-20-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/90236089a26cfd1bd92eda63cb29c6ab05baa670 Thanks. Kevin --- >From 90236089a26cfd1bd92eda63cb29c6ab05baa670 Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Mon, 27 Nov 2023 21:39:02 +0800 Subject: [PATCH] net/hns3: fix reset event status [ upstream commit b59a0cbec866a8d4f7d1938b6826f7961c75c9fd ] The function hns3_clear_reset_event is used to clear PF reset status, The VF shouldn't use it. This patch fixes it. Fixes: 1eee1ea75c0e ("net/hns3: fix IMP or global reset") Signed-off-by: Dengdui Huang Acked-by: Jie Hai --- drivers/net/hns3/hns3_intr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/hns3/hns3_intr.c b/drivers/net/hns3/hns3_intr.c index a2c7a90e41..9c5a4b018c 100644 --- a/drivers/net/hns3/hns3_intr.c +++ b/drivers/net/hns3/hns3_intr.c @@ -2731,5 +2731,6 @@ hns3_reset_post(struct hns3_adapter *hns) hns3_notify_reset_ready(hw, false); hns3_clear_reset_level(hw, &hw->reset.pending); - hns3_clear_reset_event(hw); + if (!hns->is_vf) + hns3_clear_reset_event(hw); __atomic_store_n(&hns->hw.reset.resetting, 0, __ATOMIC_RELAXED); hw->reset.attempts = 0; -- 2.43.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-07 11:19:00.078032406 +0000 +++ 0020-net-hns3-fix-reset-event-status.patch 2023-12-07 11:18:59.646873992 +0000 @@ -1 +1 @@ -From b59a0cbec866a8d4f7d1938b6826f7961c75c9fd Mon Sep 17 00:00:00 2001 +From 90236089a26cfd1bd92eda63cb29c6ab05baa670 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b59a0cbec866a8d4f7d1938b6826f7961c75c9fd ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -17,2 +18,2 @@ - drivers/net/hns3/hns3_intr.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) + drivers/net/hns3/hns3_intr.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) @@ -21 +22 @@ -index c5a3e3797c..52b5435a23 100644 +index a2c7a90e41..9c5a4b018c 100644 @@ -24 +25 @@ -@@ -2750,5 +2750,6 @@ hns3_reset_post(struct hns3_adapter *hns) +@@ -2731,5 +2731,6 @@ hns3_reset_post(struct hns3_adapter *hns) @@ -32,8 +32,0 @@ -@@ -2800,5 +2801,6 @@ hns3_reset_fail_handle(struct hns3_adapter *hns) - - hns3_clear_reset_level(hw, &hw->reset.pending); -- hns3_clear_reset_event(hw); -+ if (!hns->is_vf) -+ hns3_clear_reset_event(hw); - if (hns3_reset_err_handle(hns)) { - hw->reset.stage = RESET_STAGE_PREWAIT;