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 4729A454E9 for ; Tue, 25 Jun 2024 02:02:51 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 42EBA42799; Tue, 25 Jun 2024 02:02:51 +0200 (CEST) Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by mails.dpdk.org (Postfix) with ESMTP id 4FE7F4278A for ; Tue, 25 Jun 2024 02:02:49 +0200 (CEST) Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-52cd9f9505cso3813650e87.0 for ; Mon, 24 Jun 2024 17:02:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719273769; x=1719878569; 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=ub+2pRzH2ZIOwza5hN8yULqfn2Ex7qp9Apcp5tavEE4=; b=fdFp1774WoW0nzE/AzLOu7ADDoYjYvtHPw8kQMqndODIVpwarYX/DIHtD7dKdU/y8P 6llx6/sam1eB8X8Pcgp4fkn4Oqg2IzHvPKd1N34/9ZXH8Zj+9nqkdeJrIllA/+fGWlIB D+7L5DsBdqc6ZlJ6IIEWpZdA2lDPq27nD2EwaDZMW8wBR3UXUoc2s/DHqK7FYLUkoywW 5NwiSZl3EoDFMLF69XdRVntDZNhThcrAixiJ08LRHIirdm4DIGlRoY3S2Y4iwo5ChQQB /5fTntqu6/CWCHFDNSDH9gTAzv5BiE835AvC4B4uL1KgsjezufqkCrauZWICe6dvzECe B5Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719273769; x=1719878569; 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=ub+2pRzH2ZIOwza5hN8yULqfn2Ex7qp9Apcp5tavEE4=; b=R2z3lBpdfNiZQcsgYUnmZ8ng9PchZxMG3sLZhf+FHb+Fk3+zuDBjTjbCqFgkWquuSJ o67hALHPh3xfdTZIrV8GOwVYKWnHoIbiQs7DpioZjR3VDieNVVO1UTEXqkw/3QEgNWEG BVB9BP0njjhmpV3DIKiRPoOmnlntsrZJH/nKrZtJtyUQ7KPFh94n2JQco0t+V/a4YZUx 59frioHRBePO+mLHt0ArOLsHpnTC43bBItIObWnHOf9e1iBIQ00kS0lgk7W47bWv4mzH HpE/K+kTcM3edmCxOhosIJyH/ySHvnGBJbc5GC6Md9m77cxjcOUEQgjov7wR12uoYiDv NXrw== X-Forwarded-Encrypted: i=1; AJvYcCXikRIoMIjY9HEcrUAbcSAlkl9wJJSkejLBHtwOTCoDOf9Xj5S0jZbyvESDU+qWyEcW5StN2MDPeGNMmm79cdY= X-Gm-Message-State: AOJu0YyTH2SnVV1Tg7f8/s0cMOdXCk+daV/L8k8Q+3kx9HCkCLdu7byw zXQhSGFNr2D5DhEu/XCRs38jb7Gy4aA5NqVRQRVHSDYk942H/N2F9IkIDQdk X-Google-Smtp-Source: AGHT+IFFCS/IVIN6Tb8gxbPkRdKtcr7VLWa7U+5xwnvKT9on9jg8+E/dwjGpdmA3OqB+H5zfUhxhCg== X-Received: by 2002:a05:6512:2205:b0:52c:cd7d:4e7d with SMTP id 2adb3069b0e04-52cdf7e6711mr5293235e87.5.1719273768338; Mon, 24 Jun 2024 17:02:48 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4247d0c5179sm188603245e9.26.2024.06.24.17.02.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 17:02:47 -0700 (PDT) From: luca.boccassi@gmail.com To: Yevgeny Kliteynik Cc: Matan Azrad , dpdk stable Subject: patch 'common/mlx5: fix PRM structs' has been queued to stable release 22.11.6 Date: Tue, 25 Jun 2024 00:58:52 +0100 Message-Id: <20240624235907.885628-66-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240624235907.885628-1-luca.boccassi@gmail.com> References: <20240624235907.885628-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.6 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/27/24. 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/06de40842ef37ce6b557e3186d493b219be492e4 Thanks. Luca Boccassi --- >From 06de40842ef37ce6b557e3186d493b219be492e4 Mon Sep 17 00:00:00 2001 From: Yevgeny Kliteynik Date: Mon, 6 May 2024 14:44:05 +0300 Subject: [PATCH] common/mlx5: fix PRM structs [ upstream commit 39b1cce562a4e1fa3137fd91a3b1dfed98f23db4 ] Fix wrong reserved size and add helpful comment Fixes: 365cdf5f8ce7 ("net/mlx5/hws: add command layer") Signed-off-by: Yevgeny Kliteynik Acked-by: Matan Azrad --- drivers/common/mlx5/mlx5_prm.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h index dab70b9469..f2cd353672 100644 --- a/drivers/common/mlx5/mlx5_prm.h +++ b/drivers/common/mlx5/mlx5_prm.h @@ -2116,8 +2116,8 @@ struct mlx5_ifc_cmd_hca_cap_2_bits { u8 reserved_at_d0[0x3]; u8 log_conn_track_max_alloc[0x5]; u8 reserved_at_d8[0x3]; - u8 log_max_conn_track_offload[0x5]; - u8 reserved_at_e0[0x20]; /* End of DW7. */ + u8 log_max_conn_track_offload[0x5]; /* End of DW7. */ + u8 reserved_at_e0[0x20]; u8 reserved_at_100[0x60]; u8 reserved_at_160[0x3]; u8 hairpin_sq_wqe_bb_size[0x5]; @@ -3311,7 +3311,7 @@ struct mlx5_ifc_stc_ste_param_vport_bits { u8 eswitch_owner_vhca_id[0x10]; u8 vport_number[0x10]; u8 eswitch_owner_vhca_id_valid[0x1]; - u8 reserved_at_21[0x59]; + u8 reserved_at_21[0x5f]; }; union mlx5_ifc_stc_param_bits { -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-06-25 00:22:17.058542614 +0100 +++ 0066-common-mlx5-fix-PRM-structs.patch 2024-06-25 00:22:13.237186709 +0100 @@ -1 +1 @@ -From 39b1cce562a4e1fa3137fd91a3b1dfed98f23db4 Mon Sep 17 00:00:00 2001 +From 06de40842ef37ce6b557e3186d493b219be492e4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 39b1cce562a4e1fa3137fd91a3b1dfed98f23db4 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 2bbbc446fc..178a18a978 100644 +index dab70b9469..f2cd353672 100644 @@ -21 +22 @@ -@@ -2360,8 +2360,8 @@ struct mlx5_ifc_cmd_hca_cap_2_bits { +@@ -2116,8 +2116,8 @@ struct mlx5_ifc_cmd_hca_cap_2_bits { @@ -26 +27 @@ -- u8 cross_vhca_object_to_object_supported[0x20]; /* End of DW7. */ +- u8 reserved_at_e0[0x20]; /* End of DW7. */ @@ -28,5 +29,5 @@ -+ u8 cross_vhca_object_to_object_supported[0x20]; - u8 allowed_object_for_other_vhca_access_high[0x20]; - u8 allowed_object_for_other_vhca_access[0x20]; - u8 reserved_at_140[0x20]; -@@ -3655,7 +3655,7 @@ struct mlx5_ifc_stc_ste_param_vport_bits { ++ u8 reserved_at_e0[0x20]; + u8 reserved_at_100[0x60]; + u8 reserved_at_160[0x3]; + u8 hairpin_sq_wqe_bb_size[0x5]; +@@ -3311,7 +3311,7 @@ struct mlx5_ifc_stc_ste_param_vport_bits {