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 9924D42D46 for ; Sun, 25 Jun 2023 08:41:14 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9463A42D35; Sun, 25 Jun 2023 08:41:14 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2041.outbound.protection.outlook.com [40.107.220.41]) by mails.dpdk.org (Postfix) with ESMTP id 74EFE42D38 for ; Sun, 25 Jun 2023 08:41:13 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ia3DP0Qw+rkDtU/Gts4NlP8h5Gmju1W/i3p1585WrOwPGRRyy/fyMJQEbym7MHKoW1AyKC4eKaDVDw8VKxeQgYfe48v1QqwpW2tvp9Hhh9dOpwjueQLQ3kOvR9L+/sXPZWD7tTzItv39HzXSoOrjg+2h4tsqNL6uPPyTpYNE38DW8NdwjRn/62WNOi9CngexeMFt42PKG37hn98W8q2FBt3mcCTf8cj3J9pPCodRCiiGoFSp4DtdTXFKG82M4NFDOqLJeHkNcOVDcS1uZuDDJ0lJq+IpN/h1DKpKORhhbWyJlN6QDVfNIo+GGpsGZ+FcfvYq1mrX/4f1W+zcxIa9sQ== 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=vGckzJNW7pxmk7xcZWHxH2hduVxP8DVg+6vp2NY8/No=; b=TywspkSJ68qrvGcgNHT/QiY0SY2MRX5APo3cVVPpqmzpd2kpm+9JwCxLBXx9bOCI4cx+3Snw5siyHkm2uxivC0lQ4ARapkWa7mwgQK2A1y3LLZ+Nnp1fkMjCqI8GdZy7+c5m6C8tgD2d/Qj2xl+AzmwrDYhI7JCIXR0JRi2OhN1YFZYec3bEgthoAIzYC7TyRi9MCwjvQ+e80hXHqFQxkBBG5fTY6+/86PPqyOSOohSjI9/lXelwuSoN59jWHb7tTZ7BKSYEDOux+GgVqIoxyGxjNr1OXVMNMe7jjzKd95GtvIYowU/kn2X+PSHG+KbsaRiDmcWTlJwR0PBVGPNikg== 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 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=vGckzJNW7pxmk7xcZWHxH2hduVxP8DVg+6vp2NY8/No=; b=gaO5dc71mU1q7TZRGYFzfEznwfsC0+DM5GCj8IKdlPrPWfE/iqWKMWKgIPdggnGQWbei2I9UZsIDtnSsanNoI6njKWelh2VfyFPh35REI1JRJErKRYlxB5P4GoJAoK/BJqpiRaAJmnQOkbRloHQksYjsAF5Xu6ZFlBULp4Y/UBINC3irrh+utTGcn2cVBYHBm8G043tj2H/YGAWhVnC5Mx4PycuGDN5uz20VtzW6mEYi5nw/QL2vpT6wih8J2Jrmnxrydwd9hVt9A7TFdBicQDcDuZqdrEbGUiCysE1o8LMAqMeZo8/0RpUijfZQK8jx9uw9YUTbv2cRZtJDQWVD+g== Received: from BN7PR06CA0063.namprd06.prod.outlook.com (2603:10b6:408:34::40) by LV3PR12MB9267.namprd12.prod.outlook.com (2603:10b6:408:211::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.23; Sun, 25 Jun 2023 06:41:11 +0000 Received: from BN8NAM11FT062.eop-nam11.prod.protection.outlook.com (2603:10b6:408:34:cafe::81) by BN7PR06CA0063.outlook.office365.com (2603:10b6:408:34::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.33 via Frontend Transport; Sun, 25 Jun 2023 06:41:11 +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 BN8NAM11FT062.mail.protection.outlook.com (10.13.177.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.47 via Frontend Transport; Sun, 25 Jun 2023 06:41:09 +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.5; Sat, 24 Jun 2023 23:40:54 -0700 Received: from nvidia.com (10.126.230.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.37; Sat, 24 Jun 2023 23:40:53 -0700 From: Xueming Li To: Huisong Li CC: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix IMP reset trigger' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:34:36 +0800 Message-ID: <20230625063544.11183-59-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.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: BN8NAM11FT062:EE_|LV3PR12MB9267:EE_ X-MS-Office365-Filtering-Correlation-Id: a3fe563f-74bb-4d74-9841-08db7547293b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0j2Jvw3O/x7Syof/ZOyuPSYfICngslqX2kZgzhwLuDtfv5yKRn9nx3ytlBa2INz7ITjKyjzdllfalck8hGuMZXQRvb9TOtNLhbI+4+mP0vB3+LDs+4H1TuAYR7vM5y/G3yhyWxnDNynj7G0KSL5rx0MOBSBpgDWAHRfjy+rjcID+RpAt1h3iH0iVxdwRrKMYSox+KNS6p0dMV1QeHyUQRSvuOTGd98EFuIejnRXuRs97BgLzS66wWrB84HW/kyN9FxP3Y4etxX+ZZ7v090aUskDj0DO6NrvFkrTQiMF2OhLIqDWAov7mjQYmprrw0thDI110rLZk7HX33+OcuWohq/V0oO5ooY6PVyXIKkWXU+N+174sIsrb1EY9a0mBmqElAwf7yC0I6WTFVTWJvgpSeh0JQEsbxt7KY69nJ0VRKJJPOqH9gdk+n80oLfc42okt6vACT5DYV7/Cf24qeEux/fHVcc+n4X2H5VYVVWKKrqYxnltAi58ig2Lh9fCtl4b9zNVqDJ5DtgIZkAy+wM+Ewl8VwjSqCrQSOmXsarjLOIQomXVbqXtJmnTrbsszLcQrbKbjKTa9o7bHYC3FZnjv6mmcCzKLk+AV5V1ChifYV6In4A105z9CNQbknwm4WG/Kcb5EmtyY3CxHb8Znz9ymllOL3wa4s4t6qA78b7AvHR68XeyDNtsgM09F2wwqlMOSqQ3X1lFuUZKs/CyZ8EyJGn9vBOOLw7fGX3PjueS1gmXeq1Y8N56tur9fkukEauLOCDVZQqr4qaeeSUZbC6FwQg== 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:(13230028)(4636009)(396003)(136003)(376002)(39860400002)(346002)(451199021)(36840700001)(40470700004)(46966006)(36860700001)(82310400005)(47076005)(966005)(478600001)(7696005)(6666004)(2616005)(54906003)(426003)(83380400001)(336012)(26005)(53546011)(1076003)(186003)(16526019)(6286002)(2906002)(5660300002)(40460700003)(36756003)(70206006)(356005)(4326008)(7636003)(70586007)(82740400003)(55016003)(40480700001)(316002)(86362001)(8936002)(8676002)(41300700001)(6916009); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:41:09.5925 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a3fe563f-74bb-4d74-9841-08db7547293b 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: BN8NAM11FT062.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9267 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.3 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/27/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=175e7a7bacdaaa3b6f3e1f874ebe57bbc294824d Thanks. Xueming Li --- >From 175e7a7bacdaaa3b6f3e1f874ebe57bbc294824d 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 Cc: Xueming Li [ 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 d4ea9daddc..b9a848540b 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 @@ -5609,17 +5610,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) { @@ -5637,7 +5627,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.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:32:00.070083100 +0800 +++ 0058-net-hns3-fix-IMP-reset-trigger.patch 2023-06-25 14:31:58.405773900 +0800 @@ -1 +1 @@ -From 56a6c88ba27bfba838b56796de364db04c59b84b Mon Sep 17 00:00:00 2001 +From 175e7a7bacdaaa3b6f3e1f874ebe57bbc294824d Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 56a6c88ba27bfba838b56796de364db04c59b84b ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index dccd1d416f..95c72e86aa 100644 +index d4ea9daddc..b9a848540b 100644 @@ -33 +35 @@ -@@ -5575,17 +5576,6 @@ hns3_func_reset_cmd(struct hns3_hw *hw, int func_id) +@@ -5609,17 +5610,6 @@ hns3_func_reset_cmd(struct hns3_hw *hw, int func_id) @@ -51 +53 @@ -@@ -5603,7 +5593,9 @@ hns3_msix_process(struct hns3_adapter *hns, enum hns3_reset_level reset_level) +@@ -5637,7 +5627,9 @@ hns3_msix_process(struct hns3_adapter *hns, enum hns3_reset_level reset_level)