patch 'net/i40e/base: fix unused value warnings' has been queued to stable release 23.11.5

Xueming Li xuemingl at nvidia.com
Thu Jun 26 14:00:25 CEST 2025


Hi,

FYI, your patch has been queued to stable release 23.11.5

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

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 5cec3d059d3432488dbcb7cb2fbe379984a2b007 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Fri, 28 Mar 2025 11:16:18 +0000
Subject: [PATCH] net/i40e/base: fix unused value warnings
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 3c2125852742d46accc3f35f4fa683768ba25e09 ]

Fix warnings about unused values - parameters, variables, etc., and
remove the warning disable flags for them. Although modifying the
base-code files is not ideal, the changes required are minor, and only
affect two files from the imported base code.

Fixes: 8db9e2a1b232 ("i40e: base driver")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Anatoly Burakov <anatoly.burakov at intel.com>
---
 drivers/net/i40e/base/i40e_common.c |  5 -----
 drivers/net/i40e/base/i40e_nvm.c    |  1 +
 drivers/net/i40e/base/i40e_osdep.h  |  4 ++--
 drivers/net/i40e/base/i40e_type.h   | 14 +++++++++-----
 drivers/net/i40e/base/meson.build   |  8 +++-----
 drivers/net/i40e/i40e_ethdev.c      |  1 +
 6 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c
index 547f5e3c2c..a7421c965f 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -5628,7 +5628,6 @@ STATIC enum i40e_status_code i40e_validate_filter_settings(struct i40e_hw *hw,
 				struct i40e_filter_control_settings *settings)
 {
 	u32 fcoe_cntx_size, fcoe_filt_size;
-	u32 pe_cntx_size, pe_filt_size;
 	u32 fcoe_fmax;
 
 	u32 val;
@@ -5673,8 +5672,6 @@ STATIC enum i40e_status_code i40e_validate_filter_settings(struct i40e_hw *hw,
 	case I40E_HASH_FILTER_SIZE_256K:
 	case I40E_HASH_FILTER_SIZE_512K:
 	case I40E_HASH_FILTER_SIZE_1M:
-		pe_filt_size = I40E_HASH_FILTER_BASE_SIZE;
-		pe_filt_size <<= (u32)settings->pe_filt_num;
 		break;
 	default:
 		return I40E_ERR_PARAM;
@@ -5691,8 +5688,6 @@ STATIC enum i40e_status_code i40e_validate_filter_settings(struct i40e_hw *hw,
 	case I40E_DMA_CNTX_SIZE_64K:
 	case I40E_DMA_CNTX_SIZE_128K:
 	case I40E_DMA_CNTX_SIZE_256K:
-		pe_cntx_size = I40E_DMA_CNTX_BASE_SIZE;
-		pe_cntx_size <<= (u32)settings->pe_cntx_num;
 		break;
 	default:
 		return I40E_ERR_PARAM;
diff --git a/drivers/net/i40e/base/i40e_nvm.c b/drivers/net/i40e/base/i40e_nvm.c
index 05816a4b79..53bbaa1a12 100644
--- a/drivers/net/i40e/base/i40e_nvm.c
+++ b/drivers/net/i40e/base/i40e_nvm.c
@@ -1653,6 +1653,7 @@ STATIC enum i40e_status_code i40e_nvmupd_get_aq_event(struct i40e_hw *hw,
 	u32 aq_total_len;
 	u32 aq_desc_len;
 
+	UNREFERENCED_1PARAMETER(perrno);
 	i40e_debug(hw, I40E_DEBUG_NVM, "NVMUPD: %s\n", __func__);
 
 	aq_desc_len = sizeof(struct i40e_aq_desc);
diff --git a/drivers/net/i40e/base/i40e_osdep.h b/drivers/net/i40e/base/i40e_osdep.h
index aa5dc61841..1e32ef695a 100644
--- a/drivers/net/i40e/base/i40e_osdep.h
+++ b/drivers/net/i40e/base/i40e_osdep.h
@@ -184,8 +184,8 @@ struct i40e_dma_mem {
 	const void *zone;
 } __rte_packed;
 
-#define i40e_allocate_dma_mem(h, m, unused, s, a) \
-			i40e_allocate_dma_mem_d(h, m, s, a)
+#define i40e_allocate_dma_mem(h, m, mt, s, a) \
+			i40e_allocate_dma_mem_d(h, m, mt, s, a)
 #define i40e_free_dma_mem(h, m) i40e_free_dma_mem_d(h, m)
 
 struct i40e_virt_mem {
diff --git a/drivers/net/i40e/base/i40e_type.h b/drivers/net/i40e/base/i40e_type.h
index f4a3d66759..198d5f161f 100644
--- a/drivers/net/i40e/base/i40e_type.h
+++ b/drivers/net/i40e/base/i40e_type.h
@@ -14,11 +14,15 @@
 #include "i40e_devids.h"
 
 #define UNREFERENCED_XPARAMETER
-#define UNREFERENCED_1PARAMETER(_p) (_p);
-#define UNREFERENCED_2PARAMETER(_p, _q) (_p); (_q);
-#define UNREFERENCED_3PARAMETER(_p, _q, _r) (_p); (_q); (_r);
-#define UNREFERENCED_4PARAMETER(_p, _q, _r, _s) (_p); (_q); (_r); (_s);
-#define UNREFERENCED_5PARAMETER(_p, _q, _r, _s, _t) (_p); (_q); (_r); (_s); (_t);
+#define UNREFERENCED_1PARAMETER(_p) (void)(_p)
+#define UNREFERENCED_2PARAMETER(_p, _q) \
+	do { (void)(_p); (void)(_q); } while (0)
+#define UNREFERENCED_3PARAMETER(_p, _q, _r) \
+	do { (void)(_p); (void)(_q); (void)(_r); } while (0)
+#define UNREFERENCED_4PARAMETER(_p, _q, _r, _s) \
+	do { (void)(_p); (void)(_q); (void)(_r); (void)(_s); } while (0)
+#define UNREFERENCED_5PARAMETER(_p, _q, _r, _s, _t) \
+	do { (void)(_p); (void)(_q); (void)(_r); (void)(_s); (void)(_t); } while (0)
 
 #ifndef LINUX_MACROS
 #ifndef BIT
diff --git a/drivers/net/i40e/base/meson.build b/drivers/net/i40e/base/meson.build
index d94108629b..2648e5d0c4 100644
--- a/drivers/net/i40e/base/meson.build
+++ b/drivers/net/i40e/base/meson.build
@@ -11,11 +11,9 @@ sources = [
         'i40e_nvm.c',
 ]
 
-error_cflags = ['-Wno-sign-compare', '-Wno-unused-value',
-        '-Wno-format', '-Wno-format-security',
-        '-Wno-format-nonliteral',
-        '-Wno-strict-aliasing', '-Wno-unused-but-set-variable',
-        '-Wno-unused-parameter',
+error_cflags = [
+        '-Wno-sign-compare',
+        '-Wno-strict-aliasing',
 ]
 c_args = cflags
 foreach flag: error_cflags
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 2b043cd693..4ab9d6905d 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -4547,6 +4547,7 @@ out:
 enum i40e_status_code
 i40e_allocate_dma_mem_d(__rte_unused struct i40e_hw *hw,
 			struct i40e_dma_mem *mem,
+			__rte_unused enum i40e_memory_type mtype,
 			u64 size,
 			u32 alignment)
 {
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-06-26 19:59:17.964319720 +0800
+++ 0005-net-i40e-base-fix-unused-value-warnings.patch	2025-06-26 19:59:17.178418053 +0800
@@ -1 +1 @@
-From 3c2125852742d46accc3f35f4fa683768ba25e09 Mon Sep 17 00:00:00 2001
+From 5cec3d059d3432488dbcb7cb2fbe379984a2b007 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 3c2125852742d46accc3f35f4fa683768ba25e09 ]
@@ -12 +14,0 @@
-Cc: stable at dpdk.org
@@ -17,6 +19,7 @@
- drivers/net/intel/i40e/base/i40e_nvm.c   |  1 +
- drivers/net/intel/i40e/base/i40e_osdep.h |  4 ++--
- drivers/net/intel/i40e/base/i40e_type.h  | 14 +++++++++-----
- drivers/net/intel/i40e/base/meson.build  |  3 ---
- drivers/net/intel/i40e/i40e_ethdev.c     |  1 +
- 5 files changed, 13 insertions(+), 10 deletions(-)
+ drivers/net/i40e/base/i40e_common.c |  5 -----
+ drivers/net/i40e/base/i40e_nvm.c    |  1 +
+ drivers/net/i40e/base/i40e_osdep.h  |  4 ++--
+ drivers/net/i40e/base/i40e_type.h   | 14 +++++++++-----
+ drivers/net/i40e/base/meson.build   |  8 +++-----
+ drivers/net/i40e/i40e_ethdev.c      |  1 +
+ 6 files changed, 16 insertions(+), 17 deletions(-)
@@ -24,5 +27,35 @@
-diff --git a/drivers/net/intel/i40e/base/i40e_nvm.c b/drivers/net/intel/i40e/base/i40e_nvm.c
-index 3e16a0d997..00a207ca81 100644
---- a/drivers/net/intel/i40e/base/i40e_nvm.c
-+++ b/drivers/net/intel/i40e/base/i40e_nvm.c
-@@ -1748,6 +1748,7 @@ STATIC enum i40e_status_code i40e_nvmupd_get_aq_event(struct i40e_hw *hw,
+diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c
+index 547f5e3c2c..a7421c965f 100644
+--- a/drivers/net/i40e/base/i40e_common.c
++++ b/drivers/net/i40e/base/i40e_common.c
+@@ -5628,7 +5628,6 @@ STATIC enum i40e_status_code i40e_validate_filter_settings(struct i40e_hw *hw,
+ 				struct i40e_filter_control_settings *settings)
+ {
+ 	u32 fcoe_cntx_size, fcoe_filt_size;
+-	u32 pe_cntx_size, pe_filt_size;
+ 	u32 fcoe_fmax;
+ 
+ 	u32 val;
+@@ -5673,8 +5672,6 @@ STATIC enum i40e_status_code i40e_validate_filter_settings(struct i40e_hw *hw,
+ 	case I40E_HASH_FILTER_SIZE_256K:
+ 	case I40E_HASH_FILTER_SIZE_512K:
+ 	case I40E_HASH_FILTER_SIZE_1M:
+-		pe_filt_size = I40E_HASH_FILTER_BASE_SIZE;
+-		pe_filt_size <<= (u32)settings->pe_filt_num;
+ 		break;
+ 	default:
+ 		return I40E_ERR_PARAM;
+@@ -5691,8 +5688,6 @@ STATIC enum i40e_status_code i40e_validate_filter_settings(struct i40e_hw *hw,
+ 	case I40E_DMA_CNTX_SIZE_64K:
+ 	case I40E_DMA_CNTX_SIZE_128K:
+ 	case I40E_DMA_CNTX_SIZE_256K:
+-		pe_cntx_size = I40E_DMA_CNTX_BASE_SIZE;
+-		pe_cntx_size <<= (u32)settings->pe_cntx_num;
+ 		break;
+ 	default:
+ 		return I40E_ERR_PARAM;
+diff --git a/drivers/net/i40e/base/i40e_nvm.c b/drivers/net/i40e/base/i40e_nvm.c
+index 05816a4b79..53bbaa1a12 100644
+--- a/drivers/net/i40e/base/i40e_nvm.c
++++ b/drivers/net/i40e/base/i40e_nvm.c
+@@ -1653,6 +1653,7 @@ STATIC enum i40e_status_code i40e_nvmupd_get_aq_event(struct i40e_hw *hw,
@@ -36,5 +69,5 @@
-diff --git a/drivers/net/intel/i40e/base/i40e_osdep.h b/drivers/net/intel/i40e/base/i40e_osdep.h
-index c04f94732a..197f4678bf 100644
---- a/drivers/net/intel/i40e/base/i40e_osdep.h
-+++ b/drivers/net/intel/i40e/base/i40e_osdep.h
-@@ -184,8 +184,8 @@ struct __rte_packed_begin i40e_dma_mem {
+diff --git a/drivers/net/i40e/base/i40e_osdep.h b/drivers/net/i40e/base/i40e_osdep.h
+index aa5dc61841..1e32ef695a 100644
+--- a/drivers/net/i40e/base/i40e_osdep.h
++++ b/drivers/net/i40e/base/i40e_osdep.h
+@@ -184,8 +184,8 @@ struct i40e_dma_mem {
@@ -42 +75 @@
- } __rte_packed_end;
+ } __rte_packed;
@@ -50,5 +83,5 @@
- struct __rte_packed_begin i40e_virt_mem {
-diff --git a/drivers/net/intel/i40e/base/i40e_type.h b/drivers/net/intel/i40e/base/i40e_type.h
-index 7cc746f82f..968e1982a6 100644
---- a/drivers/net/intel/i40e/base/i40e_type.h
-+++ b/drivers/net/intel/i40e/base/i40e_type.h
+ struct i40e_virt_mem {
+diff --git a/drivers/net/i40e/base/i40e_type.h b/drivers/net/i40e/base/i40e_type.h
+index f4a3d66759..198d5f161f 100644
+--- a/drivers/net/i40e/base/i40e_type.h
++++ b/drivers/net/i40e/base/i40e_type.h
@@ -74,13 +107,14 @@
- #define BIT(a) (1UL << (a))
- #define BIT_ULL(a) (1ULL << (a))
-diff --git a/drivers/net/intel/i40e/base/meson.build b/drivers/net/intel/i40e/base/meson.build
-index a0912b1788..2648e5d0c4 100644
---- a/drivers/net/intel/i40e/base/meson.build
-+++ b/drivers/net/intel/i40e/base/meson.build
-@@ -13,10 +13,7 @@ sources = [
- 
- error_cflags = [
-         '-Wno-sign-compare',
--        '-Wno-unused-value',
-         '-Wno-strict-aliasing',
--        '-Wno-unused-but-set-variable',
+ #ifndef LINUX_MACROS
+ #ifndef BIT
+diff --git a/drivers/net/i40e/base/meson.build b/drivers/net/i40e/base/meson.build
+index d94108629b..2648e5d0c4 100644
+--- a/drivers/net/i40e/base/meson.build
++++ b/drivers/net/i40e/base/meson.build
+@@ -11,11 +11,9 @@ sources = [
+         'i40e_nvm.c',
+ ]
+ 
+-error_cflags = ['-Wno-sign-compare', '-Wno-unused-value',
+-        '-Wno-format', '-Wno-format-security',
+-        '-Wno-format-nonliteral',
+-        '-Wno-strict-aliasing', '-Wno-unused-but-set-variable',
@@ -87,0 +122,3 @@
++error_cflags = [
++        '-Wno-sign-compare',
++        '-Wno-strict-aliasing',
@@ -91,5 +128,5 @@
-diff --git a/drivers/net/intel/i40e/i40e_ethdev.c b/drivers/net/intel/i40e/i40e_ethdev.c
-index 1c5ab35a8b..90eba3419f 100644
---- a/drivers/net/intel/i40e/i40e_ethdev.c
-+++ b/drivers/net/intel/i40e/i40e_ethdev.c
-@@ -4694,6 +4694,7 @@ out:
+diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
+index 2b043cd693..4ab9d6905d 100644
+--- a/drivers/net/i40e/i40e_ethdev.c
++++ b/drivers/net/i40e/i40e_ethdev.c
+@@ -4547,6 +4547,7 @@ out:


More information about the stable mailing list