patch 'net/i40e: fix comments' has been queued to stable release 20.11.9

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/22/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://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/64157a7dac4f3d628e5c1554b9ae049d81216367

Thanks.

Luca Boccassi

---
>From 64157a7dac4f3d628e5c1554b9ae049d81216367 Mon Sep 17 00:00:00 2001
From: Jieqiang Wang <jieqiang.wang at arm.com>
Date: Wed, 12 Jul 2023 18:07:32 +0800
Subject: [PATCH] net/i40e: fix comments

[ upstream commit 5267a2ae78e873d3a7e175944dcedffdadab6483 ]

The limitation of burst size in i40e vector rx has been removed, but the
comment lines have not been updated to reflect the code changes. Remove
those lines to avoid confusion. Additionally, fix a typo in
i40e_tx_queue.

Fixes: 9e27f00f3a61 ("net/i40e: fix vector Rx")

Signed-off-by: Jieqiang Wang <jieqiang.wang at arm.com>
Reviewed-by: Ruifeng Wang <ruifeng.wang at arm.com>
---
 drivers/net/i40e/i40e_rxtx.h             | 2 +-
 drivers/net/i40e/i40e_rxtx_vec_altivec.c | 2 --
 drivers/net/i40e/i40e_rxtx_vec_neon.c    | 2 --
 drivers/net/i40e/i40e_rxtx_vec_sse.c     | 2 --
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/net/i40e/i40e_rxtx.h b/drivers/net/i40e/i40e_rxtx.h
index 2786bdcff9..01ba91cdec 100644
--- a/drivers/net/i40e/i40e_rxtx.h
+++ b/drivers/net/i40e/i40e_rxtx.h
@@ -165,7 +165,7 @@ struct i40e_tx_queue {
 	bool q_set; /**< indicate if tx queue has been configured */
 	bool tx_deferred_start; /**< don't start this queue in dev start */
 	uint8_t dcb_tc;         /**< Traffic class of tx queue */
-	uint64_t offloads; /**< Tx offload flags of DEV_RX_OFFLOAD_* */
+	uint64_t offloads; /**< Tx offload flags of DEV_TX_OFFLOAD_* */
 	const struct rte_memzone *mz;
 };
 
diff --git a/drivers/net/i40e/i40e_rxtx_vec_altivec.c b/drivers/net/i40e/i40e_rxtx_vec_altivec.c
index b24f3963f4..4816959178 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_altivec.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_altivec.c
@@ -448,8 +448,6 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts,
 
  /* Notice:
   * - nb_pkts < RTE_I40E_DESCS_PER_LOOP, just return no packet
-  * - nb_pkts > RTE_I40E_VPMD_RX_BURST, only scan RTE_I40E_VPMD_RX_BURST
-  *   numbers of DD bits
   */
 uint16_t
 i40e_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
diff --git a/drivers/net/i40e/i40e_rxtx_vec_neon.c b/drivers/net/i40e/i40e_rxtx_vec_neon.c
index 28bf046e88..f828937e00 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_neon.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_neon.c
@@ -447,8 +447,6 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *__rte_restrict rxq,
  /*
  * Notice:
  * - nb_pkts < RTE_I40E_DESCS_PER_LOOP, just return no packet
- * - nb_pkts > RTE_I40E_VPMD_RX_BURST, only scan RTE_I40E_VPMD_RX_BURST
- *   numbers of DD bits
  */
 uint16_t
 i40e_recv_pkts_vec(void *__rte_restrict rx_queue,
diff --git a/drivers/net/i40e/i40e_rxtx_vec_sse.c b/drivers/net/i40e/i40e_rxtx_vec_sse.c
index a8aa5bc0cc..1478f994c9 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_sse.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_sse.c
@@ -595,8 +595,6 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts,
  /*
  * Notice:
  * - nb_pkts < RTE_I40E_DESCS_PER_LOOP, just return no packet
- * - nb_pkts > RTE_I40E_VPMD_RX_BURST, only scan RTE_I40E_VPMD_RX_BURST
- *   numbers of DD bits
  */
 uint16_t
 i40e_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-07-20 11:54:24.326440927 +0100
+++ 0002-net-i40e-fix-comments.patch	2023-07-20 11:54:24.225504368 +0100
@@ -1 +1 @@
-From 5267a2ae78e873d3a7e175944dcedffdadab6483 Mon Sep 17 00:00:00 2001
+From 64157a7dac4f3d628e5c1554b9ae049d81216367 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5267a2ae78e873d3a7e175944dcedffdadab6483 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -17 +17,0 @@
- .mailmap                                 | 1 +
@@ -22 +22 @@
- 5 files changed, 2 insertions(+), 7 deletions(-)
+ 4 files changed, 1 insertion(+), 7 deletions(-)
@@ -24,12 +23,0 @@
-diff --git a/.mailmap b/.mailmap
-index 6eccf0c555..670d312f84 100644
---- a/.mailmap
-+++ b/.mailmap
-@@ -628,6 +628,7 @@ Jie Liu <jie2.liu at hxt-semitech.com>
- Jie Pan <panjie5 at jd.com>
- Jie Wang <jie1x.wang at intel.com>
- Jie Zhou <jizh at linux.microsoft.com> <jizh at microsoft.com>
-+Jieqiang Wang <jieqiang.wang at arm.com>
- Jijiang Liu <jijiang.liu at intel.com>
- Jilei Chen <chenjilei at cmss.chinamobile.com>
- Jim Harris <james.r.harris at intel.com>
@@ -37 +25 @@
-index 0376c219be..a8686224e5 100644
+index 2786bdcff9..01ba91cdec 100644
@@ -40 +28 @@
-@@ -169,7 +169,7 @@ struct i40e_tx_queue {
+@@ -165,7 +165,7 @@ struct i40e_tx_queue {
@@ -44,2 +32,2 @@
--	uint64_t offloads; /**< Tx offload flags of RTE_ETH_RX_OFFLOAD_* */
-+	uint64_t offloads; /**< Tx offload flags of RTE_ETH_TX_OFFLOAD_* */
+-	uint64_t offloads; /**< Tx offload flags of DEV_RX_OFFLOAD_* */
++	uint64_t offloads; /**< Tx offload flags of DEV_TX_OFFLOAD_* */
@@ -50 +38 @@
-index 8672ad1c41..4cd78f4e58 100644
+index b24f3963f4..4816959178 100644
@@ -53 +41 @@
-@@ -449,8 +449,6 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts,
+@@ -448,8 +448,6 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts,
@@ -63 +51 @@
-index 49391fe4c7..d873e30972 100644
+index 28bf046e88..f828937e00 100644
@@ -66 +54 @@
-@@ -574,8 +574,6 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *__rte_restrict rxq,
+@@ -447,8 +447,6 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *__rte_restrict rxq,
@@ -76 +64 @@
-index baf83cb3df..b94c37cbb8 100644
+index a8aa5bc0cc..1478f994c9 100644
@@ -79 +67 @@
-@@ -596,8 +596,6 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts,
+@@ -595,8 +595,6 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts,