patch 'net/mlx5: remove useless constants' has been queued to stable release 23.11.6

[Shani Peretz <shperetz@nvidia.com>]

Hi,

FYI, your patch has been queued to stable release 23.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 12/30/25. 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/shanipr/dpdk-stable

This queued commit can be viewed at:
https://github.com/shanipr/dpdk-stable/commit/88c6d25de97b6d7769e1d1bd85d4704d107b9087

Thanks.

Shani

---
From 88c6d25de97b6d7769e1d1bd85d4704d107b9087 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas@monjalon.net>
Date: Fri, 31 Oct 2025 21:38:26 +0100
Subject: [PATCH] net/mlx5: remove useless constants

[ upstream commit 9d3788534cba7cc3424e2a83db6b186211d4e94f ]

- MLX5_VEC_TX_CKSUM_OFFLOAD_CAP became unused when Tx metadata moved
  to a dynamic field.
- MLX5_ALARM_TIMEOUT_US became unused when reworking link status wait.
- MLX5_FLOW_SFT_HLIST_ARRAY_SIZE was never used in hash list handling.
- MLX5_FLOW_MIN_ID_POOL_SIZE and MLX5_ID_GENERATION_ARRAY_FACTOR became
  unused when the flow ID generator was replaced by ipool.
- MLX5_RSSQ_DEFAULT_NUM was used in the old per-thread flow workspace.
- MLX5_FLOW_TABLE_HWS_POLICY became unused because meter is not supported
  in HWS.
- IPPROTO_MPLS became unused because MPLS over IP is not supported.
- MLX5_L4_RSS_TYPES has never been used.
- ETH_TYPE_IPV4/V6_VXLAN were never used in HWS.
- PCI_DRV_FLAGS became unused when migrating to bus-agnostic probing.

Fixes: 9bf26e1318e3 ("ethdev: move egress metadata to dynamic field")
Fixes: cfee94752b8f ("net/mlx5: fix link status to use wait to complete")
Fixes: f3020a331dca ("net/mlx5: optimize hash list table allocate on demand")
Fixes: 4ae8825c5085 ("net/mlx5: use indexed pool as id generator")
Fixes: dc7c5e0aa905 ("net/mlx5: fix flow workspace destruction")
Fixes: 645f240d1cd5 ("net/mlx5: remove unsupported flow meter action in HWS")
Fixes: 14ad99d78a46 ("net/mlx5: remove unsupported flow item MPLS over IP")
Fixes: ae67e3c43dd5 ("net/mlx5: support RSS expansion in non-template HWS setup")
Fixes: c55c2bf35333 ("net/mlx5/hws: add definer layer")
Fixes: a7f34989e9ad ("net/mlx5: migrate to bus-agnostic common interface")

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 drivers/net/mlx5/hws/mlx5dr_definer.c | 2 --
 drivers/net/mlx5/mlx5.c               | 3 ---
 drivers/net/mlx5/mlx5.h               | 1 -
 drivers/net/mlx5/mlx5_defs.h          | 6 ------
 drivers/net/mlx5/mlx5_flow.h          | 4 ----
 drivers/net/mlx5/mlx5_rxtx_vec.h      | 7 -------
 drivers/net/mlx5/windows/mlx5_os.h    | 2 --
 7 files changed, 25 deletions(-)

diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c
index 4afe124769..9162dbeab2 100644
--- a/drivers/net/mlx5/hws/mlx5dr_definer.c
+++ b/drivers/net/mlx5/hws/mlx5dr_definer.c
@@ -6,8 +6,6 @@
 
 #define GTP_PDU_SC	0x85
 #define BAD_PORT	0xBAD
-#define ETH_TYPE_IPV4_VXLAN	0x0800
-#define ETH_TYPE_IPV6_VXLAN	0x86DD
 #define UDP_GTPU_PORT   2152
 #define UDP_VXLAN_PORT  4789
 #define UDP_PORT_MPLS   6635
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index c42a0ad7ff..711781ed34 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -384,9 +384,6 @@ static const struct mlx5_indexed_pool_config mlx5_ipool_cfg[] = {
 	},
 };
 
-#define MLX5_FLOW_MIN_ID_POOL_SIZE 512
-#define MLX5_ID_GENERATION_ARRAY_FACTOR 16
-
 #define MLX5_FLOW_TABLE_HLIST_ARRAY_SIZE 1024
 
 #define MLX5_RXQ_ENH_CQE_COMP_MASK 0x80
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index a5dde56ed9..5157aefe31 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -1189,7 +1189,6 @@ struct mlx5_flow_tbl_resource {
 #define MLX5_FLOW_TABLE_LEVEL_METER (MLX5_MAX_TABLES - 3)
 #define MLX5_FLOW_TABLE_LEVEL_POLICY (MLX5_MAX_TABLES - 4)
 #define MLX5_MAX_TABLES_EXTERNAL MLX5_FLOW_TABLE_LEVEL_POLICY
-#define MLX5_FLOW_TABLE_HWS_POLICY (MLX5_MAX_TABLES - 10)
 #define MLX5_MAX_TABLES_FDB UINT16_MAX
 #define MLX5_FLOW_TABLE_FACTOR 10
 
diff --git a/drivers/net/mlx5/mlx5_defs.h b/drivers/net/mlx5/mlx5_defs.h
index dc5216cb24..80e3a28687 100644
--- a/drivers/net/mlx5/mlx5_defs.h
+++ b/drivers/net/mlx5/mlx5_defs.h
@@ -46,9 +46,6 @@
 /* Maximum number of DCS created per port. */
 #define MLX5_HWS_CNT_DCS_NUM 4
 
-/* Alarm timeout. */
-#define MLX5_ALARM_TIMEOUT_US 100000
-
 /* Maximum number of extended statistics counters. */
 #define MLX5_MAX_XSTATS 64
 
@@ -170,9 +167,6 @@
 /* Size of the hash table for tag table. */
 #define MLX5_TAGS_HLIST_ARRAY_SIZE	(1 << 15)
 
-/* Size fo the hash table for SFT table. */
-#define MLX5_FLOW_SFT_HLIST_ARRAY_SIZE	4096
-
 /* Hairpin TX/RX queue configuration parameters. */
 #define MLX5_HAIRPIN_QUEUE_STRIDE 6
 #define MLX5_HAIRPIN_JUMBO_LOG_SIZE (14 + 2)
diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index 3303065f87..b4d743ea52 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -417,10 +417,6 @@ enum mlx5_feature_name {
 
 #define MLX5_FLOW_XCAP_ACTIONS (MLX5_FLOW_ACTION_ENCAP | MLX5_FLOW_ACTION_DECAP)
 
-#ifndef IPPROTO_MPLS
-#define IPPROTO_MPLS 137
-#endif
-
 /* UDP port number for MPLS */
 #define MLX5_UDP_PORT_MPLS 6635
 
diff --git a/drivers/net/mlx5/mlx5_rxtx_vec.h b/drivers/net/mlx5/mlx5_rxtx_vec.h
index 77c3f4efa0..672e301f77 100644
--- a/drivers/net/mlx5/mlx5_rxtx_vec.h
+++ b/drivers/net/mlx5/mlx5_rxtx_vec.h
@@ -13,13 +13,6 @@
 
 #include "mlx5_autoconf.h"
 
-/* HW checksum offload capabilities of vectorized Tx. */
-#define MLX5_VEC_TX_CKSUM_OFFLOAD_CAP \
-	(RTE_ETH_TX_OFFLOAD_IPV4_CKSUM | \
-	 RTE_ETH_TX_OFFLOAD_UDP_CKSUM | \
-	 RTE_ETH_TX_OFFLOAD_TCP_CKSUM | \
-	 RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM)
-
 /*
  * Compile time sanity check for vectorized functions.
  */
diff --git a/drivers/net/mlx5/windows/mlx5_os.h b/drivers/net/mlx5/windows/mlx5_os.h
index 8b58265687..7085e9b258 100644
--- a/drivers/net/mlx5/windows/mlx5_os.h
+++ b/drivers/net/mlx5/windows/mlx5_os.h
@@ -12,8 +12,6 @@ enum {
 	MLX5_FS_PATH_MAX = MLX5_DEVX_DEVICE_PNP_SIZE + 1
 };
 
-#define PCI_DRV_FLAGS 0
-
 #define MLX5_NAMESIZE MLX5_FS_NAME_MAX
 
 enum mlx5_sw_parsing_offloads {
-- 
2.43.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-12-25 11:16:37.607105184 +0200
+++ 0026-net-mlx5-remove-useless-constants.patch	2025-12-25 11:16:35.479935000 +0200
@@ -1 +1 @@
-From 9d3788534cba7cc3424e2a83db6b186211d4e94f Mon Sep 17 00:00:00 2001
+From 88c6d25de97b6d7769e1d1bd85d4704d107b9087 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9d3788534cba7cc3424e2a83db6b186211d4e94f ]
+
@@ -30 +31,0 @@
-Cc: stable@dpdk.org
@@ -34,8 +35,8 @@
- drivers/net/mlx5/hws/mlx5dr_definer.c |  2 --
- drivers/net/mlx5/mlx5.c               |  3 ---
- drivers/net/mlx5/mlx5.h               |  1 -
- drivers/net/mlx5/mlx5_defs.h          |  6 ------
- drivers/net/mlx5/mlx5_flow.h          | 10 ----------
- drivers/net/mlx5/mlx5_rxtx_vec.h      |  7 -------
- drivers/net/mlx5/windows/mlx5_os.h    |  2 --
- 7 files changed, 31 deletions(-)
+ drivers/net/mlx5/hws/mlx5dr_definer.c | 2 --
+ drivers/net/mlx5/mlx5.c               | 3 ---
+ drivers/net/mlx5/mlx5.h               | 1 -
+ drivers/net/mlx5/mlx5_defs.h          | 6 ------
+ drivers/net/mlx5/mlx5_flow.h          | 4 ----
+ drivers/net/mlx5/mlx5_rxtx_vec.h      | 7 -------
+ drivers/net/mlx5/windows/mlx5_os.h    | 2 --
+ 7 files changed, 25 deletions(-)
@@ -44 +45 @@
-index 1c6b3e38c4..afa70bf793 100644
+index 4afe124769..9162dbeab2 100644
@@ -47 +48,2 @@
-@@ -9,8 +9,6 @@
+@@ -6,8 +6,6 @@
+ 
@@ -50 +51,0 @@
- #define BAD_SQN		0xBAD
@@ -53,3 +54,3 @@
- #define UDP_VXLAN_PORT	4789
- #define UDP_VXLAN_GPE_PORT	4790
- #define UDP_GTPU_PORT	2152
+ #define UDP_GTPU_PORT   2152
+ #define UDP_VXLAN_PORT  4789
+ #define UDP_PORT_MPLS   6635
@@ -57 +58 @@
-index b018a4f0e2..4705c30801 100644
+index c42a0ad7ff..711781ed34 100644
@@ -60 +61 @@
-@@ -394,9 +394,6 @@ static const struct mlx5_indexed_pool_config mlx5_ipool_cfg[] = {
+@@ -384,9 +384,6 @@ static const struct mlx5_indexed_pool_config mlx5_ipool_cfg[] = {
@@ -71 +72 @@
-index 07418b0922..233cb416cb 100644
+index a5dde56ed9..5157aefe31 100644
@@ -74 +75 @@
-@@ -1259,7 +1259,6 @@ struct mlx5_flow_tbl_resource {
+@@ -1189,7 +1189,6 @@ struct mlx5_flow_tbl_resource {
@@ -80,2 +81,2 @@
- #define MLX5_FLOW_TABLE_PTYPE_RSS_NUM 1024
- #define MLX5_FLOW_TABLE_PTYPE_RSS_LAST (MLX5_MAX_TABLES - 11)
+ #define MLX5_FLOW_TABLE_FACTOR 10
+ 
@@ -83 +84 @@
-index d326fec000..b8e5122323 100644
+index dc5216cb24..80e3a28687 100644
@@ -107 +108 @@
-index ff61706054..1dca6e0532 100644
+index 3303065f87..b4d743ea52 100644
@@ -110,11 +111 @@
-@@ -222,9 +222,6 @@ struct mlx5_mirror {
- 	struct mlx5_mirror_clone clone[MLX5_MIRROR_MAX_CLONES_NUM];
- };
- 
--/* Default queue number. */
--#define MLX5_RSSQ_DEFAULT_NUM 16
--
- #define MLX5_FLOW_LAYER_OUTER_L2 (1u << 0)
- #define MLX5_FLOW_LAYER_OUTER_L3_IPV4 (1u << 1)
- #define MLX5_FLOW_LAYER_OUTER_L3_IPV6 (1u << 2)
-@@ -469,10 +466,6 @@ struct mlx5_mirror {
+@@ -417,10 +417,6 @@ enum mlx5_feature_name {
@@ -128,12 +119,2 @@
- #define MLX5_IPV6_HDR_ECN_MASK 0x3
- #define MLX5_IPV6_HDR_DSCP_SHIFT 2
- 
-@@ -519,9 +512,6 @@ struct mlx5_mirror {
- 	 RTE_ETH_RSS_NONFRAG_IPV4_TCP | RTE_ETH_RSS_NONFRAG_IPV4_UDP | \
- 	 RTE_ETH_RSS_NONFRAG_IPV4_OTHER)
- 
--/* Valid L4 RSS types */
--#define MLX5_L4_RSS_TYPES (RTE_ETH_RSS_L4_SRC_ONLY | RTE_ETH_RSS_L4_DST_ONLY)
--
- /* IBV hash source bits  for IPV4. */
- #define MLX5_IPV4_IBV_RX_HASH (IBV_RX_HASH_SRC_IPV4 | IBV_RX_HASH_DST_IPV4)
+ /* UDP port number for MPLS */
+ #define MLX5_UDP_PORT_MPLS 6635
@@ -160 +141 @@
-index fb7198c244..57d147bd8c 100644
+index 8b58265687..7085e9b258 100644
@@ -163,3 +144,3 @@
-@@ -7,8 +7,6 @@
- 
- #include "mlx5_win_ext.h"
+@@ -12,8 +12,6 @@ enum {
+ 	MLX5_FS_PATH_MAX = MLX5_DEVX_DEVICE_PNP_SIZE + 1
+ };