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 5870C433D8 for ; Mon, 11 Dec 2023 11:23:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 52DB540E0F; Mon, 11 Dec 2023 11:23:24 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2070.outbound.protection.outlook.com [40.107.93.70]) by mails.dpdk.org (Postfix) with ESMTP id A98E340E0F for ; Mon, 11 Dec 2023 11:23:22 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KQUaGgbvWqgLXKa9LFpCHOwVVxKb8Jb8CZ5NDKMM57fuslfIgaA33natQsvb9MsxvzBMyr16idYAOQltRCk9bz83VhVMHt9JUlUbroZ3auT1tvaW9/fc3E5UXsuRk4X85Hxd/swLpu/TWN5P7PSL5VvToyp7unWxYS+kDvnolgnemtP3fB6PyAZGWI5YHX38R5RaUwgqrcyRTqhpWRS2Jz5Tfz+g1WMy7lvqyzXomr8bMGnIix2SMhBaZUBPMDvS8XYJJ0hym9fw0b6MRPbykPxeH3i7XxqMoOxzYePVrJ2HE6Uvv5MTqAwxV5vJGyOqBkphfT7YM1BFOq4QhMsbWA== 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=5kyUyBmJaocRuhNYeD9VcSmybP9/uRPgm21xZBqpqWM=; b=V/nd5UFPP1yJnUT89GBPQVoI5zMDViOd4A+70FJL2ingHXaNAVwv81L7xCe/UjGF6THGHUIPx/bR2IF1EUQa86S3OT7YG6+UedKN7bAU4lb1Eqbkqb02Ke0sUp1JpLNNUbbmRWuJrAPIMZfU1BnNelR5j2c1bga69RjZLZNNXQKlyAgHBe5qiTyuHOJOjZaeP6NY+Qvp9u0Lmt2s4hRK9yM8AziGvUnWIN9KauYPaZwpB+gL3FcXEKVpHevzpnpkpct33MPNppeyqFXSYqmDAXhjgbiLBB/Y+vnhzIBBKDgQ577rVO2ZpHWz3OlHy0gbA+4YA1tk8RQwoByL92SekA== 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=5kyUyBmJaocRuhNYeD9VcSmybP9/uRPgm21xZBqpqWM=; b=UFGY/f4s7xuLmiiUzQi2R1uCEI7597UBW1jPz9GJGwYGrTUdDf5Yl6gysMkTXgkK2g5KKBEZD/mpA1mqVfjZ9OLdd75T5bdwtLTbXpvWhJ8dVZQgu1vfgbQ0VGZp32y/TpHVAKNvIM0ueMef2rtFuNDRG7RigPRtjNs/LT4MeiukB9QPhpafgi2TMcmioaiHnGWtfDqB5Or+6b3VDlJLsPCR+dWN2ns/YIxIlai/WpAelkD6sY5mnJInt4PxVhrqSG9q/qv0V3/0dCmEWQgtRfFc6V92kE0I7R0KqD/WZ6emMMnb5lKWNL70XX821oDXvFDZls0IdxrEdmlQFr1phg== Received: from PH8PR05CA0006.namprd05.prod.outlook.com (2603:10b6:510:2cc::6) by CH3PR12MB9148.namprd12.prod.outlook.com (2603:10b6:610:19d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:23:20 +0000 Received: from SN1PEPF000252A1.namprd05.prod.outlook.com (2603:10b6:510:2cc:cafe::a1) by PH8PR05CA0006.outlook.office365.com (2603:10b6:510:2cc::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.21 via Frontend Transport; Mon, 11 Dec 2023 10:23:20 +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 SN1PEPF000252A1.mail.protection.outlook.com (10.167.242.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:23:19 +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; Mon, 11 Dec 2023 02:23:07 -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.986.41; Mon, 11 Dec 2023 02:23:05 -0800 From: Xueming Li To: Dengdui Huang CC: Jie Hai , dpdk stable Subject: patch 'net/hns3: fix ignored reset event' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:12:23 +0800 Message-ID: <20231211101226.2122-119-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-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: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000252A1:EE_|CH3PR12MB9148:EE_ X-MS-Office365-Filtering-Correlation-Id: eae13676-c706-44e5-4cb2-08dbfa33327a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fsxJTOhAF7dKXethRLnC6E1LzeUuQ/PNtymGeVkSHL0shmxgZu0Dkb3OVFmFG1dv7txaYjyHnPGLfC3s6ZJV6gUWLXTd5iLz8mmyJheBdQGx/cItxCRRjp4ZTfCEX3hLuRGjQs3YTr+NDt29WWz7/Jo3g6UxoVsH+g0D9knBeOk3xk3TmyQogBaFJL2rbFlVafW3GIzJmn6PQrcdFfqSk91jWyNv9Ix8jepEXBAYAUWOgICH6XfKK+VJAIa68HMpbC9yyqVysb2gN/9CenFFEIFgFGqRMY+P2PdZ99iEbC62PGAwakfka3MH7ZU2Bef5z5OhXbmhwPsdPzR8PY0DaJ3ud8kouxGFFXVnHbxVNtKxN4O45Fq5/zS3T7PnkUx9cQF0M4sXV9wEawkvJUZf0P2CYYV83JfTkCMtxScKbGp/624i4LuryU5ZYF3P01WV7dMueEdFr7sXO+6SH6G/YoOAL2kRGBXI0HC5r+UKwf8SmNZGT37WF4AerY3c0U7JqQiCF9YCxuLuLxGzRPCBnePBs/IQ3sn/jq019AOmHVaw7xApgnvgv9fwhFoG22HBTPRC+ztWjV4FO0GkA8gBL9evG7apUOx0i9H81s+uKyzMTGtcv+fwuc9Rd//sU8dFZzJm8nz7yDO3Xc4NFccl05OoUrWKYLRdA2tx3pzGnxGM5racpMI8A1jJbNWIDpRuBxWlMB8hFCI0RaOtjkBiOT51OQRhjyIlUSiTmfZ411i/t/5mCLtrrWS6LaqGgU3Wo+NUH2j/Cz4Cnvv/Dd0vtX9feanzpDrTjs0S182KQKE= 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)(4636009)(396003)(346002)(376002)(39860400002)(136003)(230922051799003)(1800799012)(451199024)(64100799003)(186009)(82310400011)(46966006)(40470700004)(36840700001)(55016003)(40480700001)(6286002)(1076003)(26005)(426003)(336012)(16526019)(2616005)(40460700003)(82740400003)(36756003)(7636003)(86362001)(356005)(47076005)(83380400001)(5660300002)(53546011)(7696005)(6666004)(36860700001)(316002)(70586007)(70206006)(966005)(8936002)(8676002)(6916009)(54906003)(41300700001)(4001150100001)(4326008)(2906002)(478600001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:23:19.8802 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eae13676-c706-44e5-4cb2-08dbfa33327a 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: SN1PEPF000252A1.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9148 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.4 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/13/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=c5d0485861b15bcafcc17d969e6f4332e34033ab Thanks. Xueming Li --- >From c5d0485861b15bcafcc17d969e6f4332e34033ab Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Mon, 27 Nov 2023 21:39:01 +0800 Subject: [PATCH] net/hns3: fix ignored reset event Cc: Xueming Li [ upstream commit 4c40006c4b6b3c567185c84d60535752c9f7ea3d ] The code logic that only new reset whose level is higher than old reset level will be addressed is added in 'hns3_detect_reset_event()', in fixed commit. When the new reset is detected and the old reset level is HNS3_NONE_RESET this reset will be ignored. This patch fix it. Fixes: 5be38fc6c0fc ("net/hns3: fix multiple reset detected log") Signed-off-by: Dengdui Huang Acked-by: Jie Hai --- drivers/net/hns3/hns3_ethdev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index f1131f4ba8..27f9dd2eb2 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -5594,7 +5594,10 @@ hns3_detect_reset_event(struct hns3_hw *hw) new_req = HNS3_GLOBAL_RESET; } - if (new_req != HNS3_NONE_RESET && last_req < new_req) { + if (new_req == HNS3_NONE_RESET) + return HNS3_NONE_RESET; + + if (last_req == HNS3_NONE_RESET || last_req < new_req) { hns3_schedule_delayed_reset(hns); hns3_warn(hw, "High level reset detected, delay do reset"); } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:26.863382000 +0800 +++ 0118-net-hns3-fix-ignored-reset-event.patch 2023-12-11 17:56:23.247652300 +0800 @@ -1 +1 @@ -From 4c40006c4b6b3c567185c84d60535752c9f7ea3d Mon Sep 17 00:00:00 2001 +From c5d0485861b15bcafcc17d969e6f4332e34033ab Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 4c40006c4b6b3c567185c84d60535752c9f7ea3d ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 941d047bf1..ae81368f68 100644 +index f1131f4ba8..27f9dd2eb2 100644 @@ -26 +28 @@ -@@ -5560,7 +5560,10 @@ hns3_detect_reset_event(struct hns3_hw *hw) +@@ -5594,7 +5594,10 @@ hns3_detect_reset_event(struct hns3_hw *hw)