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 82AFD457A1 for ; Mon, 12 Aug 2024 14:59:01 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 781934066A; Mon, 12 Aug 2024 14:59:01 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2083.outbound.protection.outlook.com [40.107.94.83]) by mails.dpdk.org (Postfix) with ESMTP id 35FE5402C3 for ; Mon, 12 Aug 2024 14:58:59 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Wwro4KIioOD0B8OEYIhjM97xVplS6aCcAQ+vki2oQjF2t9pWomJSGrXhefknH7Nk7XB6MYzZJsGsfAF+Nx6bAKpaXMho8rO1KoOhWsVpKYdlWuxzxt9MronkcR9+H80UN+3yMcUqqchV+CHweEulUgDsOuiaT3Rw7hXK4CGqFw2wzUb+mZ3QAchUS/XuxaKPJK8E3yIyaT6ghyuTmZY16gVUa6OM72WpdJdSa31ox7vVO42hFnyWBMtN1ELS76HilL37H5hEfmpdMjX7y4ljGNP2f2kA3EsNylmFHMEKy7yp52Lh5lSEDwOhEff1ZB8thnQFjS0S3bAqoCcS0v2VbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=mYqshtiHdMR/tq8ZGmFxPGlmPBG962JK2LSg1xM+8d0=; b=ebycMNzhKEbs5EGCwFeHAtBaM+Xv+OY7up+/grCq5zUJgDnQCBwR/7jND/lGPWMkBqgmX3vEo18Rn3RmuhKHKkVihgKvoQByucT+HUF6mycCEMihUgbdguaUBfT4yfQTAbpjibqHPnRDrxNb0oXoua6g23zy9iYbbyNFg1I8ygn9he2qwapF/41I8ujTxh6vS+8hy03OCpLdAnbRowtfwpTqT3OoYda5OT+nagnqZxOv50TJgcWXGG4KtQ9J2j0eCFbCdmEYEhTZhYoDT5qUFxYO3TqVw/smbY0ZohJRIsUc9+QNUSZbxK97zpJaUybEc0frwEX2/2HW6kJkqX6DUQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=trustnetic.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=mYqshtiHdMR/tq8ZGmFxPGlmPBG962JK2LSg1xM+8d0=; b=t64e0u1dJ7IibjZHg2uxu0S+SsjD6p4gnp72mWMEoJ2XoYhnV4kgfzlrYUsIioS/xq7IjyTJXduJVhygnaRKIohxVQiJSMfE7dyLLuR9dd2uuW1mc32vsHtdLnTykHT0hdTpDiYm8CHPEbBEfhWc6dwYaYwzQXshm+LxqubNoNg7pSKpoN5xwrlhoT39NG1oKNc1H2vlUqiT0aeIhE83gm5BBklbXyv0Ik5KI7JV7KUmQJMXx3fg1e/goiGeplsLU2wggtJRzLX/07VTV9Q5nRvTrZFpT92QBFQ3lrxiBUE/1SGH+UALJzDEIaFkPk23PgWNwhrrnhES1wB4ZLftEQ== Received: from SJ0PR13CA0143.namprd13.prod.outlook.com (2603:10b6:a03:2c6::28) by MN2PR12MB4256.namprd12.prod.outlook.com (2603:10b6:208:1d2::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20; Mon, 12 Aug 2024 12:58:54 +0000 Received: from CO1PEPF000042A7.namprd03.prod.outlook.com (2603:10b6:a03:2c6:cafe::b9) by SJ0PR13CA0143.outlook.office365.com (2603:10b6:a03:2c6::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20 via Frontend Transport; Mon, 12 Aug 2024 12:58:54 +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 CO1PEPF000042A7.mail.protection.outlook.com (10.167.243.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.19 via Frontend Transport; Mon, 12 Aug 2024 12:58:53 +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.1544.4; Mon, 12 Aug 2024 05:58:34 -0700 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.1544.4; Mon, 12 Aug 2024 05:58:33 -0700 From: Xueming Li To: Jiawen Wu CC: , dpdk stable Subject: patch 'net/txgbe: fix Rx interrupt' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:49:21 +0800 Message-ID: <20240812125035.389667-85-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-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: CO1PEPF000042A7:EE_|MN2PR12MB4256:EE_ X-MS-Office365-Filtering-Correlation-Id: 0e96af1c-7a63-4e33-4e9b-08dcbace84fd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|36860700013|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?/GgrxWMtI3yVwjwiFDluuqmsx5T1I1P2Mv85rRfG5T7tFPmQ/aXjXEBk6OZy?= =?us-ascii?Q?sGlBd+38lrNNgAMhjYyGyxq0V5/4FAD/w/tgmWwgxm2RxD4e6YW+DODiosB+?= =?us-ascii?Q?4PZYIkBwcls/ev9Uw8WXDYDY4DAw2jxWlOezdL5uanSgqfrrcfMw6TYw5JrK?= =?us-ascii?Q?kGLFSmWEmmQW+KGhHMCE+u5GEYOPEtXtPl6KUjlnDrcCo21Y2VFA2Uthj+iM?= =?us-ascii?Q?d/X+gC68wQYZszokGvJKvjYJ5c9gbhWriUAUd4csKH6qVYymgI7D/TMCbiyU?= =?us-ascii?Q?/3BD7Xggxqw7dnma+9wa14JLR91OFQuuYiZ0xzRq1Hi/b3VGM8bANNJt3Q/v?= =?us-ascii?Q?TC3jcQBvqJNZND4gPN21OQ+m6+BHje8HpXgmAblmYDg/ep/bNhtRixFfFOkH?= =?us-ascii?Q?VuDZ/RTPLRfcY0ZrBKRa6jICelSJryovrktheSedyplRlndZBU5/UeDwEQJw?= =?us-ascii?Q?G+N3XGwECJCXVCV3Ka7hFWnEOAyjgpvqj1X8AEzar1e3rRSviC7p1NEXHzYC?= =?us-ascii?Q?Xry7nvOyglDe96L9CjaXp8NTxeXM7F4H2EZoKrG4P/4VI+Eq7uoyXoWHAXep?= =?us-ascii?Q?p+NqITA57VZUiNwKI5cviMZTFkhlCmG/jbenkYb6TUI0zvH+aLRDzG11rEsx?= =?us-ascii?Q?S6wrPq9yJPYB8xN1Xs1XWfa+YkVh2biIj8GymwRdMN+SqHX4ahHvm/esudwu?= =?us-ascii?Q?ZkU5YtmiF9Sqfpo2dBvx8IMyPO24vVwZJiVVG6AwnOCwcnWQhtHqB4WJ/sNm?= =?us-ascii?Q?AWO8WDUpcwXDHALrXBczsOvD+jDyrEns5Kj5tmscqYt0MBKHVbBHo9wr0dPs?= =?us-ascii?Q?MI4+FF6YhPHu+E05mNKTG9uLkRNCBI81CGtBZupi0uCdJq26MwRCXROygkVO?= =?us-ascii?Q?G5yoqNbNuJAPpGKjwJEBxcXnZJwewHfD7ipQE1+kmcJ11Jg3Y2e6v4iT1EyH?= =?us-ascii?Q?hh9hntT3CEbL5DRaubR+cFTAMFrJW5X+K3Jy35WoRIHY5gt7Y6/CTMZBO3EB?= =?us-ascii?Q?NF0Fbp0qyhkWprnnmG9zywi4SriLY0mWKj6xskS0JT6DNItsRCH31/2EZUYA?= =?us-ascii?Q?7NYNZpjO/z/vcC22fEtLMjkZnuLWKMQboXAbHJqIKq2HAIoYGHHbx8ILbMUH?= =?us-ascii?Q?goUhDZqATRw2o9dbs+/zgOdwn4LyEzEx5z+amznw4ME7WLdYS/x35EqaXbbY?= =?us-ascii?Q?K82/ZVWiKmorWydPk1yODZHnLIOk48OLlD+6dyUs6ud6PfyOPbR/MRwGzdbH?= =?us-ascii?Q?EVQE6EUPYDnzEXr5IJDP9lWWH+mbaoah/GGyJfn/9Ur90+KD7bBlLzCFc/2x?= =?us-ascii?Q?rPcvCHCJJcqIGgdXydU5b2Y0VRnc91iyvECpI73OfP7hG9knZz/+NLC0DpFk?= =?us-ascii?Q?68VVK3haITquOmaZLOGZdP3jDULF3O7w7QTUirjF80070F0ytW6eeXSkzq5A?= =?us-ascii?Q?YqaZdwLdRO8Y4/1KsBV1aPNXmlhd+Iwo?= 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:(13230040)(376014)(36860700013)(82310400026)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:58:53.5115 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0e96af1c-7a63-4e33-4e9b-08dcbace84fd 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: CO1PEPF000042A7.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4256 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.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 08/14/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=fdc5f6074bd954cc85bfebc10fbb48c12b3f6673 Thanks. Xueming Li --- >From fdc5f6074bd954cc85bfebc10fbb48c12b3f6673 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Tue, 18 Jun 2024 15:11:47 +0800 Subject: [PATCH] net/txgbe: fix Rx interrupt Cc: Xueming Li [ upstream commit 37af8751f2726cd49881d2cf8089302893ea0f41 ] Fix Rx interrupt enable failure. Fixes: a5682d28f134 ("net/txgbe: support Rx interrupt") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/txgbe_ethdev.c | 18 +++++++++--------- drivers/net/txgbe/txgbe_ethdev_vf.c | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c index ee510fe83b..ad29c3cfec 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -3845,13 +3845,13 @@ txgbe_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id) struct txgbe_hw *hw = TXGBE_DEV_HW(dev); if (queue_id < 32) { - mask = rd32(hw, TXGBE_IMS(0)); - mask &= (1 << queue_id); - wr32(hw, TXGBE_IMS(0), mask); + mask = rd32(hw, TXGBE_IMC(0)); + mask |= (1 << queue_id); + wr32(hw, TXGBE_IMC(0), mask); } else if (queue_id < 64) { - mask = rd32(hw, TXGBE_IMS(1)); - mask &= (1 << (queue_id - 32)); - wr32(hw, TXGBE_IMS(1), mask); + mask = rd32(hw, TXGBE_IMC(1)); + mask |= (1 << (queue_id - 32)); + wr32(hw, TXGBE_IMC(1), mask); } rte_intr_enable(intr_handle); @@ -3866,11 +3866,11 @@ txgbe_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id) if (queue_id < 32) { mask = rd32(hw, TXGBE_IMS(0)); - mask &= ~(1 << queue_id); + mask |= (1 << queue_id); wr32(hw, TXGBE_IMS(0), mask); } else if (queue_id < 64) { mask = rd32(hw, TXGBE_IMS(1)); - mask &= ~(1 << (queue_id - 32)); + mask |= (1 << (queue_id - 32)); wr32(hw, TXGBE_IMS(1), mask); } @@ -3904,7 +3904,7 @@ txgbe_set_ivar_map(struct txgbe_hw *hw, int8_t direction, wr32(hw, TXGBE_IVARMISC, tmp); } else { /* rx or tx causes */ - /* Workaround for ICR lost */ + msix_vector |= TXGBE_IVAR_VLD; /* Workaround for ICR lost */ idx = ((16 * (queue & 1)) + (8 * direction)); tmp = rd32(hw, TXGBE_IVAR(queue >> 1)); tmp &= ~(0xFF << idx); diff --git a/drivers/net/txgbe/txgbe_ethdev_vf.c b/drivers/net/txgbe/txgbe_ethdev_vf.c index b42c94adc1..92603fccc2 100644 --- a/drivers/net/txgbe/txgbe_ethdev_vf.c +++ b/drivers/net/txgbe/txgbe_ethdev_vf.c @@ -970,7 +970,7 @@ txgbevf_set_ivar_map(struct txgbe_hw *hw, int8_t direction, wr32(hw, TXGBE_VFIVARMISC, tmp); } else { /* rx or tx cause */ - /* Workaround for ICR lost */ + msix_vector |= TXGBE_VFIVAR_VLD; /* Workaround for ICR lost */ idx = ((16 * (queue & 1)) + (8 * direction)); tmp = rd32(hw, TXGBE_VFIVAR(queue >> 1)); tmp &= ~(0xFF << idx); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:05.287592479 +0800 +++ 0084-net-txgbe-fix-Rx-interrupt.patch 2024-08-12 20:44:02.305069336 +0800 @@ -1 +1 @@ -From 37af8751f2726cd49881d2cf8089302893ea0f41 Mon Sep 17 00:00:00 2001 +From fdc5f6074bd954cc85bfebc10fbb48c12b3f6673 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 37af8751f2726cd49881d2cf8089302893ea0f41 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ -index 26cf7632c3..700be8f83c 100644 +index ee510fe83b..ad29c3cfec 100644 @@ -21 +23 @@ -@@ -3852,13 +3852,13 @@ txgbe_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id) +@@ -3845,13 +3845,13 @@ txgbe_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id) @@ -41 +43 @@ -@@ -3873,11 +3873,11 @@ txgbe_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id) +@@ -3866,11 +3866,11 @@ txgbe_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id) @@ -55 +57 @@ -@@ -3911,7 +3911,7 @@ txgbe_set_ivar_map(struct txgbe_hw *hw, int8_t direction, +@@ -3904,7 +3904,7 @@ txgbe_set_ivar_map(struct txgbe_hw *hw, int8_t direction, @@ -65 +67 @@ -index 87f76673d7..d075f9d232 100644 +index b42c94adc1..92603fccc2 100644 @@ -68 +70 @@ -@@ -971,7 +971,7 @@ txgbevf_set_ivar_map(struct txgbe_hw *hw, int8_t direction, +@@ -970,7 +970,7 @@ txgbevf_set_ivar_map(struct txgbe_hw *hw, int8_t direction,