[dpdk-stable] patch 'ethdev: move non-offload capabilities' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

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

Thanks.

Luca Boccassi

---
>From f03080aa7d797cf630881ba56d4167744b06d5c1 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Tue, 27 Oct 2020 14:20:22 +0100
Subject: [PATCH] ethdev: move non-offload capabilities

[ upstream commit e9ef7ec12be0764924b6eebfe2f00b15ed0345ff ]

The definitions of RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP
and RTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP were inserted
before the last comment of Tx offloads.

It is moved in a better place,
with comments moved to be before the definition.
A group comment is added to better describe device capabilities.

Fixes: cac923cfea47 ("ethdev: support runtime queue setup")

Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: Andrew Rybchenko <andrew.rybchenko at oktetlabs.ru>
---
 lib/librte_ethdev/rte_ethdev.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
index 51f9f2569f..017459e595 100644
--- a/lib/librte_ethdev/rte_ethdev.h
+++ b/lib/librte_ethdev/rte_ethdev.h
@@ -1160,17 +1160,20 @@ struct rte_eth_conf {
 #define DEV_TX_OFFLOAD_IP_TNL_TSO       0x00080000
 /** Device supports outer UDP checksum */
 #define DEV_TX_OFFLOAD_OUTER_UDP_CKSUM  0x00100000
-
-#define RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP 0x00000001
-/**< Device supports Rx queue setup after device started*/
-#define RTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP 0x00000002
-/**< Device supports Tx queue setup after device started*/
-
 /*
  * If new Tx offload capabilities are defined, they also must be
  * mentioned in rte_tx_offload_names in rte_ethdev.c file.
  */
 
+/**@{@name Device capabilities
+ * Non-offload capabilities reported in rte_eth_dev_info.dev_capa.
+ */
+/** Device supports Rx queue setup after device started. */
+#define RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP 0x00000001
+/** Device supports Tx queue setup after device started. */
+#define RTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP 0x00000002
+/**@}*/
+
 /*
  * Fallback default preferred Rx/Tx port parameters.
  * These are used if an application requests default parameters
-- 
2.27.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-09 18:40:13.345800073 +0000
+++ 0056-ethdev-move-non-offload-capabilities.patch	2020-11-09 18:40:11.191312216 +0000
@@ -1 +1 @@
-From e9ef7ec12be0764924b6eebfe2f00b15ed0345ff Mon Sep 17 00:00:00 2001
+From f03080aa7d797cf630881ba56d4167744b06d5c1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e9ef7ec12be0764924b6eebfe2f00b15ed0345ff ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -20,2 +21,2 @@
- lib/librte_ethdev/rte_ethdev.h | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
+ lib/librte_ethdev/rte_ethdev.h | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
@@ -24 +25 @@
-index f689550745..619cbe521e 100644
+index 51f9f2569f..017459e595 100644
@@ -27,5 +28,4 @@
-@@ -1419,18 +1419,20 @@ struct rte_eth_conf {
-  * The mbuf field and flag are registered when the offload is configured.
-  */
- #define DEV_TX_OFFLOAD_SEND_ON_TIMESTAMP 0x00200000
--
+@@ -1160,17 +1160,20 @@ struct rte_eth_conf {
+ #define DEV_TX_OFFLOAD_IP_TNL_TSO       0x00080000
+ /** Device supports outer UDP checksum */
+ #define DEV_TX_OFFLOAD_OUTER_UDP_CKSUM  0x00100000