net/mlx5: Fix modify_cq_in alignment [Linux 4.19.66]

This Linux kernel change "net/mlx5: Fix modify_cq_in alignment" is included in the Linux 4.19.66 release. This change is authored by Edward Srouji <edwards [at] mellanox.com> on Tue Jul 23 10:12:55 2019 +0300. The commit for this change in Linux stable tree is cd84a10 (patch) which is from upstream commit 7a32f29. The same Linux upstream change may have been applied to various maintained Linux releases and you can find all Linux releases containing changes from upstream 7a32f29.

net/mlx5: Fix modify_cq_in alignment

[ Upstream commit 7a32f2962c56d9d8a836b4469855caeee8766bd4 ]

Fix modify_cq_in alignment to match the device specification.
After this fix the 'cq_umem_valid' field will be in the right offset.

Cc: <[email protected]> # 4.19
Fixes: bd37197554eb ("net/mlx5: Update mlx5_ifc with DEVX UID bits")
Signed-off-by: Edward Srouji <[email protected]>
Reviewed-by: Yishai Hadas <[email protected]>
Signed-off-by: Leon Romanovsky <[email protected]>
Signed-off-by: Saeed Mahameed <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

There are 7 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 include/linux/mlx5/mlx5_ifc.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index f043d65..177f11c 100644
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -5623,7 +5623,12 @@ struct mlx5_ifc_modify_cq_in_bits {

    struct mlx5_ifc_cqc_bits cq_context;

-   u8         reserved_at_280[0x600];
+   u8         reserved_at_280[0x60];
+
+   u8         cq_umem_valid[0x1];
+   u8         reserved_at_2e1[0x1f];
+
+   u8         reserved_at_300[0x580];

    u8         pas[0][0x40];
 };

Leave a Reply

Your email address will not be published. Required fields are marked *