patch 'common/mlx5: fix user mode register access attribute' has been queued to stable release 20.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.4

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/30/21. 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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/91ab2a7d0a4e14f90765380dcc37aa785392e92c

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 91ab2a7d0a4e14f90765380dcc37aa785392e92c Mon Sep 17 00:00:00 2001
From: Michael Baum <michaelba at nvidia.com>
Date: Wed, 17 Nov 2021 12:57:09 +0200
Subject: [PATCH] common/mlx5: fix user mode register access attribute
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit e6a6829f9996b1cf066669ad1721b3d04552c048 ]

To detect the timestamp mode configured on the NIC the mlx5 PMD uses the
firmware command ACCESS_REGISTER_USER.
The HCA capability command has an attribute flag checking whether
firmware supports the command.

However, the HCA capability query command read the flag from wrong place
in PRM structure.

This patch move the flag to correct place.

Fixes: 972a1bf8120d ("common/mlx5: fix user mode register access command")

Signed-off-by: Michael Baum <michaelba at nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
---
 drivers/common/mlx5/mlx5_prm.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h
index 4792835200..201224cf24 100644
--- a/drivers/common/mlx5/mlx5_prm.h
+++ b/drivers/common/mlx5/mlx5_prm.h
@@ -1140,13 +1140,14 @@ struct mlx5_ifc_cmd_hca_cap_bits {
 	u8 reserved_at_bc[0x4];
 	u8 reserved_at_c0[0x8];
 	u8 log_max_cq_sz[0x8];
-	u8 reserved_at_d0[0xb];
+	u8 reserved_at_d0[0x2];
+	u8 access_register_user[0x1];
+	u8 reserved_at_d3[0x8];
 	u8 log_max_cq[0x5];
 	u8 log_max_eq_sz[0x8];
 	u8 relaxed_ordering_write[0x1];
 	u8 relaxed_ordering_read[0x1];
-	u8 access_register_user[0x1];
-	u8 log_max_mkey[0x5];
+	u8 log_max_mkey[0x6];
 	u8 reserved_at_f0[0x8];
 	u8 dump_fill_mkey[0x1];
 	u8 reserved_at_f9[0x3];
-- 
2.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-28 22:41:06.177175093 +0800
+++ 0056-common-mlx5-fix-user-mode-register-access-attribute.patch	2021-11-28 22:41:03.390206379 +0800
@@ -1 +1 @@
-From e6a6829f9996b1cf066669ad1721b3d04552c048 Mon Sep 17 00:00:00 2001
+From 91ab2a7d0a4e14f90765380dcc37aa785392e92c Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit e6a6829f9996b1cf066669ad1721b3d04552c048 ]
@@ -17 +19,0 @@
-Cc: stable at dpdk.org
@@ -26 +28 @@
-index 13959575e3..2ded67e85e 100644
+index 4792835200..201224cf24 100644
@@ -29 +31 @@
-@@ -1370,13 +1370,14 @@ struct mlx5_ifc_cmd_hca_cap_bits {
+@@ -1140,13 +1140,14 @@ struct mlx5_ifc_cmd_hca_cap_bits {