Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[platform/kernel/linux-rpi.git] / include / linux / mlx5 / mlx5_ifc.h

diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index 9321d77..4acd561 100644 (file)
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -1828,7 +1828,18 @@ struct mlx5_ifc_cmd_hca_cap_2_bits {
        u8         max_reformat_remove_size[0x8];
        u8         max_reformat_remove_offset[0x8];
 
-       u8         reserved_at_c0[0x740];
+       u8         reserved_at_c0[0x160];
+
+       u8         reserved_at_220[0x1];
+       u8         sw_vhca_id_valid[0x1];
+       u8         sw_vhca_id[0xe];
+       u8         reserved_at_230[0x10];
+
+       u8         reserved_at_240[0xb];
+       u8         ts_cqe_metadata_size2wqe_counter[0x5];
+       u8         reserved_at_250[0x10];
+
+       u8         reserved_at_260[0x5a0];
 };
 
 enum mlx5_ifc_flow_destination_type {
@@ -3784,6 +3795,11 @@ struct mlx5_ifc_rmpc_bits {
        struct mlx5_ifc_wq_bits wq;
 };
 
+enum {
+       VHCA_ID_TYPE_HW = 0,
+       VHCA_ID_TYPE_SW = 1,
+};
+
 struct mlx5_ifc_nic_vport_context_bits {
        u8         reserved_at_0[0x5];
        u8         min_wqe_inline_mode[0x3];
@@ -3800,8 +3816,8 @@ struct mlx5_ifc_nic_vport_context_bits {
        u8         event_on_mc_address_change[0x1];
        u8         event_on_uc_address_change[0x1];
 
-       u8         reserved_at_40[0xc];
-
+       u8         vhca_id_type[0x1];
+       u8         reserved_at_41[0xb];
        u8         affiliation_criteria[0x4];
        u8         affiliated_vhca_id[0x10];
 
@@ -7261,7 +7277,12 @@ struct mlx5_ifc_init_hca_in_bits {
        u8         reserved_at_20[0x10];
        u8         op_mod[0x10];
 
-       u8         reserved_at_40[0x40];
+       u8         reserved_at_40[0x20];
+
+       u8         reserved_at_60[0x2];
+       u8         sw_vhca_id[0xe];
+       u8         reserved_at_70[0x10];
+
        u8         sw_owner_id[4][0x20];
 };