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 B651B46A63 for ; Thu, 26 Jun 2025 14:02:55 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AFF164026B; Thu, 26 Jun 2025 14:02:55 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2043.outbound.protection.outlook.com [40.107.95.43]) by mails.dpdk.org (Postfix) with ESMTP id 8B5E7400D6 for ; Thu, 26 Jun 2025 14:02:53 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HZVTcwLW4xsOVKIeDcDtrTLRe/o2CTHiH56g1z5/Zj54rPhaF3da/fHtGmWyN2uoIbFxOsqJN+M4VgNONx8nIB2VewXAfNWg/V2gYbXn4qhwvOeiE56LE8bDTBM9SNBXmGsHfNOzBkzsI5ykbYBbMbTziyKEvRFRVH/woARPRDC/4DpQ+8ouSGYuysNakj1s6dfmUIcdl3nexjDPC85knKoJcahoI74hffdDiAFaWajM17HpITac2otAyi2t/NRY2sJuht45FD21uexKY0FKoVD+Jdqo4L2v+PhH13qu+plhEzZdEcjplWV4QzBuJyQB34riwHI4Xw35BK1uNdKVpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZH0u38OnPEossOs6Jh6FqFcUCJdvwEZEkBtQcvT4ouU=; b=TkRHx0Aa6yTKOEHf6B9TtxL4s6D2IZcu1hnH4a+/ZyQHf5eUAtyr6uS1/HB3de5tsRvr9nddhmgTGnZuKakjuDU+TE8o9Om8c2WXGftk5KG1hWQ0H7O5H4X40L6i6WJFSgn4L5NwMq71v91RZpM9rTrFh4gYmO9h+xxhJk2nt4Gde5Bqii+Zfs513FKL21dae8avqyOzSAi0hxAQbyUzW5pkM8CPEtgGyG0Vh5GLVSENbeXGcDBcekmQzYu4004m/2/P5ALFxEF5QThOY3N+Doj1QYmOIeb67wTO9BcRzA5edfD1go5EDxb2auyvoEyr1Y6nHRa9VVdVTTBDH9kdwQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZH0u38OnPEossOs6Jh6FqFcUCJdvwEZEkBtQcvT4ouU=; b=SzhVKXzktJV0iOXcbhhRwIiZZhaCfNKeUhNuU1Dd2bqXW/U5vZSzHnI0r3gsS0zX3Q2jBU6DqUW++bW2b3u1gkru7mL2vUk2lq9usdk9cjjdkT66FiRWx9thqiN3ws1TmcsVpMXITnPkBB8OVde8/tpnaTfqDhrI5az3BhKwXMjekr0jWuPs0hnORUJd1ZaNk1uLhWWSajp3l3iEUiTn/KWYJ8/18kHnRzAtRhp+FKQC9kmMBI77VzTGvHTZmCJO9/GWVpzE+wQxjXpY57d8IE3qxng94Tb1GW2UCXxSsZ01XeBG2rF2Ff/83RBIXBymswrKpQ97jkDt+cXrjpcBbQ== Received: from BL1PR13CA0293.namprd13.prod.outlook.com (2603:10b6:208:2bc::28) by SJ5PPF4D350AC80.namprd12.prod.outlook.com (2603:10b6:a0f:fc02::993) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.31; Thu, 26 Jun 2025 12:02:49 +0000 Received: from MN1PEPF0000F0E2.namprd04.prod.outlook.com (2603:10b6:208:2bc:cafe::8) by BL1PR13CA0293.outlook.office365.com (2603:10b6:208:2bc::28) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8901.9 via Frontend Transport; Thu, 26 Jun 2025 12:02:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by MN1PEPF0000F0E2.mail.protection.outlook.com (10.167.242.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.14 via Frontend Transport; Thu, 26 Jun 2025 12:02:48 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Thu, 26 Jun 2025 05:02:24 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Thu, 26 Jun 2025 05:02:22 -0700 From: Xueming Li To: Bruce Richardson CC: Xueming Li , Anatoly Burakov , dpdk stable Subject: patch 'net/i40e/base: fix unused value warnings' has been queued to stable release 23.11.5 Date: Thu, 26 Jun 2025 20:00:25 +0800 Message-ID: <20250626120145.27369-6-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250626120145.27369-1-xuemingl@nvidia.com> References: <20250626120145.27369-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN1PEPF0000F0E2:EE_|SJ5PPF4D350AC80:EE_ X-MS-Office365-Filtering-Correlation-Id: cf86c447-af37-4e69-5d04-08ddb4a95e60 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|36860700013|376014|1800799024|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ArioO9jEZk+GyY1MeiAgOXc6UaSMDrPnuTvLUjkFiBf1ieWMhXTDatw0uV4f?= =?us-ascii?Q?6JL3/Xjx+dM4YSv5qAYv1Q5JeqUd+BaPByumVFPuzJIXkPmtpjNHZK7DJW2i?= =?us-ascii?Q?zzDuN2u+6lhroo3InpoeI30b7uwgD6aIQXG9FX61zYuSiKiAVch+nFA5m1xX?= =?us-ascii?Q?oV0nqhDczPgF6W4DmYy12NtDS516gAmVkoExdpDUqgr/waw6pgCpWoar7FwJ?= =?us-ascii?Q?mcOFxgIGNbAdfXFsnvTHxDU5QspcZy4ZKzwXeq+SoZUQeNqR5ytawA+u9hI0?= =?us-ascii?Q?yL1gaIzKW8N1qJqSl1O8Y+1gT923Q+HrjSqvNlH84s32f4fFL1ztoOqWzG0b?= =?us-ascii?Q?jtBRORliXxQKLjMQqnT7UtXr5khcFuJnOMQtbP1f56Vdu0IGgeGin4PA0lIM?= =?us-ascii?Q?3VD6TLnCrmCId53nRPYJeHZ8tV5KYrQj1A7q6pMs9xghS2hppkwGmQ09u7TU?= =?us-ascii?Q?F6FyJbHpbcWs4RCZl5prPrPV1h1r0+9MBOF9x5EGLh4xh3WTtvRa0BiZt8Ni?= =?us-ascii?Q?GvmURi8nXLIX0WyeiYvQNebTZt+egLoPCTrYyrf7k4Wev3Diev4sE/11LkES?= =?us-ascii?Q?UVqa3jxlKSdmQ6wQfsiq8Vjbw9a/HktAoKBtovOFOpTx3LCEf8etLcUj1i4H?= =?us-ascii?Q?nAx8G7x0tuBYz/Kjy28MBTufrx9Io/K0pdrYo5v7LXMMcaatK65HZYHScfvh?= =?us-ascii?Q?dhZa3hMWJgYxYe61Fp86DJ/qX2h9beMqvaCF8+JUawTRX5fykmKoMvoBxO9Q?= =?us-ascii?Q?VEcjDodPntqf3l+t4HquBihNkjniZbjPaxiqmJLls0UknEtp2tnorfFr7VNA?= =?us-ascii?Q?OHO3f72W9XXMnUhdux1NWBNqO3Bx0J6MRkdYIUFeawMDDyRv9/+MbFv5Fqp0?= =?us-ascii?Q?gk8rQH0a9hynpXLbkHU/hjc6KeE1mBkV90niFgOn6wgHFW7y2vJI3k2zfp2m?= =?us-ascii?Q?IG6YDtvhEWg7CUW3BCiPqDVFA6/W5h8QaGL/phNWwztj4uU8rd43ywE1ZCr9?= =?us-ascii?Q?uDU+XaaS7/nb2S0B6CpwcGC4u8V0+DFvexcAtATWrZLyyeTnOErLKekSk/ID?= =?us-ascii?Q?NLQ9vx97yCXayM3VkEyn1SLLmRVzObVX9ZmVIftMZfOlWjNpeLNPJF2GQJE3?= =?us-ascii?Q?ollCcfzpAZbJRzDOqIz0S82jAqeuohLB0d3Ii6GBHbeBT/dFeRrS8gl/3PdS?= =?us-ascii?Q?ftW1Tkc6e3QzYLLNv+CCGbMNsFhcKzd/vFcyAJl+byVs/IA4q8gIbUFhJAUT?= =?us-ascii?Q?r12cdbRcoheEal3XylgQYj7V+Nhht5OxEwILOtl4uhRh67IOMXsi172ZOBCy?= =?us-ascii?Q?QmTvhBJzGi9QMEUcSOdLP0rK8XUVbhZB0rjcTegBMWS5hi3An3R0oBq9ixbg?= =?us-ascii?Q?oL2/AQdS6UJ8sNjngFf5sTqgvUQ4ngFQrppXg5taRpRKQfsM4D//Fop1hE8l?= =?us-ascii?Q?F5rngoo3UU0TasKkZx2hQjtV/iFUQRhYltTHoxxHPyDlzajTJi9ckwoDztiZ?= =?us-ascii?Q?fxyqkvlt2ESW8NqO8fq5ruy3Mob2K7oQbQ0/HWgOCQnfsp9gkgBoD1iaNw?= =?us-ascii?Q?=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(82310400026)(36860700013)(376014)(1800799024)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2025 12:02:48.0398 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cf86c447-af37-4e69-5d04-08ddb4a95e60 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: MN1PEPF0000F0E2.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ5PPF4D350AC80 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 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 --- >From 5cec3d059d3432488dbcb7cb2fbe379984a2b007 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 Cc: Xueming Li [ 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_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 + +[ upstream commit 3c2125852742d46accc3f35f4fa683768ba25e09 ] @@ -12 +14,0 @@ -Cc: stable@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: