patch 'net/vmxnet3: fix initialization on FreeBSD' has been queued to stable release 23.11.1

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/31/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=c65a2bfc264067ab34b81bad07f6f273524488ce

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From c65a2bfc264067ab34b81bad07f6f273524488ce Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Tue, 9 Jan 2024 14:23:43 +0000
Subject: [PATCH] net/vmxnet3: fix initialization on FreeBSD
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 40d5676ff1ea43cc2c121fd66d19a29a1c9107bb ]

DPDK does not support interrupts on FreeBSD, so the vmxnet3 driver
returns error when enabling interrupts as it initializes. We can fix
this by #ifdef'ing out the interrupt calls when building for FreeBSD,
allowing the driver to initialize correctly.

Fixes: 046f11619567 ("net/vmxnet3: support MSI-X interrupt")

Reported-by: Lewis Donzis <lew at perftech.com>
Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Tested-by: Lewis Donzis <lew at perftech.com>
Acked-by: Ferruh Yigit <ferruh.yigit at amd.com>
---
 .mailmap                             | 1 +
 drivers/net/vmxnet3/vmxnet3_ethdev.c | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/.mailmap b/.mailmap
index 540a3caab7..aada8ea84c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -785,6 +785,7 @@ Leszek Zygo <leszek.zygo at intel.com>
 Levend Sayar <levendsayar at gmail.com>
 Lev Faerman <lev.faerman at intel.com>
 Lewei Yang <leweix.yang at intel.com>
+Lewis Donzis <lew at perftech.com>
 Leyi Rong <leyi.rong at intel.com>
 Liang Ma <liangma at bytedance.com> <liangma at liangbit.com> <liang.j.ma at intel.com>
 Liang-Min Larry Wang <liang-min.wang at intel.com>
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index e49191718a..7032f0e324 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -257,6 +257,7 @@ vmxnet3_disable_all_intrs(struct vmxnet3_hw *hw)
 		vmxnet3_disable_intr(hw, i);
 }

+#ifndef RTE_EXEC_ENV_FREEBSD
 /*
  * Enable all intrs used by the device
  */
@@ -280,6 +281,7 @@ vmxnet3_enable_all_intrs(struct vmxnet3_hw *hw)
 			vmxnet3_enable_intr(hw, i);
 	}
 }
+#endif

 /*
  * Gets tx data ring descriptor size.
@@ -1129,6 +1131,7 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)
 	/* Setting proper Rx Mode and issue Rx Mode Update command */
 	vmxnet3_dev_set_rxmode(hw, VMXNET3_RXM_UCAST | VMXNET3_RXM_BCAST, 1);

+#ifndef RTE_EXEC_ENV_FREEBSD
 	/* Setup interrupt callback  */
 	rte_intr_callback_register(dev->intr_handle,
 				   vmxnet3_interrupt_handler, dev);
@@ -1140,6 +1143,7 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)

 	/* enable all intrs */
 	vmxnet3_enable_all_intrs(hw);
+#endif

 	vmxnet3_process_events(dev);

--
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-03-05 17:39:33.839424795 +0800
+++ 0094-net-vmxnet3-fix-initialization-on-FreeBSD.patch	2024-03-05 17:39:30.863566496 +0800
@@ -1 +1 @@
-From 40d5676ff1ea43cc2c121fd66d19a29a1c9107bb Mon Sep 17 00:00:00 2001
+From c65a2bfc264067ab34b81bad07f6f273524488ce Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 40d5676ff1ea43cc2c121fd66d19a29a1c9107bb ]
@@ -12 +14,0 @@
-Cc: stable at dpdk.org
@@ -24 +26 @@
-index d85e074fbd..32ff4ceb4b 100644
+index 540a3caab7..aada8ea84c 100644
@@ -27 +29 @@
-@@ -786,6 +786,7 @@ Leszek Zygo <leszek.zygo at intel.com>
+@@ -785,6 +785,7 @@ Leszek Zygo <leszek.zygo at intel.com>
@@ -36 +38 @@
-index b239ea3ede..1e6febb092 100644
+index e49191718a..7032f0e324 100644
@@ -39 +41 @@
-@@ -258,6 +258,7 @@ vmxnet3_disable_all_intrs(struct vmxnet3_hw *hw)
+@@ -257,6 +257,7 @@ vmxnet3_disable_all_intrs(struct vmxnet3_hw *hw)
@@ -47 +49 @@
-@@ -281,6 +282,7 @@ vmxnet3_enable_all_intrs(struct vmxnet3_hw *hw)
+@@ -280,6 +281,7 @@ vmxnet3_enable_all_intrs(struct vmxnet3_hw *hw)
@@ -55 +57 @@
-@@ -1130,6 +1132,7 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)
+@@ -1129,6 +1131,7 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)
@@ -63 +65 @@
-@@ -1141,6 +1144,7 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)
+@@ -1140,6 +1143,7 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)