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 C0F0F48AEF for ; Wed, 12 Nov 2025 17:53:34 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BAE6B402A0; Wed, 12 Nov 2025 17:53:34 +0100 (CET) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mails.dpdk.org (Postfix) with ESMTP id 5C7D140A87 for ; Wed, 12 Nov 2025 17:53:33 +0100 (CET) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-47758595eecso5759365e9.0 for ; Wed, 12 Nov 2025 08:53:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762966413; x=1763571213; 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=KzP/rAkTDzevc8orWw8Di1RMoXkfOj31RKY6IaoMRtw=; b=LFMThjbMpEGL8LvvPR0w75HUueq6Q6tEZBXG2Uta43a+U/X/Fz36g9WklWejqtEDxH BxzCeUx6H/3LLFqwg3M97GGHarNDWrrAIhXUE+PX5+7bUwoHIVgv3of6FMFRZS4I5E5D wXqbGzIfGlMuYUWBfihFX8UjWTb9T7Q3nipbEhrtWvf3x8YYrHwSJZ1huJ1GxBjdIazh GFn2zK0SCXulI3S8iOOK1SaJuraPj2Y+4XlP6DWIrPDe70lopz23dZhOwanh6Ng47x00 z2msvWMXkRy2xCSbAIf4NMqfMA5FlfjprYKmwP1LiaxUd+Jc0d+t21jjk8UHh/AIwFcv TggQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762966413; x=1763571213; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=KzP/rAkTDzevc8orWw8Di1RMoXkfOj31RKY6IaoMRtw=; b=hMx38mnHBMQ0xNBs75QGn3wrRSD7cfN+9QNxGteMKNkkbuFLjUjZQj1omkxmKUryaq MArgGMttxrdgCSP6+egTtEZKtNPjnPX9h87QZ7pmRaAv8UXXvIyrKqk4vYcItbSh2QdA 5N9Cz9AWWIcgjxb+2nbuKvLGRsNGAxZL0viNzediEooYnjMH/s+lo0HmDvGMddgLstBo IXg9YtUQe92/w3HA4Wge803hTjtG5bH5FFpR4pmNgqVR6IXXfr3j2B1GWIMvpmMbKs08 Acwn4pVVfLT3QE140p6jght38gjM6e1fq4n0ynlwONJ/mhKKKmt5sCTK2x6tCDBHMi27 MzJQ== X-Gm-Message-State: AOJu0YwZ7h1nmrcypssLRcQ6btHylKIhJ3snbFY6jCRRuSiZkdXwJtHd SYpQs+TBP4QfmMjuaPdd6w0+hMysPEjfbBxa+CiT0N/qC466GUZ/5Z0a/WTZ9A== X-Gm-Gg: ASbGncs4iYIj6RWn+m/XzF+heLc0pjnREAQD+fz/PwbQ7wi4n7m7TCvkGZX2RSuhgj0 plObv4dnLl2MdKYzpcQiVAZ4snhzq2OXotHzO12zAEeQwNtFj9+5pFgd8Rl2vWFfQQgQbGQ5Cti Q0/0BUBl+6B4MXfQ5VQUeiq0a66kXUk4KcK4YFwa69yqfnguZUweyRtIP4AhcVg1aNEcdiPu12H TJZ7E1P9j5SamQBOE1m74hh3EVEAxECC8/gD2n8TlAQRjvtAOXEZ1vO6tbRiBn706qzQ/eteL6k PSlEyekhTL/W37wyecbOlWy2uZnTRPZmdgg2ymMMBIxH5xEOBsDwMiWA8ymyTwLVTaLYNgAeNns fzg3XwEN+H68M41RnbxTcTyrWodig4BUwxlCRukGCQqi5oYmtfFakLeVMyZ1bm1k0QDbRVQWbw8 lFGkOki/xfgY1r2SWd X-Google-Smtp-Source: AGHT+IHoH6Z85IR6/9176oS6G8ad9q3lvWDp7X3Fwt48iNNx/eL0RYmjXQFcNRav+P1VyVlRMpEuCw== X-Received: by 2002:a05:600c:1c85:b0:477:76cb:4812 with SMTP id 5b1f17b1804b1-47787000e64mr38897295e9.0.1762966412841; Wed, 12 Nov 2025 08:53:32 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:a397:14bc:5982:5745]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-47787ea3b56sm43808765e9.16.2025.11.12.08.53.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Nov 2025 08:53:32 -0800 (PST) From: luca.boccassi@gmail.com To: Thomas Monjalon Cc: dpdk stable Subject: patch 'regex/mlx5: remove useless constants' has been queued to stable release 22.11.11 Date: Wed, 12 Nov 2025 16:52:23 +0000 Message-ID: <20251112165308.1618107-9-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251112165308.1618107-1-luca.boccassi@gmail.com> References: <20251027162001.3710450-79-luca.boccassi@gmail.com> <20251112165308.1618107-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.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/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/bcef24364324549a134805d7e7b5f78d9e54ce03 Thanks. Luca Boccassi --- >From bcef24364324549a134805d7e7b5f78d9e54ce03 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Fri, 31 Oct 2025 21:37:54 +0100 Subject: [PATCH] regex/mlx5: remove useless constants [ upstream commit 9f6da93ec89a60df71f8e4d4748dff108a395595 ] All these constants were unused since their introduction: - MLX5_REGEX_WQE_CTRL_OFFSET - MLX5_REGEX_RXP_ROF2_LINE_LEN - MLX5_RXP_BF4_ROF_VERSION_STRING - MLX5_RXP_CTRL_TYPE_* - MLX5_RXP_CTRL_JOB_DESC_FLAGS - MLX5_RXP_CTRL_VALID - MLX5_RXP_INITIALIZATION_TIMEOUT This constant became unused after supporting combined rule file: - MLX5_RXP_POLL_CSR_FOR_VALUE_TIMEOUT All these constants became unused after removing DB and register R/W: - MLX5_RXP_MAX_ENGINES - MLX5_RXP_EM_COUNT - MLX5_RXP_DB_NOT_ASSIGNED - MLX5_RXP_CSR_NUM_ENTRIES - MLX5_RXP_CSR_CTRL_DISABLE_L2C Fixes: 4d4e245ad637 ("regex/mlx5: support enqueue") Fixes: f324162e8e77 ("regex/mlx5: support combined rule file") Fixes: ab74680160ba ("regex/mlx5: support combined ROF file") Fixes: b34d816363b5 ("regex/mlx5: support rules import") Fixes: ab2e0b0d3531 ("regex/mlx5: remove register read/write") Fixes: 9fa82d287f65 ("regex/mlx5: move RXP to CrSpace") Signed-off-by: Thomas Monjalon --- drivers/regex/mlx5/mlx5_regex_fastpath.c | 1 - drivers/regex/mlx5/mlx5_rxp.c | 2 -- drivers/regex/mlx5/mlx5_rxp.h | 20 -------------------- 3 files changed, 23 deletions(-) diff --git a/drivers/regex/mlx5/mlx5_regex_fastpath.c b/drivers/regex/mlx5/mlx5_regex_fastpath.c index 8e5f8c9c95..6e21574d29 100644 --- a/drivers/regex/mlx5/mlx5_regex_fastpath.c +++ b/drivers/regex/mlx5/mlx5_regex_fastpath.c @@ -27,7 +27,6 @@ #define MLX5_REGEX_MAX_WQE_INDEX 0xffff #define MLX5_REGEX_METADATA_SIZE ((size_t)64) #define MLX5_REGEX_MAX_OUTPUT (((size_t)1) << 11) -#define MLX5_REGEX_WQE_CTRL_OFFSET 12 #define MLX5_REGEX_WQE_METADATA_OFFSET 16 #define MLX5_REGEX_WQE_GATHER_OFFSET 32 #define MLX5_REGEX_WQE_SCATTER_OFFSET 48 diff --git a/drivers/regex/mlx5/mlx5_rxp.c b/drivers/regex/mlx5/mlx5_rxp.c index 7730e11fb1..dda4a7fdb0 100644 --- a/drivers/regex/mlx5/mlx5_rxp.c +++ b/drivers/regex/mlx5/mlx5_rxp.c @@ -24,8 +24,6 @@ #define MLX5_REGEX_MAX_RULES_PER_GROUP UINT32_MAX #define MLX5_REGEX_MAX_GROUPS MLX5_RXP_MAX_SUBSETS -#define MLX5_REGEX_RXP_ROF2_LINE_LEN 34 - const uint64_t combined_rof_tag = 0xff52544424a52475; /* Private Declarations */ diff --git a/drivers/regex/mlx5/mlx5_rxp.h b/drivers/regex/mlx5/mlx5_rxp.h index b38b53cc14..1f982f3b61 100644 --- a/drivers/regex/mlx5/mlx5_rxp.h +++ b/drivers/regex/mlx5/mlx5_rxp.h @@ -9,27 +9,13 @@ #define MLX5_RXP_BF3_IDENTIFIER 0x1 #define MLX5_RXP_MAX_JOB_LENGTH 16384 #define MLX5_RXP_MAX_SUBSETS 4095 -#define MLX5_RXP_CSR_NUM_ENTRIES 31 #define MLX5_RXP_BF2_ROF_VERSION_STRING 0x07055254 #define MLX5_RXP_BF3_ROF_VERSION_STRING 0x00065254 -#define MLX5_RXP_BF4_ROF_VERSION_STRING 0x00075254 - -#define MLX5_RXP_CTRL_TYPE_MASK 7 -#define MLX5_RXP_CTRL_TYPE_JOB_DESCRIPTOR 0 -#define MLX5_RXP_CTRL_TYPE_RESPONSE_DESCRIPTOR 1 -#define MLX5_RXP_CTRL_TYPE_MEMORY_WRITE 4 -#define MLX5_RXP_CSR_CTRL_DISABLE_L2C (1 << 7) #define MLX5_RXP_CTRL_JOB_DESC_SOF 0x0010 #define MLX5_RXP_CTRL_JOB_DESC_EOF 0x0020 #define MLX5_RXP_CTRL_JOB_DESC_HPM_ENABLE 0x0100 #define MLX5_RXP_CTRL_JOB_DESC_ANYMATCH_ENABLE 0x0200 -#define MLX5_RXP_CTRL_JOB_DESC_FLAGS (MLX5_RXP_CTRL_JOB_DESC_SOF | \ - MLX5_RXP_CTRL_JOB_DESC_EOF | \ - MLX5_RXP_CTRL_JOB_DESC_HPM_ENABLE | \ - MLX5_RXP_CTRL_JOB_DESC_ANYMATCH_ENABLE) - -#define MLX5_RXP_CTRL_VALID 0x8000 #define MLX5_RXP_RESP_STATUS_MAX_PRI_THREADS (1 << 3) #define MLX5_RXP_RESP_STATUS_MAX_SEC_THREADS (1 << 4) @@ -128,12 +114,6 @@ enum mlx5_rxp_program_mode { MLX5_RXP_PRIVATE_PROG_MODE, }; -#define MLX5_RXP_POLL_CSR_FOR_VALUE_TIMEOUT 3000 /* Poll timeout in ms. */ -#define MLX5_RXP_INITIALIZATION_TIMEOUT 60000 /* Initialize timeout in ms. */ -#define MLX5_RXP_MAX_ENGINES 2u /* Number of RXP engines. */ -#define MLX5_RXP_EM_COUNT 1u /* Extra External Memories to use. */ -#define MLX5_RXP_DB_NOT_ASSIGNED 0xFF - struct mlx5_regex_mkey { struct mlx5dv_devx_umem *umem; struct mlx5_devx_obj *mkey; -- 2.47.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-11-12 16:20:41.321818943 +0000 +++ 0009-regex-mlx5-remove-useless-constants.patch 2025-11-12 16:20:40.879715762 +0000 @@ -1 +1 @@ -From 9f6da93ec89a60df71f8e4d4748dff108a395595 Mon Sep 17 00:00:00 2001 +From bcef24364324549a134805d7e7b5f78d9e54ce03 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9f6da93ec89a60df71f8e4d4748dff108a395595 ] + @@ -34 +35,0 @@ -Cc: stable@dpdk.org @@ -69 +70 @@ -index 08b9a2680b..8ef1541d1a 100644 +index b38b53cc14..1f982f3b61 100644