patch 'net/ixgbe/base: fix compilation warnings' has been queued to stable release 22.11.9

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 22.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 06/14/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/bluca/dpdk-stable

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

Thanks.

Luca Boccassi

---
>From 6de8266dd87ace17673e7b47e9f1636a1ba465d3 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Fri, 28 Mar 2025 11:16:16 +0000
Subject: [PATCH] net/ixgbe/base: fix compilation warnings

[ upstream commit ca361b5ab1ba8ec9191b8376a8be0e3935823596 ]

We can remove almost all of the "unused parameter" and "unused variable"
warnings by just improving the macro definitions in the osdep.h header.
Remaining two instances can be fixed by just one-line additions to the
code, so add those to give us a clean build with the warnings enabled.

Fixes: af75078fece3 ("first public release")
Fixes: c6cb313da739 ("net/ixgbe/base: add link management for E610")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Anatoly Burakov <anatoly.burakov at intel.com>
---
 drivers/net/ixgbe/base/ixgbe_osdep.h | 19 +++++++++++--------
 drivers/net/ixgbe/base/meson.build   | 11 -----------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_osdep.h b/drivers/net/ixgbe/base/ixgbe_osdep.h
index 09ea1e1e7e..a6f257f015 100644
--- a/drivers/net/ixgbe/base/ixgbe_osdep.h
+++ b/drivers/net/ixgbe/base/ixgbe_osdep.h
@@ -56,13 +56,16 @@
 
 /* Bunch of defines for shared code bogosity */
 #ifndef UNREFERENCED_PARAMETER
-#define UNREFERENCED_PARAMETER(_p)
+#define UNREFERENCED_PARAMETER(_p) (void)(_p)
 #endif
-#define UNREFERENCED_1PARAMETER(_p)
-#define UNREFERENCED_2PARAMETER(_p, _q)
-#define UNREFERENCED_3PARAMETER(_p, _q, _r)
-#define UNREFERENCED_4PARAMETER(_p, _q, _r, _s)
-#define UNREFERENCED_5PARAMETER(_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)
 
 /* Shared code error reporting */
 enum {
@@ -127,8 +130,8 @@ static inline uint32_t ixgbe_read_addr(volatile void* addr)
 	IXGBE_PCI_REG_ADDR((hw), (reg) + ((index) << 2))
 
 /* Not implemented !! */
-#define IXGBE_READ_PCIE_WORD(hw, reg) 0
-#define IXGBE_WRITE_PCIE_WORD(hw, reg, value) do { } while(0)
+#define IXGBE_READ_PCIE_WORD(hw, reg)  ((void)hw, (void)(reg), 0)
+#define IXGBE_WRITE_PCIE_WORD(hw, reg, value) do { (void)hw; (void)reg; (void)value; } while(0)
 
 #define IXGBE_WRITE_FLUSH(a) IXGBE_READ_REG(a, IXGBE_STATUS)
 
diff --git a/drivers/net/ixgbe/base/meson.build b/drivers/net/ixgbe/base/meson.build
index ab775d8c66..b3cd74e805 100644
--- a/drivers/net/ixgbe/base/meson.build
+++ b/drivers/net/ixgbe/base/meson.build
@@ -17,17 +17,6 @@ sources = [
         'ixgbe_x550.c',
 ]
 
-error_cflags = [
-        '-Wno-unused-but-set-variable',
-        '-Wno-unused-parameter',
-        ]
-c_args = cflags
-foreach flag: error_cflags
-    if cc.has_argument(flag)
-        c_args += flag
-    endif
-endforeach
-
 base_lib = static_library('ixgbe_base', sources,
     dependencies: [static_rte_eal, static_rte_net],
     c_args: c_args)
-- 
2.47.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-06-12 22:06:24.087288931 +0100
+++ 0005-net-ixgbe-base-fix-compilation-warnings.patch	2025-06-12 22:06:23.786042864 +0100
@@ -1 +1 @@
-From ca361b5ab1ba8ec9191b8376a8be0e3935823596 Mon Sep 17 00:00:00 2001
+From 6de8266dd87ace17673e7b47e9f1636a1ba465d3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ca361b5ab1ba8ec9191b8376a8be0e3935823596 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -18,4 +19,3 @@
- drivers/net/intel/ixgbe/base/ixgbe_e610.c  |  2 ++
- drivers/net/intel/ixgbe/base/ixgbe_osdep.h | 19 +++++++++++--------
- drivers/net/intel/ixgbe/base/meson.build   | 11 -----------
- 3 files changed, 13 insertions(+), 19 deletions(-)
+ drivers/net/ixgbe/base/ixgbe_osdep.h | 19 +++++++++++--------
+ drivers/net/ixgbe/base/meson.build   | 11 -----------
+ 2 files changed, 11 insertions(+), 19 deletions(-)
@@ -23,25 +23,5 @@
-diff --git a/drivers/net/intel/ixgbe/base/ixgbe_e610.c b/drivers/net/intel/ixgbe/base/ixgbe_e610.c
-index 5474c3012a..7420c78d07 100644
---- a/drivers/net/intel/ixgbe/base/ixgbe_e610.c
-+++ b/drivers/net/intel/ixgbe/base/ixgbe_e610.c
-@@ -1054,6 +1054,7 @@ static void ixgbe_parse_vsi_func_caps(struct ixgbe_hw *hw,
- 				      struct ixgbe_hw_func_caps *func_p,
- 				      struct ixgbe_aci_cmd_list_caps_elem *cap)
- {
-+	UNREFERENCED_PARAMETER(cap);
- 	func_p->guar_num_vsi = ixgbe_get_num_per_func(hw, IXGBE_MAX_VSI);
- }
- 
-@@ -1770,6 +1771,7 @@ s32 ixgbe_aci_set_event_mask(struct ixgbe_hw *hw, u8 port_num, u16 mask)
- 	struct ixgbe_aci_cmd_set_event_mask *cmd;
- 	struct ixgbe_aci_desc desc;
- 
-+	UNREFERENCED_PARAMETER(port_num);
- 	cmd = &desc.params.set_event_mask;
- 
- 	ixgbe_fill_dflt_direct_cmd_desc(&desc, ixgbe_aci_opc_set_event_mask);
-diff --git a/drivers/net/intel/ixgbe/base/ixgbe_osdep.h b/drivers/net/intel/ixgbe/base/ixgbe_osdep.h
-index 6e5f7b4ae8..398c38bffd 100644
---- a/drivers/net/intel/ixgbe/base/ixgbe_osdep.h
-+++ b/drivers/net/intel/ixgbe/base/ixgbe_osdep.h
-@@ -57,13 +57,16 @@
+diff --git a/drivers/net/ixgbe/base/ixgbe_osdep.h b/drivers/net/ixgbe/base/ixgbe_osdep.h
+index 09ea1e1e7e..a6f257f015 100644
+--- a/drivers/net/ixgbe/base/ixgbe_osdep.h
++++ b/drivers/net/ixgbe/base/ixgbe_osdep.h
+@@ -56,13 +56,16 @@
@@ -51 +31 @@
--#define UNREFERENCED_PARAMETER(_p)  
+-#define UNREFERENCED_PARAMETER(_p)
@@ -54 +34 @@
--#define UNREFERENCED_1PARAMETER(_p) 
+-#define UNREFERENCED_1PARAMETER(_p)
@@ -56,2 +36,2 @@
--#define UNREFERENCED_3PARAMETER(_p, _q, _r) 
--#define UNREFERENCED_4PARAMETER(_p, _q, _r, _s) 
+-#define UNREFERENCED_3PARAMETER(_p, _q, _r)
+-#define UNREFERENCED_4PARAMETER(_p, _q, _r, _s)
@@ -70 +50 @@
-@@ -130,8 +133,8 @@ static inline uint32_t ixgbe_read_addr(volatile void* addr)
+@@ -127,8 +130,8 @@ static inline uint32_t ixgbe_read_addr(volatile void* addr)
@@ -74 +54 @@
--#define IXGBE_READ_PCIE_WORD(hw, reg) 0	
+-#define IXGBE_READ_PCIE_WORD(hw, reg) 0
@@ -81,5 +61,5 @@
-diff --git a/drivers/net/intel/ixgbe/base/meson.build b/drivers/net/intel/ixgbe/base/meson.build
-index f8b2ee6341..64e0bfd7be 100644
---- a/drivers/net/intel/ixgbe/base/meson.build
-+++ b/drivers/net/intel/ixgbe/base/meson.build
-@@ -19,17 +19,6 @@ sources = [
+diff --git a/drivers/net/ixgbe/base/meson.build b/drivers/net/ixgbe/base/meson.build
+index ab775d8c66..b3cd74e805 100644
+--- a/drivers/net/ixgbe/base/meson.build
++++ b/drivers/net/ixgbe/base/meson.build
+@@ -17,17 +17,6 @@ sources = [