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 3057A43C60 for ; Thu, 7 Mar 2024 02:36:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 26A9F42EE3; Thu, 7 Mar 2024 02:36:07 +0100 (CET) Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) by mails.dpdk.org (Postfix) with ESMTP id 127D242E64 for ; Thu, 7 Mar 2024 02:36:05 +0100 (CET) Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-5131f3fc695so366650e87.1 for ; Wed, 06 Mar 2024 17:36:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775364; x=1710380164; darn=dpdk.org; 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=a70tmk3wAf1ynZ5dxsqQl4UdsWL22xeEOOMKAZWuaKs=; b=Teg0Daiih4IBU5H+ufANB3xuPmAvhGyxYQ5sbg8JnrU2GoVyrjD1DzqD96QXwL16x6 juGGgvSPwVa4rw3HV1PLt0MAPXIU5WHooyFXmvi9eJkEJOMbMQ7u39oHbe8FjTkYPyMT JMio5uK8APPlYUDc8KCZhuuM+qWF4KTl8JOZaXVhCii+HVfpLIZN0kLNaEnaligIRs56 ZVqdA0iA6gllwaXB0ot6Pj2d+XLDeuSfX1e9M2YMr0NBtZ0WkmXVgPJ00L6kBwsLuULf /reKrNVZIta/jnnpjmWvSXsCrYUUPK47M+HPlBPmsEDpXcJq5rc+sXJ3J+4wMplNl7Xn r7kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775364; x=1710380164; 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=a70tmk3wAf1ynZ5dxsqQl4UdsWL22xeEOOMKAZWuaKs=; b=Il8NL59K/KgTQIsLFAoI2OkMMlVx5MbMKQQTVsrtb+SfGYG9Zy9jdZ5Xcifgj53WVA pnnVrZybNpxl85yxtEFYyr0VhkOFyqLzYEDPLx8c314GwW1+odtgrnAJfZjuut4siOuP 6AHHJSLVePk1ldbMQKoVTRIyZRbPKiYynTGym4vheOCFfWgSEqiJr351KILCpVhXjwdv IBaa+5Tortpf6PEdk+P/AnsHcpbcX2M1YnICbR1FDCvXY2xJu2C57qn2T2kcdkaA5fgk DpqAC5NuGBWAaFNBRlIuBCwxZlm3gOUBmQErG4/Qx00sh+nUPowBT91qqffr868VEkpu FO7A== X-Forwarded-Encrypted: i=1; AJvYcCVoTS3iOF3FrnFL71+58WZoBr8E5XCUFiAwJhogHCZDwYPrzYcSFlcn9PRUog5fK2TcCEODeKPJCS202ijkkgY= X-Gm-Message-State: AOJu0YyYIcy7iv4ZQyHXhcmLv6zBqPen9an8f/WyHzs1LhqXAZ2qi/0g fN9R8ipqFhyJujvrrvT7rcguEkefgkm+d+eoVF4xmVWKw/jayrrU X-Google-Smtp-Source: AGHT+IHKa1eDXmSaHgnQ2R23yqHqyAkjK3VfbUpQT6PR7pMtjuLLqZcjaiiwro5XfeoarmzW9nsn8g== X-Received: by 2002:a05:6512:3d1c:b0:513:1cfd:14b2 with SMTP id d28-20020a0565123d1c00b005131cfd14b2mr591745lfv.33.1709775364429; Wed, 06 Mar 2024 17:36:04 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id v23-20020a05600c215700b00412e84e59d8sm843507wml.44.2024.03.06.17.36.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:36:03 -0800 (PST) From: luca.boccassi@gmail.com To: Dengdui Huang Cc: Jie Hai , dpdk stable Subject: patch 'net/hns3: fix disable command with firmware' has been queued to stable release 22.11.5 Date: Thu, 7 Mar 2024 01:31:23 +0000 Message-Id: <20240307013159.1735343-66-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-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 22.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 03/09/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/d043fdd66e0d10b03da444a9546a6a87f34dc977 Thanks. Luca Boccassi --- >From d043fdd66e0d10b03da444a9546a6a87f34dc977 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 db596493db..d34094c9a5 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -5586,18 +5586,16 @@ 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) return HNS3_NONE_RESET; 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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:40.458051958 +0000 +++ 0066-net-hns3-fix-disable-command-with-firmware.patch 2024-03-07 01:05:34.870941544 +0000 @@ -1 +1 @@ -From 66048270a49088f79c2a020bd28ee0a93c4a73ed Mon Sep 17 00:00:00 2001 +From d043fdd66e0d10b03da444a9546a6a87f34dc977 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 db596493db..d34094c9a5 100644 @@ -22 +23 @@ -@@ -5552,18 +5552,16 @@ hns3_detect_reset_event(struct hns3_hw *hw) +@@ -5586,18 +5586,16 @@ hns3_detect_reset_event(struct hns3_hw *hw)