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 707A4468E4 for ; Thu, 12 Jun 2025 23:07:41 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6AD7C42DE4; Thu, 12 Jun 2025 23:07:41 +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 4EB9642DD9 for ; Thu, 12 Jun 2025 23:07:40 +0200 (CEST) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-442f4a3a4d6so8101325e9.0 for ; Thu, 12 Jun 2025 14:07:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749762460; x=1750367260; darn=dpdk.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=FSxOTd85Z37iQBTOgNrV209ai2zL+YmbweqNLZV7oHM=; b=gUAzOJKKjtRsjpXGLvTDwtcbWHghX5h6JvUxXsilYSWDxfZTqQVUMqYIEkR7/lzPhd 6eApejbMh3ioxTixb8QsR4ADSeqtZnQC41HVHrLJTFTUtf50K0wAoF6VKQqyFkhchtjs YzksK64dw8+AyIkQm9lSDaXbEq18JizhoOJKvaVO8c5iqaSmKUFsDq5jA/4GZ4AppVUi UguDy7B5m8cAHHmOdhSE8NN2Uz0zRx0PY8mEDbbPlD7LO7y5nggyeAqYTYVq8q2bFlqR VO1ZncoqSxGYEn6GLE71sqSpSNm6a7YflifYK7KLWnLPsxlAOA62yjBq7ELSdFCRcxek zA+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749762460; x=1750367260; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=FSxOTd85Z37iQBTOgNrV209ai2zL+YmbweqNLZV7oHM=; b=DWuWFnKykXcI9QCVDCOZ1jlI5obgk+8Fbn2q0mX8RnmwCn0dL6YOg77lT9i8WaE+ig BOJgZHaZU8liq16SqgI6W/AxmiNhaT/gHKNTW26SiVL7JR6kC3i6hCqnWKR6L3ODnTlD H7QV7adGVunw+/sjzSMx1Ru3HKokxZAaZDB6daEYfhuSvqjxTPuaFC2oh7jncQcz7Bv/ xerDfOyOMrzgn3BD7r7izgXowltIVjpTQBdSQaURuZ6NmXb8Lq45zpYcJn8/ztIvcPBE EZOt3az/X5kq5R5gQax1adUH1mNyTJmiLUhgeDXHhNlYNc5Y1DrpJHkQw/fxpQlc7ro1 kSiA== X-Forwarded-Encrypted: i=1; AJvYcCWuFOjsu3HU4rZ9P1xfO1TFRIeV+t935PwJBFCOAG0BP210A3y2iJURjwcfxZ4WjBmrPZyuXb8=@dpdk.org X-Gm-Message-State: AOJu0Yx62Q19tk/YjDtXVokhWoM2go0vtOK8hrakTx5BHDLMfobId8aG xxQBY4ZmzTb8MhjBkkLmxch1MM00qFoC06O+Nsu514VlDUhpuXbeMmczKoDANMrs X-Gm-Gg: ASbGncvf0tz73bg3Srix6beloN8nSJ1F6CsRr/SNkYQfQh0i4Pv2efsjoX/Tk/WHJ3m RyT1xi00fk6J8yTi92heIspRDL9JZAnzXI8Qsz3t5qbP7YE/VyhHHEQEMu99kXllaKCAM926CR/ 9I288HHiU/X/THn3gWe1h23gwsnG0VzDfF0GQNyZhAPGT+h63Rs+AQxI9+QsHJo2mAWl5YLom+Y BCkrQGFlK7ziiiJIiQtmOqVTU+pfv56riMyTgUdxFnlIP1pSYPJ1Id392ROkSVrn3VpawRBF1az 77JbBMPnJe390EZDrEb+cIeyYJ4vrnPNcXUfxc1BWN0mNDEDPpA6w96Fv4PIjH+uhUUA X-Google-Smtp-Source: AGHT+IEVCWMUNRfBS5IyGnfBOsHI/My2aAgARB0xesdRLwVESFD7s2PT4g2rF5z/hsyRZU655CBUNQ== X-Received: by 2002:a05:600c:c11c:b0:43d:5264:3cf0 with SMTP id 5b1f17b1804b1-4533727a1dfmr171115e9.11.1749762459563; Thu, 12 Jun 2025 14:07:39 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:f2df:571a:ae4c:bef2]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4532e2522b1sm31129435e9.25.2025.06.12.14.07.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 14:07:39 -0700 (PDT) From: luca.boccassi@gmail.com To: Krzysztof Galazka Cc: Anatoly Burakov , Bruce Richardson , dpdk stable Subject: patch 'net/i40e/base: remove unused variables' has been queued to stable release 22.11.9 Date: Thu, 12 Jun 2025 22:06:18 +0100 Message-ID: <20250612210733.2506558-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 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/43864791e80cfa3f86045db151b1dc0dd11ea86e Thanks. Luca Boccassi --- >From 43864791e80cfa3f86045db151b1dc0dd11ea86e Mon Sep 17 00:00:00 2001 From: Krzysztof Galazka Date: Mon, 2 Sep 2024 10:54:16 +0100 Subject: [PATCH] net/i40e/base: remove unused variables [ upstream commit d63c0823472340db19aa1103cbfbcd94fefd00ce ] At one point, there was functionality that was no longer used and was removed. However, while removing unused logic from the i40e_validate_filter_settings function, some intermediate variables were missed and were still being set. Also remove macro definitions for the registers that were missed during removal. Signed-off-by: Krzysztof Galazka Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- drivers/net/i40e/base/i40e_common.c | 5 ---- drivers/net/i40e/base/i40e_register.h | 33 --------------------------- drivers/net/i40e/i40e_regs.h | 9 -------- 3 files changed, 47 deletions(-) diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c index e5651ad80b..38828e6da5 100644 --- a/drivers/net/i40e/base/i40e_common.c +++ b/drivers/net/i40e/base/i40e_common.c @@ -5626,7 +5626,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; @@ -5671,8 +5670,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; @@ -5689,8 +5686,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_register.h b/drivers/net/i40e/base/i40e_register.h index 75eff845f1..be4700770a 100644 --- a/drivers/net/i40e/base/i40e_register.h +++ b/drivers/net/i40e/base/i40e_register.h @@ -3625,27 +3625,6 @@ #define I40E_GLHMC_PETIMEROBJSZ 0x000C2080 /* Reset: CORER */ #define I40E_GLHMC_PETIMEROBJSZ_PMPETIMEROBJSZ_SHIFT 0 #define I40E_GLHMC_PETIMEROBJSZ_PMPETIMEROBJSZ_MASK I40E_MASK(0xF, I40E_GLHMC_PETIMEROBJSZ_PMPETIMEROBJSZ_SHIFT) -#define I40E_GLHMC_PEXFBASE(_i) (0x000C4e00 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */ -#define I40E_GLHMC_PEXFBASE_MAX_INDEX 15 -#define I40E_GLHMC_PEXFBASE_FPMPEXFBASE_SHIFT 0 -#define I40E_GLHMC_PEXFBASE_FPMPEXFBASE_MASK I40E_MASK(0xFFFFFF, I40E_GLHMC_PEXFBASE_FPMPEXFBASE_SHIFT) -#define I40E_GLHMC_PEXFCNT(_i) (0x000C4f00 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */ -#define I40E_GLHMC_PEXFCNT_MAX_INDEX 15 -#define I40E_GLHMC_PEXFCNT_FPMPEXFCNT_SHIFT 0 -#define I40E_GLHMC_PEXFCNT_FPMPEXFCNT_MASK I40E_MASK(0x1FFFFFFF, I40E_GLHMC_PEXFCNT_FPMPEXFCNT_SHIFT) -#define I40E_GLHMC_PEXFFLBASE(_i) (0x000C5000 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */ -#define I40E_GLHMC_PEXFFLBASE_MAX_INDEX 15 -#define I40E_GLHMC_PEXFFLBASE_FPMPEXFFLBASE_SHIFT 0 -#define I40E_GLHMC_PEXFFLBASE_FPMPEXFFLBASE_MASK I40E_MASK(0xFFFFFF, I40E_GLHMC_PEXFFLBASE_FPMPEXFFLBASE_SHIFT) -#define I40E_GLHMC_PEXFFLMAX 0x000C204c /* Reset: CORER */ -#define I40E_GLHMC_PEXFFLMAX_PMPEXFFLMAX_SHIFT 0 -#define I40E_GLHMC_PEXFFLMAX_PMPEXFFLMAX_MASK I40E_MASK(0x1FFFFFF, I40E_GLHMC_PEXFFLMAX_PMPEXFFLMAX_SHIFT) -#define I40E_GLHMC_PEXFMAX 0x000C2048 /* Reset: CORER */ -#define I40E_GLHMC_PEXFMAX_PMPEXFMAX_SHIFT 0 -#define I40E_GLHMC_PEXFMAX_PMPEXFMAX_MASK I40E_MASK(0x3FFFFFF, I40E_GLHMC_PEXFMAX_PMPEXFMAX_SHIFT) -#define I40E_GLHMC_PEXFOBJSZ 0x000C2044 /* Reset: CORER */ -#define I40E_GLHMC_PEXFOBJSZ_PMPEXFOBJSZ_SHIFT 0 -#define I40E_GLHMC_PEXFOBJSZ_PMPEXFOBJSZ_MASK I40E_MASK(0xF, I40E_GLHMC_PEXFOBJSZ_PMPEXFOBJSZ_SHIFT) #define I40E_GLHMC_PFPESDPART(_i) (0x000C0880 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */ #define I40E_GLHMC_PFPESDPART_MAX_INDEX 15 #define I40E_GLHMC_PFPESDPART_PMSDBASE_SHIFT 0 @@ -3766,18 +3745,6 @@ #define I40E_GLHMC_VFPETIMERCNT_MAX_INDEX 31 #define I40E_GLHMC_VFPETIMERCNT_FPMPETIMERCNT_SHIFT 0 #define I40E_GLHMC_VFPETIMERCNT_FPMPETIMERCNT_MASK I40E_MASK(0x1FFFFFFF, I40E_GLHMC_VFPETIMERCNT_FPMPETIMERCNT_SHIFT) -#define I40E_GLHMC_VFPEXFBASE(_i) (0x000Cce00 + ((_i) * 4)) /* _i=0...31 */ /* Reset: CORER */ -#define I40E_GLHMC_VFPEXFBASE_MAX_INDEX 31 -#define I40E_GLHMC_VFPEXFBASE_FPMPEXFBASE_SHIFT 0 -#define I40E_GLHMC_VFPEXFBASE_FPMPEXFBASE_MASK I40E_MASK(0xFFFFFF, I40E_GLHMC_VFPEXFBASE_FPMPEXFBASE_SHIFT) -#define I40E_GLHMC_VFPEXFCNT(_i) (0x000Ccf00 + ((_i) * 4)) /* _i=0...31 */ /* Reset: CORER */ -#define I40E_GLHMC_VFPEXFCNT_MAX_INDEX 31 -#define I40E_GLHMC_VFPEXFCNT_FPMPEXFCNT_SHIFT 0 -#define I40E_GLHMC_VFPEXFCNT_FPMPEXFCNT_MASK I40E_MASK(0x1FFFFFFF, I40E_GLHMC_VFPEXFCNT_FPMPEXFCNT_SHIFT) -#define I40E_GLHMC_VFPEXFFLBASE(_i) (0x000Cd000 + ((_i) * 4)) /* _i=0...31 */ /* Reset: CORER */ -#define I40E_GLHMC_VFPEXFFLBASE_MAX_INDEX 31 -#define I40E_GLHMC_VFPEXFFLBASE_FPMPEXFFLBASE_SHIFT 0 -#define I40E_GLHMC_VFPEXFFLBASE_FPMPEXFFLBASE_MASK I40E_MASK(0xFFFFFF, I40E_GLHMC_VFPEXFFLBASE_FPMPEXFFLBASE_SHIFT) #define I40E_GLHMC_VFSDPART(_i) (0x000C8800 + ((_i) * 4)) /* _i=0...31 */ /* Reset: CORER */ #define I40E_GLHMC_VFSDPART_MAX_INDEX 31 #define I40E_GLHMC_VFSDPART_PMSDBASE_SHIFT 0 diff --git a/drivers/net/i40e/i40e_regs.h b/drivers/net/i40e/i40e_regs.h index b19bb1d5a5..7e94fca5b1 100644 --- a/drivers/net/i40e/i40e_regs.h +++ b/drivers/net/i40e/i40e_regs.h @@ -586,9 +586,6 @@ static const struct i40e_reg_info i40e_regs_others[] = { {I40E_GLHMC_PEARPMAX, 0, 0, 0, 0, "GLHMC_PEARPMAX"}, {I40E_GLHMC_PEMROBJSZ, 0, 0, 0, 0, "GLHMC_PEMROBJSZ"}, {I40E_GLHMC_PEMRMAX, 0, 0, 0, 0, "GLHMC_PEMRMAX"}, - {I40E_GLHMC_PEXFOBJSZ, 0, 0, 0, 0, "GLHMC_PEXFOBJSZ"}, - {I40E_GLHMC_PEXFMAX, 0, 0, 0, 0, "GLHMC_PEXFMAX"}, - {I40E_GLHMC_PEXFFLMAX, 0, 0, 0, 0, "GLHMC_PEXFFLMAX"}, {I40E_GLHMC_PEQ1OBJSZ, 0, 0, 0, 0, "GLHMC_PEQ1OBJSZ"}, {I40E_GLHMC_PEQ1MAX, 0, 0, 0, 0, "GLHMC_PEQ1MAX"}, {I40E_GLHMC_PEQ1FLMAX, 0, 0, 0, 0, "GLHMC_PEQ1FLMAX"}, @@ -616,9 +613,6 @@ static const struct i40e_reg_info i40e_regs_others[] = { {I40E_GLHMC_APBVTINUSEBASE(0), 15, 4, 0, 0, "GLHMC_APBVTINUSEBASE"}, {I40E_GLHMC_PEMRBASE(0), 15, 4, 0, 0, "GLHMC_PEMRBASE"}, {I40E_GLHMC_PEMRCNT(0), 15, 4, 0, 0, "GLHMC_PEMRCNT"}, - {I40E_GLHMC_PEXFBASE(0), 15, 4, 0, 0, "GLHMC_PEXFBASE"}, - {I40E_GLHMC_PEXFCNT(0), 15, 4, 0, 0, "GLHMC_PEXFCNT"}, - {I40E_GLHMC_PEXFFLBASE(0), 15, 4, 0, 0, "GLHMC_PEXFFLBASE"}, {I40E_GLHMC_PEQ1BASE(0), 15, 4, 0, 0, "GLHMC_PEQ1BASE"}, {I40E_GLHMC_PEQ1CNT(0), 15, 4, 0, 0, "GLHMC_PEQ1CNT"}, {I40E_GLHMC_PEQ1FLBASE(0), 15, 4, 0, 0, "GLHMC_PEQ1FLBASE"}, @@ -653,9 +647,6 @@ static const struct i40e_reg_info i40e_regs_others[] = { {I40E_GLHMC_VFAPBVTINUSEBASE(0), 31, 4, 0, 0, "GLHMC_VFAPBVTINUSEBASE"}, {I40E_GLHMC_VFPEMRBASE(0), 31, 4, 0, 0, "GLHMC_VFPEMRBASE"}, {I40E_GLHMC_VFPEMRCNT(0), 31, 4, 0, 0, "GLHMC_VFPEMRCNT"}, - {I40E_GLHMC_VFPEXFBASE(0), 31, 4, 0, 0, "GLHMC_VFPEXFBASE"}, - {I40E_GLHMC_VFPEXFCNT(0), 31, 4, 0, 0, "GLHMC_VFPEXFCNT"}, - {I40E_GLHMC_VFPEXFFLBASE(0), 31, 4, 0, 0, "GLHMC_VFPEXFFLBASE"}, {I40E_GLHMC_VFPEQ1BASE(0), 31, 4, 0, 0, "GLHMC_VFPEQ1BASE"}, {I40E_GLHMC_VFPEQ1CNT(0), 31, 4, 0, 0, "GLHMC_VFPEQ1CNT"}, {I40E_GLHMC_VFPEQ1FLBASE(0), 31, 4, 0, 0, "GLHMC_VFPEQ1FLBASE"}, -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-12 22:06:23.940067576 +0100 +++ 0001-net-i40e-base-remove-unused-variables.patch 2025-06-12 22:06:23.778042696 +0100 @@ -1 +1 @@ -From d63c0823472340db19aa1103cbfbcd94fefd00ce Mon Sep 17 00:00:00 2001 +From 43864791e80cfa3f86045db151b1dc0dd11ea86e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d63c0823472340db19aa1103cbfbcd94fefd00ce ] + @@ -22 +24 @@ -index 25835a5ecb..e4de508aea 100644 +index e5651ad80b..38828e6da5 100644 @@ -25 +27 @@ -@@ -5619,7 +5619,6 @@ STATIC enum i40e_status_code i40e_validate_filter_settings(struct i40e_hw *hw, +@@ -5626,7 +5626,6 @@ STATIC enum i40e_status_code i40e_validate_filter_settings(struct i40e_hw *hw, @@ -33 +35 @@ -@@ -5664,8 +5663,6 @@ STATIC enum i40e_status_code i40e_validate_filter_settings(struct i40e_hw *hw, +@@ -5671,8 +5670,6 @@ STATIC enum i40e_status_code i40e_validate_filter_settings(struct i40e_hw *hw, @@ -42 +44 @@ -@@ -5682,8 +5679,6 @@ STATIC enum i40e_status_code i40e_validate_filter_settings(struct i40e_hw *hw, +@@ -5689,8 +5686,6 @@ STATIC enum i40e_status_code i40e_validate_filter_settings(struct i40e_hw *hw, @@ -52 +54 @@ -index 51f65d7e5f..b9da69484c 100644 +index 75eff845f1..be4700770a 100644 @@ -55 +57 @@ -@@ -3618,27 +3618,6 @@ +@@ -3625,27 +3625,6 @@ @@ -83 +85 @@ -@@ -3759,18 +3738,6 @@ +@@ -3766,18 +3745,6 @@