Skip to content

Commit ebf8d47

Browse files
dtatulearleon
authored andcommitted
net/mlx5: Small refactor for general object capabilities
Make enum for capability bits of general object types depend on the type definitions themselves. Make sure that capabilities in the [64,127] bit range are properly calculated (type id - 64). Signed-off-by: Dragos Tatulea <dtatulea@nvidia.com> Reviewed-by: Tariq Toukan <tariqt@nvidia.com> Signed-off-by: Mark Bloch <mbloch@nvidia.com> Link: https://patch.msgid.link/20250619113721.60201-2-mbloch@nvidia.com Signed-off-by: Leon Romanovsky <leon@kernel.org>
1 parent 52931f5 commit ebf8d47

1 file changed

Lines changed: 16 additions & 11 deletions

File tree

include/linux/mlx5/mlx5_ifc.h

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12501,17 +12501,6 @@ struct mlx5_ifc_affiliated_event_header_bits {
1250112501
u8 obj_id[0x20];
1250212502
};
1250312503

12504-
enum {
12505-
MLX5_HCA_CAP_GENERAL_OBJECT_TYPES_ENCRYPTION_KEY = BIT_ULL(0xc),
12506-
MLX5_HCA_CAP_GENERAL_OBJECT_TYPES_IPSEC = BIT_ULL(0x13),
12507-
MLX5_HCA_CAP_GENERAL_OBJECT_TYPES_SAMPLER = BIT_ULL(0x20),
12508-
MLX5_HCA_CAP_GENERAL_OBJECT_TYPES_FLOW_METER_ASO = BIT_ULL(0x24),
12509-
};
12510-
12511-
enum {
12512-
MLX5_HCA_CAP_2_GENERAL_OBJECT_TYPES_RDMA_CTRL = BIT_ULL(0x13),
12513-
};
12514-
1251512504
enum {
1251612505
MLX5_GENERAL_OBJECT_TYPES_ENCRYPTION_KEY = 0xc,
1251712506
MLX5_GENERAL_OBJECT_TYPES_IPSEC = 0x13,
@@ -12523,6 +12512,22 @@ enum {
1252312512
MLX5_GENERAL_OBJECT_TYPES_FLOW_TABLE_ALIAS = 0xff15,
1252412513
};
1252512514

12515+
enum {
12516+
MLX5_HCA_CAP_GENERAL_OBJECT_TYPES_ENCRYPTION_KEY =
12517+
BIT_ULL(MLX5_GENERAL_OBJECT_TYPES_ENCRYPTION_KEY),
12518+
MLX5_HCA_CAP_GENERAL_OBJECT_TYPES_IPSEC =
12519+
BIT_ULL(MLX5_GENERAL_OBJECT_TYPES_IPSEC),
12520+
MLX5_HCA_CAP_GENERAL_OBJECT_TYPES_SAMPLER =
12521+
BIT_ULL(MLX5_GENERAL_OBJECT_TYPES_SAMPLER),
12522+
MLX5_HCA_CAP_GENERAL_OBJECT_TYPES_FLOW_METER_ASO =
12523+
BIT_ULL(MLX5_GENERAL_OBJECT_TYPES_FLOW_METER_ASO),
12524+
};
12525+
12526+
enum {
12527+
MLX5_HCA_CAP_2_GENERAL_OBJECT_TYPES_RDMA_CTRL =
12528+
BIT_ULL(MLX5_GENERAL_OBJECT_TYPES_RDMA_CTRL - 0x40),
12529+
};
12530+
1252612531
enum {
1252712532
MLX5_IPSEC_OBJECT_ICV_LEN_16B,
1252812533
};

0 commit comments

Comments
 (0)