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 4874142CBC for ; Thu, 15 Jun 2023 03:35:00 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4304742D49; Thu, 15 Jun 2023 03:35:00 +0200 (CEST) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mails.dpdk.org (Postfix) with ESMTP id 51A3740E0F for ; Thu, 15 Jun 2023 03:34:58 +0200 (CEST) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-3f8d0e814dfso11722805e9.3 for ; Wed, 14 Jun 2023 18:34:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686792898; x=1689384898; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yIJGeZxD6tZSuRcEqALIeLP3gRlv3HyVZkZv4fIac2I=; b=Sb419YczVf/13qcvW797VmGXYcobSoBoBhV37Z5sIVCsNiCSznlxg23GK9Iq6jCVD5 JHHx13jdPRN3LNXXx989BewmzAf1J37kd7HqxTkNziM18BHccnU40hXxr1kgukDYNcId YX8A0vAadoW3tliHeXEUe6+37jbXc6ttuvN3rF6OM0/wy4rYRJ/ulIFb3zRwirJaF7VK SaW/bsthT4FaczRXwAfcYigPsPfBlhI/LTbNXQN9j9gruJJ3nkBq96naJh4mtoRcBqI5 ujBq+Z3zRE8251Dy7Dt/dJmys26nPDQgV9eCwiP1OOgFUu5NhG5Xg4uMMvJLB3eLf7Zf aOAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686792898; x=1689384898; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yIJGeZxD6tZSuRcEqALIeLP3gRlv3HyVZkZv4fIac2I=; b=D/XzV2Vd0aJYtRSv5SgQAFeGDiV/9kRgW0+trh9yKS6FUZQ2f+lF3NeEfjxmqXv+Iu XTRaWO3werOQX/Kq7WsDXMPEq6aQUOcYZQLGIhQ6oKC/yWDWZYeu/vzm1B/+dpRA06mk p77MemJGYcqgx+XYviXKFm8Z1jllE01t2yPM07zZWMzJ9erwvtH4Cxwcm5Y+bIFtSamq XcB8m7VdYjT7qfMmdgoIUnTvY2abwZoNGl2Hgg5/wTSThHta4CZB7Bh7NvtbdECSt0QE GiXNYPslkIip5yteYMh2sQ9gapiL39e4BntYHiXcmQ4nZTaj48ck6UWWjCo+ISs+D8Kq 6uzg== X-Gm-Message-State: AC+VfDzjGJjRLYtdJ83NqcamfSXhmTeY6m4eeNweNWkNiyE7lvEvsH53 dHt+qnMAAOies6efb9H5o1Q= X-Google-Smtp-Source: ACHHUZ5LlK1gMij41zBnIajcV+l0Sdx3U7kyX5Wws6ivu66/cBOxfmoy0h1/bi7/y7kIVsrnOnNefA== X-Received: by 2002:a7b:c40b:0:b0:3f4:27ff:7d48 with SMTP id k11-20020a7bc40b000000b003f427ff7d48mr11354399wmi.19.1686792897909; Wed, 14 Jun 2023 18:34:57 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id z10-20020a05600c114a00b003f7e60622f0sm18909757wmz.6.2023.06.14.18.34.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 18:34:57 -0700 (PDT) From: luca.boccassi@gmail.com To: Huisong Li Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix IMP reset trigger' has been queued to stable release 20.11.9 Date: Thu, 15 Jun 2023 02:32:33 +0100 Message-Id: <20230615013258.1439718-38-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230615013258.1439718-1-luca.boccassi@gmail.com> References: <20230615013258.1439718-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.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 06/17/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/56685a6aa93353786a3ba245c1e2d55d70313deb Thanks. Luca Boccassi --- >From 56685a6aa93353786a3ba245c1e2d55d70313deb 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 552280f35d..2da2f1e9ec 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -44,6 +44,7 @@ #define HNS3_VECTOR0_IMP_CMDQ_ERR_B 4U #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 #define HNS3_RESET_WAIT_CNT 200 @@ -5532,17 +5533,6 @@ hns3_func_reset_cmd(struct hns3_hw *hw, int func_id) return hns3_cmd_send(hw, &desc, 1); } -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) { @@ -5560,7 +5550,9 @@ 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); break; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-15 01:56:36.676668059 +0100 +++ 0038-net-hns3-fix-IMP-reset-trigger.patch 2023-06-15 01:56:34.635542789 +0100 @@ -1 +1 @@ -From 56a6c88ba27bfba838b56796de364db04c59b84b Mon Sep 17 00:00:00 2001 +From 56685a6aa93353786a3ba245c1e2d55d70313deb 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 552280f35d..2da2f1e9ec 100644 @@ -33 +34 @@ -@@ -5575,17 +5576,6 @@ hns3_func_reset_cmd(struct hns3_hw *hw, int func_id) +@@ -5532,17 +5533,6 @@ hns3_func_reset_cmd(struct hns3_hw *hw, int func_id) @@ -51 +52 @@ -@@ -5603,7 +5593,9 @@ hns3_msix_process(struct hns3_adapter *hns, enum hns3_reset_level reset_level) +@@ -5560,7 +5550,9 @@ hns3_msix_process(struct hns3_adapter *hns, enum hns3_reset_level reset_level)