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 86D6FA0C3F for ; Sat, 12 Jun 2021 01:16:33 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7FD9B406A2; Sat, 12 Jun 2021 01:16:33 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2061.outbound.protection.outlook.com [40.107.94.61]) by mails.dpdk.org (Postfix) with ESMTP id 9F11F4003F for ; Sat, 12 Jun 2021 01:16:31 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mHEKnKH6T4y1BKJ2+w/CUHXDLtrWl1klTBTpAiuhgFZuE+mXimWTJEdMSBtQGG4fduWPJZuwz3T42Vegkf/AaDviBcf5OL0Ee2GQt6u8oSopJntHzENAa758Y0OHH0LX582sntpoWN279zPkEhDFo+YGTAoEN7nZwBINqOlTdNXZLK7rVeV7a8IlTqQJS8yX1AEiktkMGUVCeDppZ22cs1SywPv7tVYacEExjE7qV20rHUOXnYqEFZkf02M72+ykHbqivEsTgFTQ/kwhb3FLXLnw2xpqRdvB17Ix24jnK7tCnsZV6ouTzl1bBzIS0oO7zfybahzNHji9sa5e42ZstQ== 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-SenderADCheck; bh=eozLJHTkZUTHeae6TrCPkVGX1liSQjClb4WX0Q8FKo0=; b=lnYrlh3rW7ZVVN0f9sgLcl1MpFjdMi5kHEgF3lSAslG1ykS56WEbVh7gKxxPRCoJIDJiynEH3QcEBs27ECV41daVAkB/kgZauykkf/Ib/pdPwybz4G69BLMMUseW03qKDOdC+eViUorOvxQn/tch7cLINxlasGw0+CK9TzEoYl7xECM+q6rxwcENa1L3wdbKsvyEgkrhWLOtZ8DeYdKLp7wtV3NeSUoRAIZFgk3d2mDCwVXj7RKhbk0utByoVT2EXURUJ58DYIwOLB6e4q7N2wj/rlkC1ldyqxW6vwCAq2tE24uhDHLbXwvk57GUOxMj8RIff4AjRTSzR40tTpQcSQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=huawei.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none 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=eozLJHTkZUTHeae6TrCPkVGX1liSQjClb4WX0Q8FKo0=; b=I49bNSWvgbYRzzILaE6gV5qlpI3iNmwW411B4cByJQUEjCVHkYlcpLz9TdAp5K3NZ8atz59d1Wj0mPpf1QPxD45u7/UKW/AOnOs00F6XYh417QZGP4TKxSI8bN1s77iP6v7UG5FBmSsgqnaYgINCITg3vnloJVqsQ/DueLpGmM0iTrCGXL3edzZ1u09TxhbGmMulVvdquhO2L7D4sMgzNb6B8qAkxYtA+bIQ0dKXwM84cL9+utqdSfuy4Na5hGb/nvI3ej51+7zaVbtmqyTg4Mj0IJ2GdWD+yTi5u7huKuUWCmF/CFWqDI0HWmRy/SYXuxRW/uTK3K+89Noo58yQhA== Received: from BN9PR03CA0782.namprd03.prod.outlook.com (2603:10b6:408:13f::7) by DM4PR12MB5328.namprd12.prod.outlook.com (2603:10b6:5:39f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.23; Fri, 11 Jun 2021 23:16:30 +0000 Received: from BN8NAM11FT005.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13f:cafe::58) by BN9PR03CA0782.outlook.office365.com (2603:10b6:408:13f::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Fri, 11 Jun 2021 23:16:30 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; huawei.com; dkim=none (message not signed) header.d=none;huawei.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT005.mail.protection.outlook.com (10.13.176.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:16:30 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:16:28 +0000 From: Xueming Li To: Chengwen Feng CC: Luca Boccassi , Min Hu , dpdk stable Date: Sat, 12 Jun 2021 07:03:38 +0800 Message-ID: <20210611230433.8208-124-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8c40646b-38b0-48a0-0686-08d92d2ef21f X-MS-TrafficTypeDiagnostic: DM4PR12MB5328: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nmVxoYKBvncc5Aoo3/SQjuOlT9CChIufEtx/5ljaI3HTWLZh+ob1PYaV4whlyYIEQh4rp0z9hkhi47qpTD18YXUuh2jRueCJy3iFYFgFQZXZg4gLLFGdTUA+ktrng5/DQCh3hzy/33MAP4njWHmZvBE2i1iEepGPOzNBFbnlMvuhZVk8nmhJoKT3wPhvINAXwiS1LTW4N3jthhgXYr/4Acf/E2CSCyS3TY2eIUiVd4InBCnLtHbJHVaUN3PMWpSFOHG/uCZdubzDMQCeUyOtH3imhGpuhbpb+ZE78nikrENjHkx5O8C3hpMMFIZDJLd6j+QEZCtLpx4iTctiJcfHNMrjnlwyR1u2rcPka075j1j61MY3ipIYMgc3ked/vH1Hj0qJGhv/74rdko8WVJLtNRNFnYNHWgsba6sX6NllhNpsKrbutoB4ZKUmmQRX1eXOcCCpT5yJO2ywykG+/eKOw/ONkuq2fl1OGKL2o8g2V5eVN/wCroF8gyZvYum60Tx8m6ggVkTZnw7F8jOBOsk303Vxqk4fk7Cr+hv5AXjGHi3Cg/AGJRB4SWfJbqTjuOhMmIiYViX5gsWaqfExBUnzGuMKPdbWC/4VrINFGcroSncFCi2mpLQ+5DsGch3rdiSELD7Ye+/dpawLI66SxgTAJ0VO5AgrB2aj7uzZqQGCipPi0m04UdbboelMQkF9UtOguOOoZfhYjhNZYZsdLeBmmH41BvstQjMxeWL4AkMekW6fDLtzCgjnKBCalKrdaaZcvkXtpteVpDS9WxNZzfnBJxAID8a2oh6LDKBFh2NGSQxwM+B8x1FgVrgzHcHtcG1x X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(346002)(396003)(136003)(376002)(39860400002)(46966006)(36840700001)(966005)(316002)(82310400003)(54906003)(2906002)(86362001)(70586007)(36756003)(55016002)(8936002)(70206006)(4326008)(1076003)(356005)(5660300002)(36906005)(36860700001)(82740400003)(53546011)(6666004)(26005)(6916009)(336012)(47076005)(478600001)(16526019)(7636003)(6286002)(7696005)(2616005)(426003)(83380400001)(8676002)(186003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:16:30.1841 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8c40646b-38b0-48a0-0686-08d92d2ef21f X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT005.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5328 Subject: [dpdk-stable] patch 'net/hns3: fix TM QCN error event report by MSI-X' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.2 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/14/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/5244852443b92ff078d87665109c8452e4aa1e22 Thanks. Xueming Li --- >From 5244852443b92ff078d87665109c8452e4aa1e22 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Sat, 8 May 2021 15:40:57 +0800 Subject: [PATCH] net/hns3: fix TM QCN error event report by MSI-X Cc: Luca Boccassi [ upstream commit ffb62592f80faf70fa3627c3de34e137883333cf ] The TM QCN error event should report by RAS other than MSIX. Also this patch adds fifo int enable configuration before the TM QCN error event is enabled. Fixes: f53a793bb7c2 ("net/hns3: add more hardware error types") Fixes: 3903c05382c5 ("net/hns3: remove read when enabling TM QCN error event") Signed-off-by: Chengwen Feng Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_intr.c | 5 ++++- drivers/net/hns3/hns3_intr.h | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/hns3/hns3_intr.c b/drivers/net/hns3/hns3_intr.c index b133670be0..99b5301689 100644 --- a/drivers/net/hns3/hns3_intr.c +++ b/drivers/net/hns3/hns3_intr.c @@ -1346,8 +1346,11 @@ enable_tm_err_intr(struct hns3_adapter *hns, bool en) /* configure TM QCN hw errors */ hns3_cmd_setup_basic_desc(&desc, HNS3_OPC_TM_QCN_MEM_INT_CFG, false); - if (en) + desc.data[0] = rte_cpu_to_le_32(HNS3_TM_QCN_ERR_INT_TYPE); + if (en) { + desc.data[0] |= rte_cpu_to_le_32(HNS3_TM_QCN_FIFO_INT_EN); desc.data[1] = rte_cpu_to_le_32(HNS3_TM_QCN_MEM_ERR_INT_EN); + } ret = hns3_cmd_send(hw, &desc, 1); if (ret) diff --git a/drivers/net/hns3/hns3_intr.h b/drivers/net/hns3/hns3_intr.h index d87d3ce1d7..17bd0519c4 100644 --- a/drivers/net/hns3/hns3_intr.h +++ b/drivers/net/hns3/hns3_intr.h @@ -74,6 +74,8 @@ #define HNS3_NCSI_ERR_INT_EN 0x3 #define HNS3_TM_SCH_ECC_ERR_INT_EN 0x3 +#define HNS3_TM_QCN_ERR_INT_TYPE 0x29 +#define HNS3_TM_QCN_FIFO_INT_EN 0xFFFF00 #define HNS3_TM_QCN_MEM_ERR_INT_EN 0xFFFFFF #define HNS3_RESET_PROCESS_MS 200 -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:59.769008700 +0800 +++ 0124-net-hns3-fix-TM-QCN-error-event-report-by-MSI-X.patch 2021-06-12 06:53:56.530000000 +0800 @@ -1 +1 @@ -From ffb62592f80faf70fa3627c3de34e137883333cf Mon Sep 17 00:00:00 2001 +From 5244852443b92ff078d87665109c8452e4aa1e22 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit ffb62592f80faf70fa3627c3de34e137883333cf ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 905c6d9513..6bdb17f622 100644 +index b133670be0..99b5301689 100644 @@ -26 +28 @@ -@@ -1783,8 +1783,11 @@ enable_tm_err_intr(struct hns3_adapter *hns, bool en) +@@ -1346,8 +1346,11 @@ enable_tm_err_intr(struct hns3_adapter *hns, bool en) @@ -40 +42 @@ -index 8bee8d77af..1a0f196614 100644 +index d87d3ce1d7..17bd0519c4 100644 @@ -43 +45 @@ -@@ -77,6 +77,8 @@ +@@ -74,6 +74,8 @@