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 30809468E4 for ; Thu, 12 Jun 2025 23:07:58 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 27F8442DD9; Thu, 12 Jun 2025 23:07:58 +0200 (CEST) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mails.dpdk.org (Postfix) with ESMTP id F2FDB42DD9 for ; Thu, 12 Jun 2025 23:07:56 +0200 (CEST) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-43edecbfb94so17316775e9.1 for ; Thu, 12 Jun 2025 14:07:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749762476; x=1750367276; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bBkp7qnjg3x79gOK23UfpDuyIg/rkYvZmtj1r+Weer8=; b=E54fP88oL9edPxA+E0QoqB32rVlbAQm9gONJTJxSBA+a0deN3LbTFkwMO864ZW9+wB paxoLCsrp2YPzKCo5UYkTgCEUzii9uFfhoxnxiGVUZdP4dNkVQ2COPyCS6q4PaCpAXl+ JKJWGCBJAGaBgz66UYUBW09WY6S+otZdyPZxUQLXPfK9lsj3tVw8eYGLmrKiY7MziHNl syemWe419zdapu0q8vFnCkhCrYgCZAfZ7KsRfi7NnDbRPwuEkIOzGhTPqoRWMU4SDLBO h8wXLj1gj1X2LcYphE4cLwSZxNHtkmFB28QBVjMU7GnGYnNY7T/KP69Gz8k/OXde+vcr V64A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749762476; x=1750367276; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bBkp7qnjg3x79gOK23UfpDuyIg/rkYvZmtj1r+Weer8=; b=aysv+TWdUbofkS8/0NEY3NlPTJ4VmntBOVleDJ7MeK2nzO6wr8b6057z2W5G+zNdm+ yVdUkxMD7PIoqWExC1KP8wydB6NDo0vv60PP6fPHLECfpd4Rt15xi+gF8oEymozYSI+G ovYEFIj0rYvSruaY2cSC3/oeo8oP7sWhI/NmeAgfBqcIIcbLE31I3JU+4TJAaFP8H6DB E5w/ww7JiBi7791XYTNZSv4v/SRCy5URnBuMaxpB+ddYZW/lr+fdQp6j+P9SXYcMTei8 a3b3oHs2qXPtHcOOAd0uiF9cA615cx3t0fAY0W1gfg/0v2zY8/SZRz7K+W8ndn9DOzVj fhLQ== X-Forwarded-Encrypted: i=1; AJvYcCV/LKSQC1Lk0s4i3JWkPa7wig2XnoVRcSOsSy/yVkdq/IWDfK/mkQYCw4VDRlK9/qXPLUwOWRY=@dpdk.org X-Gm-Message-State: AOJu0YxYr1UqQ1w5FCEeWm3+PJRHWb+xZWbRqJfiW/vLQFIlbnKzwUuU ntU0QLL02PyKxixCKdb5n1u/4Cbw8UtCM1w74OKkLs+M4UMpND6/n7yF+b4gviPr X-Gm-Gg: ASbGncsnWwjYJNxLfKkmJH87TpboNljMs3PDAdlXfdEUuN7PV045W9FzmKkPGJoL+yY 2TtRtqsyxFy3Vkyg6hLXX/gxXW1Z1wxeXkYGs1GAIEKkLxz2fw06q+tv/NDCzzXTE2dI97jiGOd PxSVBHZxZtIzHOryg7AZlMxfj9iw6YUrE51LvtwxMtijoZLO/T33S/qcenKoPc+tgiQzrhYDQ9k gX8iXKbnDA22DmvYekKLQLwoOirXv49Bp+kOzzJI8ZVixwAAtwGEDIeKyv48H0X8G1Iu46tfVAY e3xUk2HOVGfK1ZTYgwtQPDVtge4GHBHmyOWjF+PR4qfRERQiFcp1zUoDx7jcVhDJyuSx X-Google-Smtp-Source: AGHT+IEObnDzEebtEK+JgYZRQjNDOzcwCOh0F1lMIDyPedBxp4pP9IKrZI1jgZvQH/IEwqABCZPZKw== X-Received: by 2002:a05:600c:a318:b0:442:e9ec:4654 with SMTP id 5b1f17b1804b1-45336e9913bmr581675e9.8.1749762476462; Thu, 12 Jun 2025 14:07:56 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:f2df:571a:ae4c:bef2]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4532e256b95sm32584025e9.30.2025.06.12.14.07.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 14:07:56 -0700 (PDT) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Anatoly Burakov , dpdk stable Subject: patch 'net/i40e/base: fix unused value warnings' has been queued to stable release 22.11.9 Date: Thu, 12 Jun 2025 22:06:23 +0100 Message-ID: <20250612210733.2506558-6-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250612210733.2506558-1-luca.boccassi@gmail.com> References: <20250612210733.2506558-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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/4cbf41d0b5741fc55568f26f93893d527d9113a9 Thanks. Luca Boccassi --- >From 4cbf41d0b5741fc55568f26f93893d527d9113a9 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 28 Mar 2025 11:16:18 +0000 Subject: [PATCH] net/i40e/base: fix unused value warnings [ 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 Acked-by: Anatoly Burakov --- 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 | 5 ++--- drivers/net/i40e/i40e_ethdev.c | 1 + 5 files changed, 15 insertions(+), 10 deletions(-) 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 51537c5cf3..68fdb9bf80 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..49d8a7cdd0 100644 --- a/drivers/net/i40e/base/meson.build +++ b/drivers/net/i40e/base/meson.build @@ -11,11 +11,10 @@ sources = [ 'i40e_nvm.c', ] -error_cflags = ['-Wno-sign-compare', '-Wno-unused-value', +error_cflags = ['-Wno-sign-compare', '-Wno-format', '-Wno-format-security', '-Wno-format-nonliteral', - '-Wno-strict-aliasing', '-Wno-unused-but-set-variable', - '-Wno-unused-parameter', + '-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 2049c32c4e..44cb105bfa 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.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-12 22:06:24.123611559 +0100 +++ 0006-net-i40e-base-fix-unused-value-warnings.patch 2025-06-12 22:06:23.794043032 +0100 @@ -1 +1 @@ -From 3c2125852742d46accc3f35f4fa683768ba25e09 Mon Sep 17 00:00:00 2001 +From 4cbf41d0b5741fc55568f26f93893d527d9113a9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3c2125852742d46accc3f35f4fa683768ba25e09 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -17,6 +18,6 @@ - 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_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 | 5 ++--- + drivers/net/i40e/i40e_ethdev.c | 1 + + 5 files changed, 15 insertions(+), 10 deletions(-) @@ -24,5 +25,5 @@ -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_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 +37,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 51537c5cf3..68fdb9bf80 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 +43 @@ - } __rte_packed_end; + } __rte_packed; @@ -50,5 +51,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 +75,15 @@ - #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..49d8a7cdd0 100644 +--- a/drivers/net/i40e/base/meson.build ++++ b/drivers/net/i40e/base/meson.build +@@ -11,11 +11,10 @@ sources = [ + 'i40e_nvm.c', + ] + +-error_cflags = ['-Wno-sign-compare', '-Wno-unused-value', ++error_cflags = ['-Wno-sign-compare', + '-Wno-format', '-Wno-format-security', + '-Wno-format-nonliteral', +- '-Wno-strict-aliasing', '-Wno-unused-but-set-variable', @@ -87,0 +91 @@ ++ '-Wno-strict-aliasing', @@ -91,5 +95,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 2049c32c4e..44cb105bfa 100644 +--- a/drivers/net/i40e/i40e_ethdev.c ++++ b/drivers/net/i40e/i40e_ethdev.c +@@ -4547,6 +4547,7 @@ out: