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 628A842ECF for ; Thu, 20 Jul 2023 17:32:07 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5E4A140685; Thu, 20 Jul 2023 17:32:07 +0200 (CEST) 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 D48F8400D6 for ; Thu, 20 Jul 2023 17:32:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689867126; 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=/IuyqdEP7K6vGxm4rQF+WtaNFnXMT3PV+Bqd5VJZbNY=; b=LJ69S0COsgQAYGB5v0oyHkWifuIIAVcWzzCXqdx3fRpTjN4/Ikn/2kQgTNHRqNpFa4670U xnbJDFqyP4fXBfAmsSN+D+HeQA1zCSB4zZNRjy7NCmw1iVY8CnhK0u/VV1ci5wePdDI167 YM0mLSN1eIl22rfvo2VC1Lr3KDVKcvs= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-324-I_506mipP5-jcPjd6sa9eQ-1; Thu, 20 Jul 2023 11:21:24 -0400 X-MC-Unique: I_506mipP5-jcPjd6sa9eQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6C4E41064FB0; Thu, 20 Jul 2023 15:21:08 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5FDF5492C13; Thu, 20 Jul 2023 15:21:07 +0000 (UTC) From: Kevin Traynor To: Huisong Li Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix IMP reset trigger' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:17:59 +0100 Message-ID: <20230720151942.262154-48-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/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/1fa656ba3c346c355b46a87eca8949a4f4284e56 Thanks. Kevin --- >From 1fa656ba3c346c355b46a87eca8949a4f4284e56 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Tue, 6 Jun 2023 20:10:28 +0800 Subject: [PATCH] net/hns3: fix IMP reset trigger [ upstream commit 56a6c88ba27bfba838b56796de364db04c59b84b ] Currently, driver sends the command with an unknown opcode to the firmware to trigger IMP reset when some hardware error happened. This unknown opcode cannot be parsed by the firmware. So this patch fixes the way by writing register to do it. Fixes: 2790c6464725 ("net/hns3: support device reset") Signed-off-by: Huisong Li Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_ethdev.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 250973e230..3fe6ed7f91 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -45,4 +45,5 @@ #define HNS3_VECTOR0_IMP_RD_POISON_B 5U #define HNS3_VECTOR0_ALL_MSIX_ERR_B 6U +#define HNS3_VECTOR0_TRIGGER_IMP_RESET_B 7U #define HNS3_RESET_WAIT_MS 100 @@ -5628,15 +5629,4 @@ hns3_func_reset_cmd(struct hns3_hw *hw, int func_id) } -static int -hns3_imp_reset_cmd(struct hns3_hw *hw) -{ - struct hns3_cmd_desc desc; - - hns3_cmd_setup_basic_desc(&desc, 0xFFFE, false); - desc.data[0] = 0xeedd; - - return hns3_cmd_send(hw, &desc, 1); -} - static void hns3_msix_process(struct hns3_adapter *hns, enum hns3_reset_level reset_level) @@ -5656,5 +5646,7 @@ hns3_msix_process(struct hns3_adapter *hns, enum hns3_reset_level reset_level) switch (reset_level) { case HNS3_IMP_RESET: - hns3_imp_reset_cmd(hw); + val = hns3_read_dev(hw, HNS3_VECTOR0_OTER_EN_REG); + hns3_set_bit(val, HNS3_VECTOR0_TRIGGER_IMP_RESET_B, 1); + hns3_write_dev(hw, HNS3_VECTOR0_OTER_EN_REG, val); hns3_warn(hw, "IMP Reset requested time=%ld.%.6ld", tv.tv_sec, tv.tv_usec); -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:00.820330151 +0100 +++ 0048-net-hns3-fix-IMP-reset-trigger.patch 2023-07-20 16:17:54.711750712 +0100 @@ -1 +1 @@ -From 56a6c88ba27bfba838b56796de364db04c59b84b Mon Sep 17 00:00:00 2001 +From 1fa656ba3c346c355b46a87eca8949a4f4284e56 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 56a6c88ba27bfba838b56796de364db04c59b84b ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index dccd1d416f..95c72e86aa 100644 +index 250973e230..3fe6ed7f91 100644 @@ -31 +32 @@ -@@ -5576,15 +5577,4 @@ hns3_func_reset_cmd(struct hns3_hw *hw, int func_id) +@@ -5628,15 +5629,4 @@ hns3_func_reset_cmd(struct hns3_hw *hw, int func_id) @@ -47 +48 @@ -@@ -5604,5 +5594,7 @@ hns3_msix_process(struct hns3_adapter *hns, enum hns3_reset_level reset_level) +@@ -5656,5 +5646,7 @@ hns3_msix_process(struct hns3_adapter *hns, enum hns3_reset_level reset_level)