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

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

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/11/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://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/be2dc69e862528861874f84e21604504ddfe3011

Thanks.

Kevin

---
>From be2dc69e862528861874f84e21604504ddfe3011 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

[ 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 fe94cbe1ff..813e42b2d5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -755,4 +755,5 @@ 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>
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index a48a355d39..da9635507e 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -207,4 +207,5 @@ vmxnet3_disable_intr(struct vmxnet3_hw *hw, unsigned int intr_idx)
 }
 
+#ifndef RTE_EXEC_ENV_FREEBSD
 /*
  * Enable all intrs used by the device
@@ -228,4 +229,5 @@ vmxnet3_enable_all_intrs(struct vmxnet3_hw *hw)
 	}
 }
+#endif
 
 /*
@@ -964,4 +966,5 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)
 	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,
@@ -975,4 +978,5 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)
 	/* enable all intrs */
 	vmxnet3_enable_all_intrs(hw);
+#endif
 
 	vmxnet3_process_events(dev);
-- 
2.43.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-03-05 14:08:55.814921386 +0000
+++ 0049-net-vmxnet3-fix-initialization-on-FreeBSD.patch	2024-03-05 14:08:54.677520837 +0000
@@ -1 +1 @@
-From 40d5676ff1ea43cc2c121fd66d19a29a1c9107bb Mon Sep 17 00:00:00 2001
+From be2dc69e862528861874f84e21604504ddfe3011 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 40d5676ff1ea43cc2c121fd66d19a29a1c9107bb ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index d85e074fbd..32ff4ceb4b 100644
+index fe94cbe1ff..813e42b2d5 100644
@@ -27 +28 @@
-@@ -787,4 +787,5 @@ Levend Sayar <levendsayar at gmail.com>
+@@ -755,4 +755,5 @@ Levend Sayar <levendsayar at gmail.com>
@@ -34 +35 @@
-index b239ea3ede..1e6febb092 100644
+index a48a355d39..da9635507e 100644
@@ -37 +38 @@
-@@ -259,4 +259,5 @@ vmxnet3_disable_all_intrs(struct vmxnet3_hw *hw)
+@@ -207,4 +207,5 @@ vmxnet3_disable_intr(struct vmxnet3_hw *hw, unsigned int intr_idx)
@@ -43 +44 @@
-@@ -282,4 +283,5 @@ vmxnet3_enable_all_intrs(struct vmxnet3_hw *hw)
+@@ -228,4 +229,5 @@ vmxnet3_enable_all_intrs(struct vmxnet3_hw *hw)
@@ -49 +50 @@
-@@ -1131,4 +1133,5 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)
+@@ -964,4 +966,5 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)
@@ -55 +56 @@
-@@ -1142,4 +1145,5 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)
+@@ -975,4 +978,5 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)