From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 355D246BAE for ; Fri, 18 Jul 2025 21:33:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2FE5640611; Fri, 18 Jul 2025 21:33:08 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 58EE540E2D for ; Fri, 18 Jul 2025 21:33:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6S1oyyeq36RZbc3KtpI66bH7bIDABgUL6GMGBR8r3yA=; b=DQ/P4Vsk6htlTxe12om4LIl7gvWX40ySrkBhmKMiyVGAVn4x26iJU2SKj14JOW8VU+JV9/ 1LKvoK+wvUxOEqzQ8f94785CG+iRj39Fwk5PZHUqHmdpamJsxKFjb4HdFT685Dw02TmWlQ QqJM0TaTsAORvmHY3V3TEZcmFQ8f02Q= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-164-TDqUC1swO2SnmB3HzVN6iQ-1; Fri, 18 Jul 2025 15:33:02 -0400 X-MC-Unique: TDqUC1swO2SnmB3HzVN6iQ-1 X-Mimecast-MFC-AGG-ID: TDqUC1swO2SnmB3HzVN6iQ_1752867181 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9873019560AE; Fri, 18 Jul 2025 19:33:01 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0F00518003FC; Fri, 18 Jul 2025 19:32:59 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Anatoly Burakov , dpdk stable Subject: patch 'net/ixgbe/base: fix compilation warnings' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:28:57 +0100 Message-ID: <20250718193247.1008129-3-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: mGSEuwEfGEHH1C1ZSJhy8z1gxF4fQX2-rcy0HHKK4TE_1752867181 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 24.11.3 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/23/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/0b5f911820a566be77347ea837db9086a56e7adb Thanks. Kevin --- >From 0b5f911820a566be77347ea837db9086a56e7adb Mon Sep 17 00:00:00 2001 From: Bruce Richardson 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 Acked-by: Anatoly Burakov --- drivers/net/ixgbe/base/ixgbe_e610.c | 2 ++ drivers/net/ixgbe/base/ixgbe_osdep.h | 19 +++++++++++-------- drivers/net/ixgbe/base/meson.build | 11 ----------- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/drivers/net/ixgbe/base/ixgbe_e610.c b/drivers/net/ixgbe/base/ixgbe_e610.c index 1967519be0..a6fce1442d 100644 --- a/drivers/net/ixgbe/base/ixgbe_e610.c +++ b/drivers/net/ixgbe/base/ixgbe_e610.c @@ -1047,4 +1047,5 @@ static void ixgbe_parse_vsi_func_caps(struct ixgbe_hw *hw, 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); } @@ -1763,4 +1764,5 @@ s32 ixgbe_aci_set_event_mask(struct ixgbe_hw *hw, u8 port_num, u16 mask) struct ixgbe_aci_desc desc; + UNREFERENCED_PARAMETER(port_num); cmd = &desc.params.set_event_mask; diff --git a/drivers/net/ixgbe/base/ixgbe_osdep.h b/drivers/net/ixgbe/base/ixgbe_osdep.h index 4188d83b4f..900791a93e 100644 --- a/drivers/net/ixgbe/base/ixgbe_osdep.h +++ b/drivers/net/ixgbe/base/ixgbe_osdep.h @@ -58,11 +58,14 @@ /* 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 */ @@ -131,6 +134,6 @@ static inline uint32_t ixgbe_read_addr(volatile void* addr) /* 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 f8b2ee6341..64e0bfd7be 100644 --- a/drivers/net/ixgbe/base/meson.build +++ b/drivers/net/ixgbe/base/meson.build @@ -20,15 +20,4 @@ sources = [ ] -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], -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:11.286853891 +0100 +++ 0003-net-ixgbe-base-fix-compilation-warnings.patch 2025-07-18 20:29:10.791906905 +0100 @@ -1 +1 @@ -From ca361b5ab1ba8ec9191b8376a8be0e3935823596 Mon Sep 17 00:00:00 2001 +From 0b5f911820a566be77347ea837db9086a56e7adb Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ca361b5ab1ba8ec9191b8376a8be0e3935823596 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -18,3 +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 ----------- + drivers/net/ixgbe/base/ixgbe_e610.c | 2 ++ + drivers/net/ixgbe/base/ixgbe_osdep.h | 19 +++++++++++-------- + drivers/net/ixgbe/base/meson.build | 11 ----------- @@ -23,5 +24,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 -@@ -1055,4 +1055,5 @@ static void ixgbe_parse_vsi_func_caps(struct ixgbe_hw *hw, +diff --git a/drivers/net/ixgbe/base/ixgbe_e610.c b/drivers/net/ixgbe/base/ixgbe_e610.c +index 1967519be0..a6fce1442d 100644 +--- a/drivers/net/ixgbe/base/ixgbe_e610.c ++++ b/drivers/net/ixgbe/base/ixgbe_e610.c +@@ -1047,4 +1047,5 @@ static void ixgbe_parse_vsi_func_caps(struct ixgbe_hw *hw, @@ -33 +34 @@ -@@ -1771,4 +1772,5 @@ s32 ixgbe_aci_set_event_mask(struct ixgbe_hw *hw, u8 port_num, u16 mask) +@@ -1763,4 +1764,5 @@ s32 ixgbe_aci_set_event_mask(struct ixgbe_hw *hw, u8 port_num, u16 mask) @@ -39,4 +40,4 @@ -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 +diff --git a/drivers/net/ixgbe/base/ixgbe_osdep.h b/drivers/net/ixgbe/base/ixgbe_osdep.h +index 4188d83b4f..900791a93e 100644 +--- a/drivers/net/ixgbe/base/ixgbe_osdep.h ++++ b/drivers/net/ixgbe/base/ixgbe_osdep.h @@ -73 +74 @@ -diff --git a/drivers/net/intel/ixgbe/base/meson.build b/drivers/net/intel/ixgbe/base/meson.build +diff --git a/drivers/net/ixgbe/base/meson.build b/drivers/net/ixgbe/base/meson.build @@ -75,2 +76,2 @@ ---- a/drivers/net/intel/ixgbe/base/meson.build -+++ b/drivers/net/intel/ixgbe/base/meson.build +--- a/drivers/net/ixgbe/base/meson.build ++++ b/drivers/net/ixgbe/base/meson.build