patch 'net/txgbe: fix interrupt enable mask' has been queued to stable release 22.11.3

Xueming Li xuemingl at nvidia.com
Thu Aug 10 01:47:45 CEST 2023


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 08/11/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=a62297801ce18bdf1db7d7ea652b1825181efd02

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From a62297801ce18bdf1db7d7ea652b1825181efd02 Mon Sep 17 00:00:00 2001
From: Jiawen Wu <jiawenwu at trustnetic.com>
Date: Wed, 14 Jun 2023 10:34:22 +0800
Subject: [PATCH] net/txgbe: fix interrupt enable mask
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 646b058472cdfb503a0c555ed2e0f891c05437a7 ]

When using no LSC mode, GPIO interrupt can still cause
txgbe_dev_interrupt_delayed_handler() to be called, with
TXGBE_FLAG_NEED_LINK_UPDATE to be set. So add a LSC condition on
intr->mask_misc.

Fixes: 2fc745e6b606 ("net/txgbe: add interrupt operation")
Fixes: d3bb4a04eac1 ("net/txgbe: add SFP hotplug identification")

Signed-off-by: Jiawen Wu <jiawenwu at trustnetic.com>
---
 drivers/net/txgbe/txgbe_ethdev.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
index e0df734946..6562bddd6b 100644
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -3143,7 +3143,8 @@ txgbe_dev_interrupt_delayed_handler(void *param)
 	}
 
 	/* restore original mask */
-	intr->mask_misc |= TXGBE_ICRMISC_LSC;
+	if (dev->data->dev_conf.intr_conf.lsc == 1)
+		intr->mask_misc |= TXGBE_ICRMISC_LSC;
 
 	intr->mask = intr->mask_orig;
 	intr->mask_orig = 0;
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-08-09 21:51:18.866851800 +0800
+++ 0023-net-txgbe-fix-interrupt-enable-mask.patch	2023-08-09 21:51:18.144352000 +0800
@@ -1 +1 @@
-From 646b058472cdfb503a0c555ed2e0f891c05437a7 Mon Sep 17 00:00:00 2001
+From a62297801ce18bdf1db7d7ea652b1825181efd02 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 646b058472cdfb503a0c555ed2e0f891c05437a7 ]
@@ -13 +15,0 @@
-Cc: stable at dpdk.org
@@ -21 +23 @@
-index a3d7461951..5eff1a766e 100644
+index e0df734946..6562bddd6b 100644
@@ -24 +26 @@
-@@ -3232,7 +3232,8 @@ txgbe_dev_interrupt_delayed_handler(void *param)
+@@ -3143,7 +3143,8 @@ txgbe_dev_interrupt_delayed_handler(void *param)


More information about the stable mailing list