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 5DA2746BAE for ; Fri, 18 Jul 2025 21:35:55 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5830640EA5; Fri, 18 Jul 2025 21:35:55 +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 6D6DB40EA5 for ; Fri, 18 Jul 2025 21:35:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867354; 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; bh=BEy0e2V1WZgwCIQleApmAuwdhStHMshQFCse0iI1uhU=; b=WTURV45JolmlL6fJC8uqz3+6PIco+hj3YAIsC6/dMux4V8aiTSCdVjF55gcFkeD/k/NDpG oHRPUIkrz/3DsyHOPtEV50356EIIFpXijvG0ckb+45R2wOHpfdGjV02bQYvQu77uGezOBU YdrvWb8OW3AZgPAczHMAwXaPpjUgPBc= Received: from mx-prod-mc-02.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-648-ycR65kHNPbO_f_qFu94qHA-1; Fri, 18 Jul 2025 15:32:58 -0400 X-MC-Unique: ycR65kHNPbO_f_qFu94qHA-1 X-Mimecast-MFC-AGG-ID: ycR65kHNPbO_f_qFu94qHA_1752867177 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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 118D61956089; Fri, 18 Jul 2025 19:32:57 +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 1CC37180045B; Fri, 18 Jul 2025 19:32:54 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Anatoly Burakov , dpdk stable Subject: patch 'net/fm10k/base: fix compilation warnings' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:28:55 +0100 Message-ID: <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: xgtkNhK3m4fJq2to7kAwQuZrALbOJ0izq82ustKMK7M_1752867177 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/75ece5975f08252643a02543dba8098536f793f8 Thanks. Kevin --- >From 75ece5975f08252643a02543dba8098536f793f8 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 28 Mar 2025 11:16:13 +0000 Subject: [PATCH] net/fm10k/base: fix compilation warnings [ upstream commit 48fc5188aa753824a4bd469f9c482e845404c963 ] The fixes required to re-enable warnings in the fm10k base code are trivial, so let's make the changes and get a clean compile without any warning disable flags. * provide definitions for the UNREFERENCED_PARAMETER macros * fix the spelling of the work "fallthrough" in comments * provide a definition of FM10K_READ_PCI_WORD in os_dep.h that marks the parameters as used. Fixes: 7223d200c227 ("fm10k: add base driver") Signed-off-by: Bruce Richardson Acked-by: Anatoly Burakov --- drivers/net/fm10k/base/fm10k_mbx.c | 2 +- drivers/net/fm10k/base/fm10k_osdep.h | 2 +- drivers/net/fm10k/base/fm10k_pf.c | 8 ++++---- drivers/net/fm10k/base/fm10k_type.h | 6 +++--- drivers/net/fm10k/base/meson.build | 14 +------------- 5 files changed, 10 insertions(+), 22 deletions(-) diff --git a/drivers/net/fm10k/base/fm10k_mbx.c b/drivers/net/fm10k/base/fm10k_mbx.c index 2bb0d82efe..9028403757 100644 --- a/drivers/net/fm10k/base/fm10k_mbx.c +++ b/drivers/net/fm10k/base/fm10k_mbx.c @@ -1603,5 +1603,5 @@ s32 fm10k_pfvf_mbx_init(struct fm10k_hw *hw, struct fm10k_mbx_info *mbx, break; } - /* fallthough */ + /* fallthrough */ default: return FM10K_MBX_ERR_NO_MBX; diff --git a/drivers/net/fm10k/base/fm10k_osdep.h b/drivers/net/fm10k/base/fm10k_osdep.h index d3e5528575..0da826c8dc 100644 --- a/drivers/net/fm10k/base/fm10k_osdep.h +++ b/drivers/net/fm10k/base/fm10k_osdep.h @@ -68,5 +68,5 @@ typedef uint64_t u64; /* not implemented */ -#define FM10K_READ_PCI_WORD(hw, reg) 0 +#define FM10K_READ_PCI_WORD(hw, reg) ((void)hw, (void)reg, 0) #define FM10K_WRITE_MBX(hw, reg, value) FM10K_WRITE_REG(hw, reg, value) diff --git a/drivers/net/fm10k/base/fm10k_pf.c b/drivers/net/fm10k/base/fm10k_pf.c index 439dd224de..b54116a4b5 100644 --- a/drivers/net/fm10k/base/fm10k_pf.c +++ b/drivers/net/fm10k/base/fm10k_pf.c @@ -1363,17 +1363,17 @@ STATIC u8 fm10k_iov_supported_xcast_mode_pf(struct fm10k_vf_info *vf_info, if (vf_flags & FM10K_VF_FLAG_PROMISC_CAPABLE) return FM10K_XCAST_MODE_PROMISC; - /* fallthough */ + /* fallthrough */ case FM10K_XCAST_MODE_ALLMULTI: if (vf_flags & FM10K_VF_FLAG_ALLMULTI_CAPABLE) return FM10K_XCAST_MODE_ALLMULTI; - /* fallthough */ + /* fallthrough */ case FM10K_XCAST_MODE_MULTI: if (vf_flags & FM10K_VF_FLAG_MULTI_CAPABLE) return FM10K_XCAST_MODE_MULTI; - /* fallthough */ + /* fallthrough */ case FM10K_XCAST_MODE_NONE: if (vf_flags & FM10K_VF_FLAG_NONE_CAPABLE) return FM10K_XCAST_MODE_NONE; - /* fallthough */ + /* fallthrough */ default: break; diff --git a/drivers/net/fm10k/base/fm10k_type.h b/drivers/net/fm10k/base/fm10k_type.h index 84781ba9b2..437fb1c55e 100644 --- a/drivers/net/fm10k/base/fm10k_type.h +++ b/drivers/net/fm10k/base/fm10k_type.h @@ -84,7 +84,7 @@ struct fm10k_hw; #define UNREFERENCED_XPARAMETER -#define UNREFERENCED_1PARAMETER(_p) (_p) -#define UNREFERENCED_2PARAMETER(_p, _q) do { (_p); (_q); } while (0) -#define UNREFERENCED_3PARAMETER(_p, _q, _r) do { (_p); (_q); (_r); } while (0) +#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) /* Start of PF registers */ diff --git a/drivers/net/fm10k/base/meson.build b/drivers/net/fm10k/base/meson.build index f24e453fd0..a2640d1ee8 100644 --- a/drivers/net/fm10k/base/meson.build +++ b/drivers/net/fm10k/base/meson.build @@ -11,18 +11,6 @@ sources = [ ] -error_cflags = [ - '-Wno-unused-parameter', - '-Wno-unused-value', - '-Wno-implicit-fallthrough', -] -c_args = cflags -foreach flag: error_cflags - if cc.has_argument(flag) - c_args += flag - endif -endforeach - base_lib = static_library('fm10k_base', sources, dependencies: static_rte_eal, - c_args: c_args) + c_args: cflags) base_objs = base_lib.extract_all_objects(recursive: true) -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:11.225577662 +0100 +++ 0001-net-fm10k-base-fix-compilation-warnings.patch 2025-07-18 20:29:10.779906868 +0100 @@ -1 +1 @@ -From 48fc5188aa753824a4bd469f9c482e845404c963 Mon Sep 17 00:00:00 2001 +From 75ece5975f08252643a02543dba8098536f793f8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 48fc5188aa753824a4bd469f9c482e845404c963 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -21,5 +22,5 @@ - drivers/net/intel/fm10k/base/fm10k_mbx.c | 2 +- - drivers/net/intel/fm10k/base/fm10k_osdep.h | 2 +- - drivers/net/intel/fm10k/base/fm10k_pf.c | 8 ++++---- - drivers/net/intel/fm10k/base/fm10k_type.h | 6 +++--- - drivers/net/intel/fm10k/base/meson.build | 14 +------------- + drivers/net/fm10k/base/fm10k_mbx.c | 2 +- + drivers/net/fm10k/base/fm10k_osdep.h | 2 +- + drivers/net/fm10k/base/fm10k_pf.c | 8 ++++---- + drivers/net/fm10k/base/fm10k_type.h | 6 +++--- + drivers/net/fm10k/base/meson.build | 14 +------------- @@ -28 +29 @@ -diff --git a/drivers/net/intel/fm10k/base/fm10k_mbx.c b/drivers/net/intel/fm10k/base/fm10k_mbx.c +diff --git a/drivers/net/fm10k/base/fm10k_mbx.c b/drivers/net/fm10k/base/fm10k_mbx.c @@ -30,2 +31,2 @@ ---- a/drivers/net/intel/fm10k/base/fm10k_mbx.c -+++ b/drivers/net/intel/fm10k/base/fm10k_mbx.c +--- a/drivers/net/fm10k/base/fm10k_mbx.c ++++ b/drivers/net/fm10k/base/fm10k_mbx.c @@ -39,4 +40,4 @@ -diff --git a/drivers/net/intel/fm10k/base/fm10k_osdep.h b/drivers/net/intel/fm10k/base/fm10k_osdep.h -index a727a57481..5f8ff10474 100644 ---- a/drivers/net/intel/fm10k/base/fm10k_osdep.h -+++ b/drivers/net/intel/fm10k/base/fm10k_osdep.h +diff --git a/drivers/net/fm10k/base/fm10k_osdep.h b/drivers/net/fm10k/base/fm10k_osdep.h +index d3e5528575..0da826c8dc 100644 +--- a/drivers/net/fm10k/base/fm10k_osdep.h ++++ b/drivers/net/fm10k/base/fm10k_osdep.h @@ -50 +51 @@ -diff --git a/drivers/net/intel/fm10k/base/fm10k_pf.c b/drivers/net/intel/fm10k/base/fm10k_pf.c +diff --git a/drivers/net/fm10k/base/fm10k_pf.c b/drivers/net/fm10k/base/fm10k_pf.c @@ -52,2 +53,2 @@ ---- a/drivers/net/intel/fm10k/base/fm10k_pf.c -+++ b/drivers/net/intel/fm10k/base/fm10k_pf.c +--- a/drivers/net/fm10k/base/fm10k_pf.c ++++ b/drivers/net/fm10k/base/fm10k_pf.c @@ -76 +77 @@ -diff --git a/drivers/net/intel/fm10k/base/fm10k_type.h b/drivers/net/intel/fm10k/base/fm10k_type.h +diff --git a/drivers/net/fm10k/base/fm10k_type.h b/drivers/net/fm10k/base/fm10k_type.h @@ -78,2 +79,2 @@ ---- a/drivers/net/intel/fm10k/base/fm10k_type.h -+++ b/drivers/net/intel/fm10k/base/fm10k_type.h +--- a/drivers/net/fm10k/base/fm10k_type.h ++++ b/drivers/net/fm10k/base/fm10k_type.h @@ -91 +92 @@ -diff --git a/drivers/net/intel/fm10k/base/meson.build b/drivers/net/intel/fm10k/base/meson.build +diff --git a/drivers/net/fm10k/base/meson.build b/drivers/net/fm10k/base/meson.build @@ -93,2 +94,2 @@ ---- a/drivers/net/intel/fm10k/base/meson.build -+++ b/drivers/net/intel/fm10k/base/meson.build +--- a/drivers/net/fm10k/base/meson.build ++++ b/drivers/net/fm10k/base/meson.build