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 D5377433D8 for ; Mon, 11 Dec 2023 11:23:28 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CF88040E0F; Mon, 11 Dec 2023 11:23:28 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2063.outbound.protection.outlook.com [40.107.220.63]) by mails.dpdk.org (Postfix) with ESMTP id 816DC402E9 for ; Mon, 11 Dec 2023 11:23:27 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TLPPDl3TYL1iLG2XcwSyaPsaX3F/kKORuhg8CKMSVqemwl+629yA6+DlCKGkV31i4XbfNmFHh5JTDYgDJYftJlLdETGxKvrr4MNIcTtONyC112u2b1Fkm0scaKDpXiZxRq9158SXfr23xB4tz+l4XNfm6365JJMJD4R672GNDNs6l+6eYMNUL2KUfSyy+xWRTHa439GC7bJAPsIjGNatjwglfYTUF1QFnx8GikPT5lBoDG5AgNrndH+bWIu0MK6xvuy4evIx9FXQ4oCdQZXXPWL82OGUfmV58Mouj+dqVmiAy50a8WZqF2p8mRStthxMsD+jq81AZufGQtxhMofFYg== 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=7z1Fc4ldkCYnKUy4eURfAKw0ulbBNjbJNCZJyvHaClI=; b=V0i9ovF7MZP4dxyaM2EjchNHghBgdj/aEO2ykYwA7NEKZsD5dQ9F43/E4fm+xSJylfXNIJJFSR7DTZN6xrtWdzWfWSEyw7KU7ymNy8GzdEnddAay84MARw+74Z4KPZNgAIlwGQt9bMUUeLUN2uDQz5T7R3FI8Pm3bcmWeRLBUdVjv4MaY+Ue3BqtkzTh3FyI/83h2yfkXrz0zlzUPxnIRJWWZgkeWTV/xVbxVMyhM+1Roqjow5BLikzAsD9es4aYbAaYVHEdpDRl1XXoJzdgQ1hmNmAvnkYvBwPEo1uSjZW6ebmV50Y1vlNTs9jAwltMrf7vuPDr6QddDHlYDJW4Pw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=7z1Fc4ldkCYnKUy4eURfAKw0ulbBNjbJNCZJyvHaClI=; b=sjKUDUosIZmbohYjaJskzEVRnHTPmMhWbHBc9r4wO98skdFQveYYPi5vAXXPtiv1LKadbDuW8Qz8LMwkH0h6ZwTmKPCXBEgbb+yJjZDjaUJd/QMh5lBfpRBS6vHoz8GbIwNNnodiutqFrvIjc8oEn0TXxwCT+tUWbQGUpftjVW0++ZsQjVCqZe+vFtXZvQw05rc5G2qXKoSTfUqFSHfboBXtCpolio5bq6yeUZw5lbr6A8gpZ3GgknHSO/++JQ+SXbH4Mhpgik91Q9exR5W16tCIkIRJhw35VnNMewZ/A4qKQRjDPyik3jhJWPLJQpmAuMsPwpqwXvuVlW//zjocvQ== Received: from PH7PR17CA0012.namprd17.prod.outlook.com (2603:10b6:510:324::12) by SA3PR12MB8761.namprd12.prod.outlook.com (2603:10b6:806:312::15) 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:24 +0000 Received: from SA2PEPF000015C8.namprd03.prod.outlook.com (2603:10b6:510:324:cafe::d5) by PH7PR17CA0012.outlook.office365.com (2603:10b6:510:324::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33 via Frontend Transport; Mon, 11 Dec 2023 10:23:24 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by SA2PEPF000015C8.mail.protection.outlook.com (10.167.241.198) 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:23 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) 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:09 -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:07 -0800 From: Xueming Li To: Dengdui Huang CC: Jie Hai , dpdk stable Subject: patch 'net/hns3: fix reset event status' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:12:24 +0800 Message-ID: <20231211101226.2122-120-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: SA2PEPF000015C8:EE_|SA3PR12MB8761:EE_ X-MS-Office365-Filtering-Correlation-Id: 0832b42e-4559-4765-a468-08dbfa33347f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: q04pQFGzN8mcz7djb+MqM/ta5zIbKMfqu6+uFXN5qo3UI7fdyKAm1JhjHnAgh+WwRHCmgfhEoDaFJiWdDvVA4fWSinsBW4T2+7TvW3MVUelcY6pc0qLlChccz6fTd+zgH6J5LCdExUPIxWtcYJ7VoaAkHe6m+GtzuB1ElFMrCdcEs4SbNNk0TeZzOckcwTyu28GUtmJlmmVzpC2Xk5Xl1x1WxlFSU3CXVbgiv2Laq5URmoIKwGOE1rm+xeP5ikroYKR+eLIIITHPGU1k+9UyfLasUs0hOh1arBZHSXv8boIkNriz9W0PNGzeHcevzaPlFxDIY7/rXtBygq5UpQRMWiMowZgOAj+0gc+eKAvD7k22UE1X0e9oNh2+9/VjOFeMndEu1yQBRCI8N9/1/i7qHKo5v3hsEDoXK5dJhu6trpnNGC/XOfa8TDueEuau6lax8bk+dR2iF35nZHf+eC8om+D2l/8jU3nsrT6UiVxQf/UPyjpdpIt2+yaRLvrh6bmO1XoG0Mhi12ULV7gkIe08oT4khRKvcEn2sS8zY5pCuWpoNXhltSJfSUWLtJmgT5sG3io95glyuiCIfBc55L5njPDl6nj2PZMNnkPywpgfCIZnsHw82rfbjwG6Z3js+3nTgBEVLnvoegvta5XrOeHsS9NN1H2CJrR5ODdtBLKRZuIUgiRDhxqrXGRcPri81NuUba/15NK35CV2lulbf+zL12ToYEQdzbfpt58gI95IeuMBdGRipvUvJy6qLoftElvfqBz2E7906H+0rimKpOocv6Not0uuDGWlikkqAstWoVk= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(396003)(39860400002)(136003)(346002)(376002)(230922051799003)(64100799003)(1800799012)(82310400011)(186009)(451199024)(46966006)(36840700001)(40470700004)(4001150100001)(6666004)(7696005)(2906002)(6916009)(53546011)(70586007)(54906003)(70206006)(356005)(7636003)(36756003)(86362001)(316002)(8676002)(8936002)(4326008)(5660300002)(40480700001)(966005)(478600001)(40460700003)(55016003)(41300700001)(36860700001)(47076005)(82740400003)(6286002)(26005)(336012)(426003)(1076003)(2616005)(83380400001)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:23:23.2863 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0832b42e-4559-4765-a468-08dbfa33347f 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF000015C8.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB8761 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=28e7716ee38fe33a28da2c0e82f33f6e0224dced Thanks. Xueming Li --- >From 28e7716ee38fe33a28da2c0e82f33f6e0224dced Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Mon, 27 Nov 2023 21:39:02 +0800 Subject: [PATCH] net/hns3: fix reset event status Cc: Xueming Li [ upstream commit b59a0cbec866a8d4f7d1938b6826f7961c75c9fd ] The function hns3_clear_reset_event is used to clear PF reset status, The VF shouldn't use it. This patch fixes it. Fixes: 1eee1ea75c0e ("net/hns3: fix IMP or global reset") Signed-off-by: Dengdui Huang Acked-by: Jie Hai --- drivers/net/hns3/hns3_intr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/hns3/hns3_intr.c b/drivers/net/hns3/hns3_intr.c index c5a3e3797c..52b5435a23 100644 --- a/drivers/net/hns3/hns3_intr.c +++ b/drivers/net/hns3/hns3_intr.c @@ -2749,7 +2749,8 @@ hns3_reset_post(struct hns3_adapter *hns) /* IMP will wait ready flag before reset */ hns3_notify_reset_ready(hw, false); hns3_clear_reset_level(hw, &hw->reset.pending); - hns3_clear_reset_event(hw); + if (!hns->is_vf) + hns3_clear_reset_event(hw); __atomic_store_n(&hns->hw.reset.resetting, 0, __ATOMIC_RELAXED); hw->reset.attempts = 0; hw->reset.stats.success_cnt++; @@ -2799,7 +2800,8 @@ hns3_reset_fail_handle(struct hns3_adapter *hns) struct timeval tv; hns3_clear_reset_level(hw, &hw->reset.pending); - hns3_clear_reset_event(hw); + if (!hns->is_vf) + hns3_clear_reset_event(hw); if (hns3_reset_err_handle(hns)) { hw->reset.stage = RESET_STAGE_PREWAIT; hns3_schedule_reset(hns); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:26.894285100 +0800 +++ 0119-net-hns3-fix-reset-event-status.patch 2023-12-11 17:56:23.247652300 +0800 @@ -1 +1 @@ -From b59a0cbec866a8d4f7d1938b6826f7961c75c9fd Mon Sep 17 00:00:00 2001 +From 28e7716ee38fe33a28da2c0e82f33f6e0224dced Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit b59a0cbec866a8d4f7d1938b6826f7961c75c9fd ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org