Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
Tariq Toukan says:
====================
mlx5-next updates 2025-07-14
* 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux:
net/mlx5: IFC updates for disabled host PF
net/mlx5: Expose disciplined_fr_counter through HCA capabilities in mlx5_ifc
RDMA/mlx5: Fix UMR modifying of mkey page size
net/mlx5: Expose HCA capability bits for mkey max page size
====================
Link: https://patch.msgid.link/1752481357-34780-1-git-send-email-tariqt@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+13
-5
+4
-2
drivers/infiniband/hw/mlx5/umr.c
+4
-2
drivers/infiniband/hw/mlx5/umr.c
···
32
32
return cpu_to_be64(result);
33
33
}
34
34
35
-
static __be64 get_umr_update_translation_mask(void)
35
+
static __be64 get_umr_update_translation_mask(struct mlx5_ib_dev *dev)
36
36
{
37
37
u64 result;
38
38
39
39
result = MLX5_MKEY_MASK_LEN |
40
40
MLX5_MKEY_MASK_PAGE_SIZE |
41
41
MLX5_MKEY_MASK_START_ADDR;
42
+
if (MLX5_CAP_GEN_2(dev->mdev, umr_log_entity_size_5))
43
+
result |= MLX5_MKEY_MASK_PAGE_SIZE_5;
42
44
43
45
return cpu_to_be64(result);
44
46
}
···
656
654
flags & MLX5_IB_UPD_XLT_ENABLE || flags & MLX5_IB_UPD_XLT_ADDR;
657
655
658
656
if (update_translation) {
659
-
wqe->ctrl_seg.mkey_mask |= get_umr_update_translation_mask();
657
+
wqe->ctrl_seg.mkey_mask |= get_umr_update_translation_mask(dev);
660
658
if (!mr->ibmr.length)
661
659
MLX5_SET(mkc, &wqe->mkey_seg, length64, 1);
662
660
}
+1
include/linux/mlx5/device.h
+1
include/linux/mlx5/device.h
+8
-3
include/linux/mlx5/mlx5_ifc.h
+8
-3
include/linux/mlx5/mlx5_ifc.h
···
1846
1846
1847
1847
u8 log_bf_reg_size[0x5];
1848
1848
1849
-
u8 reserved_at_270[0x3];
1849
+
u8 disciplined_fr_counter[0x1];
1850
+
u8 reserved_at_271[0x2];
1850
1851
u8 qp_error_syndrome[0x1];
1851
1852
u8 reserved_at_274[0x2];
1852
1853
u8 lag_dct[0x2];
···
2172
2171
u8 min_mkey_log_entity_size_fixed_buffer[0x5];
2173
2172
u8 ec_vf_vport_base[0x10];
2174
2173
2175
-
u8 reserved_at_3a0[0xa];
2174
+
u8 reserved_at_3a0[0x2];
2175
+
u8 max_mkey_log_entity_size_fixed_buffer[0x6];
2176
+
u8 reserved_at_3a8[0x2];
2176
2177
u8 max_mkey_log_entity_size_mtt[0x6];
2177
2178
u8 max_rqt_vhca_id[0x10];
2178
2179
···
12383
12380
12384
12381
struct mlx5_ifc_host_params_context_bits {
12385
12382
u8 host_number[0x8];
12386
-
u8 reserved_at_8[0x7];
12383
+
u8 reserved_at_8[0x5];
12384
+
u8 host_pf_not_exist[0x1];
12385
+
u8 reserved_at_14[0x1];
12387
12386
u8 host_pf_disabled[0x1];
12388
12387
u8 host_num_of_vfs[0x10];
12389
12388