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 2026-04-09
* 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux:
net/mlx5: Add icm_mng_function_id_mode cap bit
net/mlx5: Rename MLX5_PF page counter type to MLX5_SELF
net/mlx5: Add vhca_id_type bit to alias context
mlx5: Remove redundant iseg base
====================
Link: https://patch.msgid.link/20260409110431.154894-1-tariqt@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+18
-11
+1
-1
drivers/infiniband/hw/mlx5/main.c
+1
-1
drivers/infiniband/hw/mlx5/main.c
···
2740
2740
if (PAGE_SIZE > 4096)
2741
2741
return -EOPNOTSUPP;
2742
2742
2743
-
pfn = (dev->mdev->iseg_base +
2743
+
pfn = (dev->mdev->bar_addr +
2744
2744
offsetof(struct mlx5_init_seg, internal_timer_h)) >>
2745
2745
PAGE_SHIFT;
2746
2746
return rdma_user_mmap_io(&context->ibucontext, vma, pfn,
+1
-2
drivers/net/ethernet/mellanox/mlx5/core/main.c
+1
-2
drivers/net/ethernet/mellanox/mlx5/core/main.c
···
951
951
pci_enable_atomic_ops_to_root(pdev, PCI_EXP_DEVCAP2_ATOMIC_COMP128))
952
952
mlx5_core_dbg(dev, "Enabling pci atomics failed\n");
953
953
954
-
dev->iseg_base = dev->bar_addr;
955
-
dev->iseg = ioremap(dev->iseg_base, sizeof(*dev->iseg));
954
+
dev->iseg = ioremap(dev->bar_addr, sizeof(*dev->iseg));
956
955
if (!dev->iseg) {
957
956
err = -ENOMEM;
958
957
mlx5_core_err(dev, "Failed mapping initialization segment, aborting\n");
+2
-1
drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
+2
-1
drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
···
77
77
static u16 func_id_to_type(struct mlx5_core_dev *dev, u16 func_id, bool ec_function)
78
78
{
79
79
if (!func_id)
80
-
return mlx5_core_is_ecpf(dev) && !ec_function ? MLX5_HOST_PF : MLX5_PF;
80
+
return mlx5_core_is_ecpf(dev) && !ec_function ?
81
+
MLX5_HOST_PF : MLX5_SELF;
81
82
82
83
if (func_id <= max(mlx5_core_max_vfs(dev), mlx5_core_max_ec_vfs(dev))) {
83
84
if (ec_function)
+1
-2
drivers/net/ethernet/mellanox/mlx5/core/sf/dev/driver.c
+1
-2
drivers/net/ethernet/mellanox/mlx5/core/sf/dev/driver.c
···
37
37
mdev->device = &adev->dev;
38
38
mdev->pdev = sf_dev->parent_mdev->pdev;
39
39
mdev->bar_addr = sf_dev->bar_base_addr;
40
-
mdev->iseg_base = sf_dev->bar_base_addr;
41
40
mdev->coredev_type = MLX5_COREDEV_SF;
42
41
mdev->priv.parent_mdev = sf_dev->parent_mdev;
43
42
mdev->priv.adev_idx = adev->id;
···
52
53
goto mdev_err;
53
54
}
54
55
55
-
mdev->iseg = ioremap(mdev->iseg_base, sizeof(*mdev->iseg));
56
+
mdev->iseg = ioremap(mdev->bar_addr, sizeof(*mdev->iseg));
56
57
if (!mdev->iseg) {
57
58
mlx5_core_warn(mdev, "remap error\n");
58
59
err = -ENOMEM;
+1
-2
include/linux/mlx5/driver.h
+1
-2
include/linux/mlx5/driver.h
···
550
550
};
551
551
552
552
enum mlx5_func_type {
553
-
MLX5_PF,
553
+
MLX5_SELF,
554
554
MLX5_VF,
555
555
MLX5_SF,
556
556
MLX5_HOST_PF,
···
755
755
} caps;
756
756
struct mlx5_timeouts *timeouts;
757
757
u64 sys_image_guid;
758
-
phys_addr_t iseg_base;
759
758
struct mlx5_init_seg __iomem *iseg;
760
759
phys_addr_t bar_addr;
761
760
enum mlx5_device_state state;
+12
-3
include/linux/mlx5/mlx5_ifc.h
+12
-3
include/linux/mlx5/mlx5_ifc.h
···
1654
1654
MLX5_STEERING_FORMAT_CONNECTX_8 = 3,
1655
1655
};
1656
1656
1657
+
enum {
1658
+
MLX5_ID_MODE_FUNCTION_INDEX = 0,
1659
+
MLX5_ID_MODE_FUNCTION_VHCA_ID = 1,
1660
+
};
1661
+
1657
1662
struct mlx5_ifc_cmd_hca_cap_bits {
1658
1663
u8 reserved_at_0[0x6];
1659
1664
u8 page_request_disable[0x1];
···
1921
1916
u8 reserved_at_280[0x10];
1922
1917
u8 max_wqe_sz_sq[0x10];
1923
1918
1924
-
u8 reserved_at_2a0[0x7];
1919
+
u8 icm_mng_function_id_mode[0x1];
1920
+
u8 reserved_at_2a1[0x6];
1925
1921
u8 mkey_pcie_tph[0x1];
1926
1922
u8 reserved_at_2a8[0x1];
1927
1923
u8 tis_tir_td_order[0x1];
···
1974
1968
1975
1969
u8 reserved_at_360[0x3];
1976
1970
u8 log_max_rq[0x5];
1977
-
u8 reserved_at_368[0x3];
1971
+
u8 ft_alias_sw_vhca_id[0x1];
1972
+
u8 reserved_at_369[0x2];
1978
1973
u8 log_max_sq[0x5];
1979
1974
u8 reserved_at_370[0x3];
1980
1975
u8 log_max_tir[0x5];
···
6964
6957
6965
6958
struct mlx5_ifc_alias_context_bits {
6966
6959
u8 vhca_id_to_be_accessed[0x10];
6967
-
u8 reserved_at_10[0xd];
6960
+
u8 reserved_at_10[0xb];
6961
+
u8 vhca_id_type[0x1];
6962
+
u8 reserved_at_1c[0x1];
6968
6963
u8 status[0x3];
6969
6964
u8 object_id_to_be_accessed[0x20];
6970
6965
u8 reserved_at_40[0x40];