Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 352668d3 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

RDMA: Fix dependencies for rdma_user_mmap_io 



[ Upstream commit 46bdf777685677c1cc6b3da9220aace9da690731 ]

The mlx4 driver produces a link error when it is configured
as built-in while CONFIG_INFINIBAND_USER_ACCESS is set to =m:

drivers/infiniband/hw/mlx4/main.o: In function `mlx4_ib_mmap':
main.c:(.text+0x1af4): undefined reference to `rdma_user_mmap_io'

The same function is called from mlx5, which already has a
dependency to ensure we can call it, and from hns, which
appears to suffer from the same problem.

This adds the same dependency that mlx5 uses to the other two.

Fixes: 6745d356ab39 ("RDMA/hns: Use rdma_user_mmap_io")
Fixes: c282da4109e4 ("RDMA/mlx4: Use rdma_user_mmap_io")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 36ffc9a7

drivers/infiniband/hw/hns/Kconfig

+1 −0
Original line number Diff line number Diff line 
config INFINIBAND_HNS

	tristate "HNS RoCE Driver"

	depends on NET_VENDOR_HISILICON

	depends on INFINIBAND_USER_ACCESS || !INFINIBAND_USER_ACCESS

	depends on ARM64 || (COMPILE_TEST && 64BIT)

	---help---

	  This is a RoCE/RDMA driver for the Hisilicon RoCE engine. The engine

drivers/infiniband/hw/mlx4/Kconfig

+1 −0
Original line number Diff line number Diff line 
config MLX4_INFINIBAND

	tristate "Mellanox ConnectX HCA support"

	depends on NETDEVICES && ETHERNET && PCI && INET

	depends on INFINIBAND_USER_ACCESS || !INFINIBAND_USER_ACCESS

	depends on MAY_USE_DEVLINK

	select NET_VENDOR_MELLANOX

	select MLX4_CORE