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 DCB2B43B86 for ; Tue, 5 Mar 2024 10:56:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CFAB54026B; Tue, 5 Mar 2024 10:56:07 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2062.outbound.protection.outlook.com [40.107.92.62]) by mails.dpdk.org (Postfix) with ESMTP id 6C9324014F for ; Tue, 5 Mar 2024 10:56:06 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=luphC7p3a2NnlMXKZwVuXAKeK1rZIdcOlb1vs3L676jywggkeBslYEwhkh600pvADOrbFoMCYLpPTYyBxVq4it60Nmw1T+ldmJLAuwFLjgCt4nFqH863qlo8Xsia5SRdTZzuoRzCEZVYlpLXQ1/NxtVDfh6w6jwxOuwKgCeTU5uFENuzKAFG5mm5I2M4YFjrjld8JjhuRi2r94SGPaTr8Ux5hWYSUciV/S26s/1LHaLDrXVmlbhe7cAFj8zG7PfTpPkfhbdo7R2VOhAIEqMAdgyg6UJGMMZqLtgl71ldxulJR4ZI2QAykvFCF2uReoiDhtkn9hLy6Bsuk2jDKA6MBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=J3CW1HvE7FnyDXB+QdPT/WOyw9Q8ullxZbunZ9RWsTM=; b=MevRUsZnfvU9F3uRcvPNqqox+x67QkeZdiY47E57nQ3beKsmSDqQB8/Hsjs44pEB+eJtP7kwiomcNyYU4SNCbmykgPfUWahPGmrfkvLIqPX38bCcCO095L1rEb6c3vlbG54gN2BIOAd7pP8mzQXND3jnZjWOGZdcQcbK5iZ6vfQfrY6EZdukdOShN9kBUiUN8rlDBmVYfJ22RJeZYPQmMVysPfcbOC6Ww+C++BgBQOy26fivM6C0jpeUWktXQpG3VuGbkoNBcrtLTUuUbpMpsWESg6p4EWj9D9EzOmQu78uIk0UI6PTOHgclC4GBeKFULtlniWTVbju2ryn+FcfNAQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=huawei.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=J3CW1HvE7FnyDXB+QdPT/WOyw9Q8ullxZbunZ9RWsTM=; b=Nj1b3+eWsgsoUW2dBUJ75qfZummDqhySSjimlYr7bxnfy10cNXRxWkwtXsbKITKC8dm7qP8fROfThsqDZ6IjVqRd4RRpinf7HA8UFzyeMhoizoMUkJPuGxz251KlqSvdOPTdi5cahg2rZV+oO0/oGoMV2oC9eOxeCzF32M0JgNN615FeVe1ZEno490DqqLlRqYwLnqJ2+tyGBlzBm06Ed03XdBXuXQfT1UMHudzwBCaCzHiR4CST+SH9gE73rDWgWO4uOwqqsWhb4R3l/HI4sfFrWTqgsYNQw4RwsVs4u9UT2fOgMqPsOT/uI3ffWXwD0P6uUgd05mE/t/W7b+F4Aw== Received: from BYAPR02CA0011.namprd02.prod.outlook.com (2603:10b6:a02:ee::24) by LV8PR12MB9407.namprd12.prod.outlook.com (2603:10b6:408:1f9::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38; Tue, 5 Mar 2024 09:56:04 +0000 Received: from SJ5PEPF000001D5.namprd05.prod.outlook.com (2603:10b6:a02:ee:cafe::85) by BYAPR02CA0011.outlook.office365.com (2603:10b6:a02:ee::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39 via Frontend Transport; Tue, 5 Mar 2024 09:56:03 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SJ5PEPF000001D5.mail.protection.outlook.com (10.167.242.57) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:56:03 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Tue, 5 Mar 2024 01:55:51 -0800 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Tue, 5 Mar 2024 01:55:49 -0800 From: Xueming Li To: Dengdui Huang CC: Jie Hai , dpdk stable Subject: patch 'net/hns3: fix disable command with firmware' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:47:08 +0800 Message-ID: <20240305094757.439387-88-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001D5:EE_|LV8PR12MB9407:EE_ X-MS-Office365-Filtering-Correlation-Id: 6abc965a-7a96-430c-db2c-08dc3cfa7859 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JDl4bgKJ1NykZ5xZzcU5kYdwJ59hmvtj8CW9uEddg+X965ZOoDe/6slKff5VzcEFNZpeMoPUFdT6PDpG6Hj+p+gDxFS5g9cip7Wdgh7VlIzjiMN97Nxl+VheKoWs/TqWTwOLEGKPKKoP+XmxSY6VsHgjPgE0Gyg1jbAL2mBAQw9YfJNOzUU0s7Fh79OdPbYftKccUgx6QSP/fxsiEzgZBW9n+CsHOLFP/sjwoCiSyq9rPJhRFSkys/5dh7sCPhwTDWxQOZtKu0NHOeQHX53wZ00R1ik4qLu2lF0KRv06YvxzBqOknm7kIZHm1ZO7cwRC73wrovDDLZYyPl+UeHM4MqD+B11Qng9iyJgOW6WVuLE/TbntMHTQy7P1RCVGqGEEURESbkvcQ6dg/Crmn8jjhe9f7hcOKQCPjeKZo6qfq5pmsFqLflK1kTFoI5Z+L8N7lcY6fuBA6OzKXdGQQfKhB8zIokSOzi0PE/golr38SM1wzAvLYY5wPLHEXI1++JXkIBvOTpxRt3GMNg9kGcMN/Zj7OTTXik4LhNgVWwlCYgdbVJlhlmhD7VgGGvPyTD8xvfh/UySsiGyOZaSieffsIoZRFFdIo8yzLHavcqhIklPabyoAwO0EgQwJ7SzirvH6+Uia5xHeiN+GXJrl7+bB82Ysze6wUbI++acr9Fcgz4CM9HuBrrK/8q58j0jyBParBRYz8WWm08XhVnXP4NzFzw9NqOafAi8zeVMURYEH/MESlgpYb/rqkKeWhnusIZBP X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(36860700004)(82310400014)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:56:03.8256 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6abc965a-7a96-430c-db2c-08dc3cfa7859 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF000001D5.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9407 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 23.11.1 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/31/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=a3584fcde635c1a12b036469a57887f75c08d370 Thanks. Xueming Li --- >From a3584fcde635c1a12b036469a57887f75c08d370 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 Cc: Xueming Li [ 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 bccd9db0dd..d626bdd5b1 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -5552,18 +5552,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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:33.646752289 +0800 +++ 0087-net-hns3-fix-disable-command-with-firmware.patch 2024-03-05 17:39:30.843566495 +0800 @@ -1 +1 @@ -From 66048270a49088f79c2a020bd28ee0a93c4a73ed Mon Sep 17 00:00:00 2001 +From a3584fcde635c1a12b036469a57887f75c08d370 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 66048270a49088f79c2a020bd28ee0a93c4a73ed ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org